Merge branch 'master' into custom-request-fixes

Author: Caitlin Bales (MSFT)

src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java

@@ -177,7 +177,7 @@ public void upload(final List<Option> options,
             ChunkedUploadRequest request =
                     new ChunkedUploadRequest(this.uploadUrl, this.client, options, buffer, read,
                             maxRetry, this.readSoFar, this.streamSize);
-            ChunkedUploadResult result = request.upload(this.responseHandler);
+            ChunkedUploadResult<UploadType> result = request.upload(this.responseHandler);
 
             if (result.uploadCompleted()) {
                 callback.progress(this.streamSize, this.streamSize);

src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java

@@ -78,7 +78,7 @@ public void configConnection(final IConnection connection) {
      * @throws Exception An exception occurs if the request was unable to complete for any reason.
      */
     @Override
-    public ChunkedUploadResult generateResult(
+    public ChunkedUploadResult<UploadType> generateResult(
             final IHttpRequest request,
             final IConnection connection,
             final ISerializer serializer,
@@ -89,10 +89,10 @@ public ChunkedUploadResult generateResult(
             if (connection.getResponseCode() == HttpResponseCode.HTTP_ACCEPTED) {
                 logger.logDebug("Chunk bytes has been accepted by the server.");
                 in = new BufferedInputStream(connection.getInputStream());
-                final UploadSession seesion = serializer.deserializeObject(
+                final UploadSession session = serializer.deserializeObject(
                         DefaultHttpProvider.streamToString(in), UploadSession.class);
 
-                return new ChunkedUploadResult(seesion);
+                return new ChunkedUploadResult<UploadType>(session);
 
             } else if (connection.getResponseCode() == HttpResponseCode.HTTP_CREATED
                     || connection.getResponseCode() == HttpResponseCode.HTTP_OK) {
@@ -102,11 +102,11 @@ public ChunkedUploadResult generateResult(
                 UploadType uploadedItem = serializer.deserializeObject(rawJson,
                         this.deserializeTypeClass);
 
-                return new ChunkedUploadResult(uploadedItem);
+                return new ChunkedUploadResult<UploadType>(uploadedItem);
             } else if (connection.getResponseCode() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
                 logger.logDebug("Receiving error during upload, see detail on result error");
 
-                return new ChunkedUploadResult(
+                return new ChunkedUploadResult<UploadType>(
                         GraphServiceException.createFromConnection(request, null, serializer,
                                 connection, logger));
             }

src/main/java/com/microsoft/graph/concurrency/SimpleWaiter.java

@@ -53,6 +53,7 @@ protected boolean hasParameter(final String name) {
      * @param <T>  The type to which this object should be cast
      * @return The stored instance of T, otherwise null
      */
+    @SuppressWarnings("unchecked")
     protected <T> T getParameter(final String name) {
         return (T) bodyParams.get(name);
     }

src/main/java/com/microsoft/graph/core/BaseActionRequestBuilder.java

@@ -27,6 +27,8 @@
  */
 public class ClientException extends RuntimeException {
 
+    private static final long serialVersionUID = -1066560879567392559L;
+
     /**
      * Creates the client exception.
      * @param message The message to display.

src/main/java/com/microsoft/graph/core/ClientException.java

@@ -107,7 +107,7 @@ public abstract class BaseRequest implements IHttpRequest {
     public BaseRequest(final String requestUrl,
                        final IBaseClient client,
                        final List<? extends Option> options,
-                       final Class responseClass) {
+                       final Class<?> responseClass) {
         this.requestUrl = requestUrl;
         this.client = client;
         this.responseClass = responseClass;
@@ -349,7 +349,8 @@ public IBaseClient getClient() {
      *
      * @return The response type.
      */
-    public Class getResponseType() {
-        return responseClass;
+    @SuppressWarnings("unchecked")
+	public <T> Class<T> getResponseType() {
+        return (Class<T>) responseClass;
     }
 }

src/main/java/com/microsoft/graph/http/BaseRequest.java

@@ -50,8 +50,6 @@ public abstract class BaseRequestBuilder implements IRequestBuilder {
      */
     private final List<Option> options = new ArrayList<>();
 
-    private final IJsonBackedObject body;
-
     /**
      * Creates the request builder.
      *
@@ -66,23 +64,6 @@ public BaseRequestBuilder(
     ) {
         this.requestUrl = requestUrl;
         this.client = client;
-        this.body = null;
-
-        if (options != null) {
-            this.options.addAll(options);
-        }
-    }
-
-    public BaseRequestBuilder(
-            final String requestUrl,
-            final IJsonBackedObject body,
-            final IBaseClient client,
-            final List<? extends Option> options
-    ) {
-        this.requestUrl = requestUrl;
-        this.client = client;
-        this.body = body;
-
         if (options != null) {
             this.options.addAll(options);
         }

src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java

@@ -73,9 +73,9 @@ public void patch(final ICallback<T> callback) {
     }
 
     /**
-     * Patches this with a source
+     * Patches this item with a source
      * @param sourceAttachment The source object with updates
-     * @return The updated Attachment
+     * @return The updated item
      * @throws ClientException This exception occurs if the request was unable to complete for any reason.
      */
     public T patch(final T sourceObject) throws ClientException {

src/main/java/com/microsoft/graph/http/CustomRequest.java

@@ -212,7 +212,6 @@ private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRe
                                                                        final IStatefulResponseHandler<Result, DeserializeType> handler)
             throws ClientException {
         final int defaultBufferSize = 4096;
-        final String contentLengthHeaderName = "Content-Length";
         final String binaryContentType = "application/octet-stream";
 
         try {
@@ -234,7 +233,14 @@ private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRe
                 final byte[] bytesToWrite;
                 connection.addRequestHeader("Accept", "*/*");
                 if (serializable == null) {
-                    bytesToWrite = null;
+                	// Send an empty body through with a POST request
+                	// This ensures that the Content-Length header is properly set
+                	if (request.getHttpMethod() == HttpMethod.POST) {
+                		bytesToWrite = new byte[0];
+                	}
+                	else {
+                		bytesToWrite = null;
+                	}
                 } else if (serializable instanceof byte[]) {
                     logger.logDebug("Sending byte[] as request body");
                     bytesToWrite = (byte[]) serializable;
@@ -419,8 +425,14 @@ void setConnectionFactory(final IConnectionFactory factory) {
     public static String streamToString(final InputStream input) {
         final String httpStreamEncoding = "UTF-8";
         final String endOfFile = "\\A";
-        final Scanner scanner = new Scanner(input, httpStreamEncoding).useDelimiter(endOfFile);
-        return scanner.next();
+        final Scanner scanner = new Scanner(input, httpStreamEncoding);
+        try {
+        	scanner.useDelimiter(endOfFile);
+            String scannerString = scanner.next();
+            return scannerString;
+        } finally {
+        	scanner.close();
+        }
     }
 
     /**

src/main/java/com/microsoft/graph/http/DefaultHttpProvider.java

@@ -29,6 +29,8 @@
  */
 public class GraphFatalServiceException extends GraphServiceException {
 
+    private static final long serialVersionUID = -4974392424026672738L;
+
     /**
      * Create a fatal Graph service exception.
      * @param method The method that caused the exception.