- aligns manually edited files with v1

baywet · baywet · commit 21403ea49929 · 2020-08-18T14:47:45.000-04:00
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -45,7 +45,7 @@
  * @param <UploadType> the expected uploaded item
  */
 public class ChunkedUploadResponseHandler<UploadType>
-        implements IStatefulResponseHandler<ChunkedUploadResult, UploadType> {
+        implements IStatefulResponseHandler<ChunkedUploadResult<UploadType>, UploadType> {
     /**
      * The expected deserialized upload type
      */
diff --git a/src/main/java/com/microsoft/graph/core/Constants.java b/src/main/java/com/microsoft/graph/core/Constants.java
@@ -28,5 +28,5 @@ private Constants() {
 	public static final String APPID = "app-id";
 	public static final String USERNAME = "user@email.com";
 	public static final String PASSWORD = "password";
-	public static final String VERSION_NAME = "1.6.0";
+	public static final String VERSION_NAME = "1.9.0";
 }
diff --git a/src/main/java/com/microsoft/graph/core/DefaultConnectionConfig.java b/src/main/java/com/microsoft/graph/core/DefaultConnectionConfig.java
@@ -164,7 +164,7 @@ public IShouldRetry getShouldRetry() {
      * @param maxRetries Max retries for a request
      */
     public void setMaxRetries(int maxRetries) {
-    	this.maxRedirects = maxRedirects;
+    	this.maxRetries = maxRetries;
     }
     
     /**
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -269,6 +269,7 @@ public Request authenticateRequest(Request request) {
 					.tag(RetryOptions.class, retryOptions);
 			
 			String contenttype = null;
+			Response response = null;
 
 			try {
 				logger.logDebug("Request Method " + request.getHttpMethod().toString());
@@ -353,7 +354,7 @@ public MediaType contentType() {
 				coreHttpRequest = corehttpRequestBuilder.build();
 
 				// Call being executed
-				Response response = corehttpClient.newCall(coreHttpRequest).execute();
+				response = corehttpClient.newCall(coreHttpRequest).execute();
 
 				if (handler != null) {
 					handler.configConnection(response);
@@ -401,12 +402,13 @@ public MediaType contentType() {
 					return (Result) handleBinaryStream(in);
 				}
 			} finally {
-				if (!isBinaryStreamInput && in != null) {
+				if (!isBinaryStreamInput) {
 					try{
-						in.close();
+						if (in != null) in.close();
 					}catch(IOException e) {
 						logger.logError(e.getMessage(), e);
 					}
+					if (response != null) response.close();
 				}
 			}
 		} catch (final GraphServiceException ex) {
diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
@@ -23,6 +23,7 @@
 package com.microsoft.graph.http;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -38,6 +39,7 @@
 import com.microsoft.graph.serializer.ISerializer;
 
 import okhttp3.Response;
+import static okhttp3.internal.Util.closeQuietly;
 
 /**
  * An exception from the Graph service
@@ -416,8 +418,12 @@ public static <T> GraphServiceException createFromConnection(final IHttpRequest
 
         final String responseMessage = response.message();
         String rawOutput = "{}";
-        if(response.body().byteStream() != null) {
-        	rawOutput = DefaultHttpProvider.streamToString(response.body().byteStream());
+
+        InputStream is = response.body().byteStream();
+        try {
+            rawOutput = DefaultHttpProvider.streamToString(is);
+        } finally {
+            closeQuietly(is);
         }
         GraphErrorResponse error;
         try {
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -256,18 +256,9 @@ else if (fieldObject != null && fieldObject instanceof IJsonBackedObject) {
      */
     private void addAdditionalDataToJson(AdditionalDataManager additionalDataManager, JsonObject jsonNode) {
     	for (Map.Entry<String, JsonElement> entry : additionalDataManager.entrySet()) {
-            if (!fieldIsOdataTransient(entry)) {
-                jsonNode.add(
-                        entry.getKey(),
-                        entry.getValue()
-                );
-            }
+                jsonNode.add(entry.getKey(), entry.getValue());
         }
     }
-
-    private boolean fieldIsOdataTransient(Map.Entry<String, JsonElement> entry) {
-        return (entry.getKey().startsWith("@") && entry.getKey() != "@odata.type");
-    }
     
     /**
      * Get the derived class for the given JSON object
diff --git a/src/test/java/com/microsoft/graph/serializer/AdditionalDataTests.java b/src/test/java/com/microsoft/graph/serializer/AdditionalDataTests.java
@@ -56,19 +56,6 @@ public void testChildAdditionalData() {
 		assertEquals("{\"manager\":{\"id\":\"1\",\"additionalData\":\"additionalValue\"},\"id\":\"2\"}", serializedObject);
 	}
 	
-	@Test
-	public void testSkipTransientData() {
-		Entity entity = new Entity();
-		entity.id = "1";
-		
-		entity.additionalDataManager().put("@odata.type", new JsonPrimitive("entity"));
-		entity.additionalDataManager().put("@odata.nextLink", new JsonPrimitive("1"));
-		
-		String serializedObject = serializer.serializeObject(entity);
-		
-		assertEquals("{\"id\":\"1\",\"@odata.type\":\"entity\"}", serializedObject);
-	}
-	
 	@Test
 	public void testHashMapChildAnnotationData() {
 		PlannerTask task = new PlannerTask();

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ private Constants() {`
`28`	`28`	`public static final String APPID = "app-id";`
`29`	`29`	`public static final String USERNAME = "user@email.com";`
`30`	`30`	`public static final String PASSWORD = "password";`
`31`		`- public static final String VERSION_NAME = "1.6.0";`
	`31`	`+ public static final String VERSION_NAME = "1.9.0";`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public IShouldRetry getShouldRetry() {`
`164`	`164`	`* @param maxRetries Max retries for a request`
`165`	`165`	`*/`
`166`	`166`	`public void setMaxRetries(int maxRetries) {`
`167`		`- this.maxRedirects = maxRedirects;`
	`167`	`+ this.maxRetries = maxRetries;`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/**`