- updates common files with 2-3-0 releases from v1.0

baywet · baywet · commit b718a6992959 · 2020-10-05T09:41:44.000-04:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,8 +5,3 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-- package-ecosystem: maven
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ hs_err_pid*
 /target/
 /pom.xml
 local.properties
+.idea
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "java.configuration.updateBuildConfiguration": "automatic"
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "git.ignoreLimitWarning": true
 }
diff --git a/build.gradle b/build.gradle
@@ -16,6 +16,10 @@ plugins {
     id 'com.jfrog.bintray' version '1.8.5'
 }
 
+java {
+    modularity.inferModulePath = true
+}
+
 // In this section you declare where to find the dependencies of your project
 repositories {
     // Use jcenter for resolving your dependencies.
@@ -31,12 +35,12 @@ dependencies {
     // Use JUnit test framework
     testImplementation 'junit:junit:4.13'
     
-    implementation 'com.google.code.gson:gson:2.8.6'
+    api 'com.google.code.gson:gson:2.8.6'
     
     implementation 'com.squareup.okhttp3:okhttp:3.12.1'
     
     // Core Http library 
-    implementation 'com.microsoft.graph:microsoft-graph-core:1.0.5'
+    api 'com.microsoft.graph:microsoft-graph-core:1.0.5'
 }
 
 def pomConfig = {
@@ -54,12 +58,20 @@ def pomConfig = {
 //Maven Central Release: publishMavenCentralReleasePublicationToMaven2Repository
 //Bintray Snapshot: publishSnapshotPublicationToMaven3Repository
 
+tasks.jar {
+    manifest {
+        attributes('Automatic-Module-Name': project.property('mavenGroupId'))
+    }
+}
+
 task sourceJar(type: Jar) {
+    outputs.cacheIf { true }
     from sourceSets.main.allJava
     archiveClassifier = 'sources'
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
+    outputs.cacheIf { true }
     from javadoc.destinationDir
     archiveClassifier = 'javadoc'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -20,6 +20,7 @@
 # The size of the library demands a large amount of RAM to build. Increase as necessary if you get GC errors
 ## linux requires 10G, OSX requires 11G
 org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx2g
+org.gradle.parallel=true
 org.gradle.caching=true
 
 mavenGroupId         = com.microsoft.graph
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -26,7 +26,9 @@
 
 /**
  * Provides authentication for a requests before it is sent by an HTTP provider
+ * @deprecated use ICoreAuthenticationProvider instead
  */
+@Deprecated
 public interface IAuthenticationProvider {
 
     /**
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -176,7 +176,7 @@ public ChunkedUploadResult<UploadType> generateResult(
 					in = new BufferedInputStream(response.body().byteStream());
 					final String rawJson = DefaultHttpProvider.streamToString(in);
 					final UploadSession session = serializer.deserializeObject(rawJson, UploadSession.class);
-					if(session == null) {
+					if(session == null || session.nextExpectedRanges == null) {
 						logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
 						final UploadType uploadedItem = serializer.deserializeObject(rawJson, this.deserializeTypeClass);
 						return new ChunkedUploadResult<UploadType>(uploadedItem);
diff --git a/src/main/java/com/microsoft/graph/core/DefaultClientConfig.java b/src/main/java/com/microsoft/graph/core/DefaultClientConfig.java
@@ -32,6 +32,8 @@
 import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
 
+import okhttp3.OkHttpClient;
+
 /**
  * The default configuration for a service client
  */
@@ -55,7 +57,7 @@ public abstract class DefaultClientConfig implements IClientConfig {
     /**
      * The serializer instance
      */
-    private DefaultSerializer serializer;
+    private ISerializer serializer;
 
     /**
      * Creates an instance of this configuration with an authentication provider
@@ -97,11 +99,22 @@ public IAuthenticationProvider getAuthenticationProvider() {
      */
     @Override
     public IHttpProvider getHttpProvider() {
+        return this.getHttpProvider(null);
+    }
+
+    /**
+     * Gets the HTTP provider
+     *
+     * @param httpClient the http client to pass to the http provider when building it
+     * @param <T1> the http client type
+     * @return the HTTP provider
+     */
+    @Override
+    public <T1> IHttpProvider getHttpProvider(final T1 httpClient) {
         if (httpProvider == null) {
-            httpProvider = new CoreHttpProvider(getSerializer(),
-                    getAuthenticationProvider(),
-                    getExecutors(),
-                    getLogger());
+            httpProvider = (httpClient instanceof OkHttpClient) ? 
+                            new CoreHttpProvider(this, (OkHttpClient) httpClient) :
+                            new CoreHttpProvider(this, null);
             getLogger().logDebug("Created CoreHttpProvider");
         }
         return httpProvider;
diff --git a/src/main/java/com/microsoft/graph/core/IClientConfig.java b/src/main/java/com/microsoft/graph/core/IClientConfig.java
@@ -53,6 +53,15 @@ public interface IClientConfig {
      */
     IHttpProvider getHttpProvider();
 
+    /**
+     * Gets the HTTP provider
+     * 
+     * @param httpClient the http client to pass to the http provider when building it
+     * @param <T1> the http client type
+     * @return the HTTP provider
+     */
+    <T1> IHttpProvider getHttpProvider(final T1 httpClient);
+
     /**
      * Gets the logger
      * 
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
@@ -72,6 +72,18 @@ public BaseCollectionPage(final List<T1> pageContents, final T2 nextRequestBuild
         requestBuilder = nextRequestBuilder;
     }
 
+    /**
+     * Creates the collection page
+     *
+     * @param pageContents       the contents of this page
+     * @param nextRequestBuilder the request builder for the next page
+     * @param responseAdditionalData the additional data returned by the response
+     */
+    public BaseCollectionPage(final List<T1> pageContents, final T2 nextRequestBuilder, final AdditionalDataManager responseAdditionalData) {
+        this(pageContents, nextRequestBuilder);
+        this.additionalDataManager().putAll(responseAdditionalData);
+    }
+
     /**
      * Gets the next page request builder
      *
diff --git a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
@@ -95,7 +95,7 @@ protected InputStream send() throws ClientException {
      * @param callback     the callback when this request complements. The caller needs to close the stream
      */
     @SuppressWarnings("unchecked")
-    protected void send(final byte[] fileContents, final ICallback<T> callback) {
+    protected void send(final byte[] fileContents, final ICallback<? super T> callback) {
         baseRequest.setHttpMethod(HttpMethod.PUT);
         baseRequest.getClient().getHttpProvider().send(this, callback, (Class<T>) baseRequest.getResponseType(), fileContents);
     }
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -46,6 +46,7 @@
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.Constants;
 import com.microsoft.graph.core.DefaultConnectionConfig;
+import com.microsoft.graph.core.IClientConfig;
 import com.microsoft.graph.core.IConnectionConfig;
 import com.microsoft.graph.httpcore.HttpClients;
 import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
@@ -119,6 +120,18 @@ public CoreHttpProvider(final ISerializer serializer,
 		this.logger = logger;
 	}
 
+	/**
+	 * Creates the DefaultHttpProvider
+	 *
+	 * @param clientConfig           the client configuration to use for the provider
+	 * @param httpClient             the http client to execute the requests with
+	 */
+	public CoreHttpProvider(final IClientConfig clientConfig,
+			final OkHttpClient httpClient) {
+		this(clientConfig.getSerializer(), clientConfig.getAuthenticationProvider(), clientConfig.getExecutors(), clientConfig.getLogger());
+		this.corehttpClient = httpClient;
+	}
+
 	/**
 	 * Gets the serializer for this HTTP provider
 	 *
@@ -141,12 +154,12 @@ public ISerializer getSerializer() {
 	 */
 	@Override
 	public <Result, Body> void send(final IHttpRequest request,
-			final ICallback<Result> callback,
+			final ICallback<? super Result> callback,
 			final Class<Result> resultClass,
 			final Body serializable) {
-		final IProgressCallback<Result> progressCallback;
+		final IProgressCallback<? super Result> progressCallback;
 		if (callback instanceof IProgressCallback) {
-			progressCallback = (IProgressCallback<Result>) callback;
+			progressCallback = (IProgressCallback<? super Result>) callback;
 		} else {
 			progressCallback = null;
 		}
@@ -221,7 +234,7 @@ public <Result, Body, DeserializeType> Result send(final IHttpRequest request,
 	public <Result, Body> Request getHttpRequest(final IHttpRequest request,
 			final Class<Result> resultClass,
 			final Body serializable,
-			final IProgressCallback<Result> progress) throws ClientException {
+			final IProgressCallback<? super Result> progress) throws ClientException {
 		final int defaultBufferSize = 4096;
 
 		final URL requestUrl = request.getRequestUrl();
@@ -354,7 +367,7 @@ public MediaType contentType() {
 	private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRequest request,
 			final Class<Result> resultClass,
 			final Body serializable,
-			final IProgressCallback<Result> progress,
+			final IProgressCallback<? super Result> progress,
 			final IStatefulResponseHandler<Result, DeserializeType> handler)
 					throws ClientException {
 
@@ -374,11 +387,11 @@ public Request authenticateRequest(Request request) {
 									.newBuilder()
 									.connectTimeout(connectionConfig.getConnectTimeout(), TimeUnit.MILLISECONDS)
 									.readTimeout(connectionConfig.getReadTimeout(), TimeUnit.MILLISECONDS)
-									.followRedirects(false)
+									.followRedirects(false) //TODO https://github.com/microsoftgraph/msgraph-sdk-java/issues/516
 									.protocols(Arrays.asList(Protocol.HTTP_1_1)) //https://stackoverflow.com/questions/62031298/sockettimeout-on-java-11-but-not-on-java-8
 									.build();
 			}
-			if (authenticationProvider != null) {
+			if (authenticationProvider != null) { //TODO https://github.com/microsoftgraph/msgraph-sdk-java/issues/517
 				authenticationProvider.authenticateRequest(request);
 			}
 			Request coreHttpRequest = getHttpRequest(request, resultClass, serializable, progress);
diff --git a/src/main/java/com/microsoft/graph/http/DefaultHttpProvider.java b/src/main/java/com/microsoft/graph/http/DefaultHttpProvider.java
@@ -51,7 +51,9 @@
 
 /**
  * HTTP provider based off of URLConnection
+ * @deprecated user CoreHttpProvider instead
  */
+@Deprecated
 public class DefaultHttpProvider implements IHttpProvider {
 
     /**
@@ -157,12 +159,12 @@ public ISerializer getSerializer() {
      */
     @Override
     public <Result, Body> void send(final IHttpRequest request,
-                                    final ICallback<Result> callback,
+                                    final ICallback<? super Result> callback,
                                     final Class<Result> resultClass,
                                     final Body serializable) {
-        final IProgressCallback<Result> progressCallback;
+        final IProgressCallback<? super Result> progressCallback;
         if (callback instanceof IProgressCallback) {
-            progressCallback = (IProgressCallback<Result>) callback;
+            progressCallback = (IProgressCallback<? super Result>) callback;
         } else {
             progressCallback = null;
         }
@@ -241,7 +243,7 @@ public <Result, Body, DeserializeType> Result send(final IHttpRequest request,
     private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRequest request,
                                                                        final Class<Result> resultClass,
                                                                        final Body serializable,
-                                                                       final IProgressCallback<Result> progress,
+                                                                       final IProgressCallback<? super Result> progress,
                                                                        final IStatefulResponseHandler<Result, DeserializeType> handler)
             throws ClientException {
         final int defaultBufferSize = 4096;
@@ -535,7 +537,7 @@ public void setConnectionConfig(IConnectionConfig connectionConfig) {
 
 	@Override
 	public <Result, BodyType> Request getHttpRequest(IHttpRequest request, Class<Result> resultClass,
-			BodyType serializable, IProgressCallback<Result> progress) throws ClientException {
+			BodyType serializable, IProgressCallback<? super Result> progress) throws ClientException {
 		return null;
 	}
 }
diff --git a/src/main/java/com/microsoft/graph/http/IHttpProvider.java b/src/main/java/com/microsoft/graph/http/IHttpProvider.java
@@ -69,7 +69,7 @@ public interface IHttpProvider {
      * @param <BodyType>   the type of the object to send to the service in the body of the request
      */
     <Result, BodyType> void send(final IHttpRequest request,
-                                 final ICallback<Result> callback,
+                                 final ICallback<? super Result> callback,
                                  final Class<Result> resultClass,
                                  final BodyType serializable);
 
@@ -123,6 +123,6 @@ <Result, BodyType, DeserializeType> Result send(final IHttpRequest request,
     <Result, BodyType> Request getHttpRequest(final IHttpRequest request,
                                               final Class<Result> resultClass,
                                               final BodyType serializable,
-                                              final IProgressCallback<Result> progress)
+                                              final IProgressCallback<? super Result> progress)
             throws ClientException;
 }
diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
@@ -70,6 +70,8 @@ private CollectionPageSerializer() {
      * 
      * @param src the CollectionPage variable for serialization
      * @param logger the logger
+	 * @param <T1> the entity type for the collection
+	 * @param <T2> the collection request builder interface type
      * @return       JsonElement of CollectionPage
      */
 	public static <T1, T2 extends IRequestBuilder> JsonElement serialize(final BaseCollectionPage<T1, T2> src, final ILogger logger) {
@@ -96,17 +98,19 @@ public static <T1, T2 extends IRequestBuilder> JsonElement serialize(final BaseC
      * @param json the source CollectionPage's Json
    	 * @param typeOfT The type of the CollectionPage to deserialize to
      * @param logger the logger
+	 * @param <T1> the entity type for the collection
+	 * @param <T2> the collection request builder interface type
      * @throws JsonParseException the parse exception
      * @return    the deserialized CollectionPage
      */
 	@SuppressWarnings("unchecked")
 	public static <T1, T2 extends IRequestBuilder> BaseCollectionPage<T1, T2> deserialize(final JsonElement json, Type typeOfT, final ILogger logger) throws JsonParseException {
-		if (json == null) {
+		if (json == null || !json.isJsonArray()) {
 			return null;
 		}
 		serializer = new DefaultSerializer(logger);
-		final JsonObject[] sourceArray = serializer.deserializeObject(json.toString(), JsonObject[].class);
-		final ArrayList<T1> list = new ArrayList<T1>(sourceArray.length);
+		final JsonArray sourceArray = json.getAsJsonArray();
+		final ArrayList<T1> list = new ArrayList<T1>(sourceArray.size());
 		/** eg: com.microsoft.graph.requests.extensions.AttachmentCollectionPage */
 		final String collectionPageClassCanonicalName = typeOfT.getTypeName();
 		/** eg: com.microsoft.graph.models.extensions.Attachment */
@@ -115,13 +119,16 @@ public static <T1, T2 extends IRequestBuilder> BaseCollectionPage<T1, T2> deseri
 					.replace("requests", "models");
 		try {
 			final Class<?> baseEntityClass = Class.forName(baseEntityClassCanonicalName);
-			for (JsonObject sourceObject : sourceArray) {
-				Class<?> entityClass = serializer.getDerivedClass(sourceObject, baseEntityClass);
-				if(entityClass == null)
-					entityClass = baseEntityClass;
-				final T1 targetObject = (T1)serializer.deserializeObject(sourceObject.toString(), entityClass);
-				((IJsonBackedObject)targetObject).setRawObject(serializer, sourceObject);
-				list.add(targetObject);
+			for(JsonElement sourceElement : sourceArray) {
+				if(sourceElement.isJsonObject()) {
+					final JsonObject sourceObject = sourceElement.getAsJsonObject();
+					Class<?> entityClass = serializer.getDerivedClass(sourceObject, baseEntityClass);
+					if(entityClass == null)
+						entityClass = baseEntityClass;
+					final T1 targetObject = (T1)serializer.deserializeObject(sourceObject.toString(), entityClass);
+					((IJsonBackedObject)targetObject).setRawObject(serializer, sourceObject);
+					list.add(targetObject);
+				}
 			}
 			/** eg: com.microsoft.graph.requests.extensions.AttachmentCollectionResponse */
 			final String responseClassCanonicalName = collectionPageClassCanonicalName
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
diff --git a/src/test/java/com/microsoft/graph/functional/OutlookTests.java b/src/test/java/com/microsoft/graph/functional/OutlookTests.java
diff --git a/src/test/java/com/microsoft/graph/functional/UserTests.java b/src/test/java/com/microsoft/graph/functional/UserTests.java
diff --git a/src/test/java/com/microsoft/graph/http/MockHttpProvider.java b/src/test/java/com/microsoft/graph/http/MockHttpProvider.java
diff --git a/src/test/java/com/microsoft/graph/requests/extensions/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/requests/extensions/GraphServiceClientTest.java
diff --git a/src/test/java/com/microsoft/graph/serializer/AdditionalDataTests.java b/src/test/java/com/microsoft/graph/serializer/AdditionalDataTests.java
diff --git a/src/test/java/com/microsoft/graph/serializer/CollectionPageSerializerTests.java b/src/test/java/com/microsoft/graph/serializer/CollectionPageSerializerTests.java

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
`2`		`- "java.configuration.updateBuildConfiguration": "automatic"`
	`2`	`+ "java.configuration.updateBuildConfiguration": "automatic",`
	`3`	`+ "git.ignoreLimitWarning": true`
`3`	`4`	`}`