Merge remote-tracking branch 'ms/dev' into dev

# Conflicts:
#	src/main/java/com/microsoft/graph/models/generated/BaseActivityHistoryItem.java

Author: kitherill

README.md

@@ -1,4 +1,4 @@
-# Microsoft Graph SDK for Java
+# Microsoft Graph SDK for Java
 
 [ ![Download](https://api.bintray.com/packages/microsoftgraph/Maven/microsoft-graph/images/download.svg) ](https://bintray.com/microsoftgraph/Maven/microsoft-graph/_latestVersion)
 
@@ -18,7 +18,7 @@ repository {
 
 dependency {
     // Include the sdk as a dependency
-    compile('com.microsoft.graph:microsoft-graph:1.0.+')
+    compile('com.microsoft.graph:microsoft-graph:1.5.+')
 }
 ```
 
@@ -28,7 +28,7 @@ Add the dependency in `dependencies` in pom.xml
 <dependency>
 	<groupId>com.microsoft.graph</groupId>
 	<artifactId>microsoft-graph</artifactId>
-	<version>1.0.1</version>
+	<version>1.5.0</version>
 </dependency>
 ```
 
@@ -109,7 +109,7 @@ Thanks to everyone who has already devoted time to improving the library:
 <!-- prettier-ignore -->
 | [<img src="https://avatars.githubusercontent.com/u/2273297?v=4" width="100px;"/><br /><sub><b>Caitlin Bales</b></sub>](https://developer.microsoft.com/graph)<br />[💬](#question-cbales "Answering Questions") [💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=cbales "Code") [📖](https://github.com/microsoftgraph/msgraph-sdk-java/wiki "Documentation") [👀](#review-cbales "Reviewed Pull Requests") [⚠️](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=cbales "Tests")| [<img src="https://avatars.githubusercontent.com/u/318187?v=4" width="100px;"/><br /><sub><b>David Moten</b></sub>](https://github.com/davidmoten)<br /> [🐛](https://github.com/microsoftgraph/msgraph-sdk-java/issues?q=is%3Aissue+author%3Adavidmoten "Bug reports") [💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=davidmoten "Code") [📖](https://github.com/microsoftgraph/msgraph-sdk-java/commit/87389b5a4240072e3f2226a2f04f089916ffed0b#diff-04c6e90faac2675aa89e2176d2eec7d8 "Documentation") [🤔](#ideas-davidmoten "Ideas & Planning") [👀](#review-davidmoten "Reviewed Pull Requests") [⚠️](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=davidmoten "Tests") | [<img src="https://avatars.githubusercontent.com/u/8527305?v=4" width="100px;"/><br /><sub><b>Michael Mainer</b></sub>](https://developer.microsoft.com/graph)<br /> [💬](#question-cbales "Answering Questions") [🤔](#ideas-MIchaelMainer "Ideas & Planning") [👀](#review-MIchaelMainer "Reviewed Pull Requests") | [<img src="https://avatars.githubusercontent.com/u/27295799?v=4" width="100px;"/><br /><sub><b>Linda Caputo</b></sub>](https://developer.microsoft.com/graph)<br />[📖](https://github.com/microsoftgraph/msgraph-sdk-java/wiki "Documentation") | [<img src="https://avatars.githubusercontent.com/u/8884923?v=4" width="100px;"/><br /><sub><b>John Austin</b></sub>](https://developer.microsoft.com/graph)<br />[🐛](https://github.com/microsoftgraph/msgraph-sdk-java/issues "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/3460953?v=4" width="100px;"/><br /><sub><b>Dmitry Pimenov</b></sub>](https://developer.microsoft.com/graph)<br />[🤔](#ideas-dpim "Ideas & Planning") | [<img src="https://avatars.githubusercontent.com/u/1427840?v=4" width="100px;"/><br /><sub><b>Jonathan Giles</b></sub>](https://github.com/JonathanGiles)<br />[🤔](#ideas-JonathanGiles "Ideas & Planning") |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-|  [<img src="https://avatars.githubusercontent.com/u/881767?v=4" width="100px;"/><br /><sub><b>Martin Sawicki</b></sub>](https://github.com/martinsawicki)<br />[🤔](#ideas-martinsawicki "Ideas & Planning") | [<img src="https://avatars.githubusercontent.com/u/29152134?v=4" width="100px;"/><br /><sub><b>Louis Maresca</b></sub>](https://github.com/LouMM)<br />[🤔](#ideas-LouMM "Ideas & Planning") [👀](#review-LouMM "Reviewed Pull Requests") | [<img src="https://avatars.githubusercontent.com/u/604089?v=4" width="100px;"/><br /><sub><b>Josef H.B. Schneider</b></sub>](https://j0s.at/)<br />[🐛](https://github.com/microsoftgraph/msgraph-sdk-java/issues?q=is%3Aissue+author%3AJ0s3f "Bug reports") [💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=J0s3f "Code") | [<img src="https://avatars2.githubusercontent.com/u/3197588?v=4" width="100px;"/><br /><sub><b>Deepak Agrawal</b></sub>](https://github.com/deepak2016)<br />[💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=deepak2016 "Code") | [<img src="https://avatars3.githubusercontent.com/u/16473684?v=4" width="100px;"/><br /><sub><b>Nakul Sabharwal</b></sub>](https://github.com/NakulSabharwal)<br />[💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=NakulSabharwal "Code") [👀](#review-NakulSabharwal "Reviewed Pull Requests")
+|  [<img src="https://avatars.githubusercontent.com/u/881767?v=4" width="100px;"/><br /><sub><b>Martin Sawicki</b></sub>](https://github.com/martinsawicki)<br />[🤔](#ideas-martinsawicki "Ideas & Planning") | [<img src="https://avatars.githubusercontent.com/u/29152134?v=4" width="100px;"/><br /><sub><b>Louis Maresca</b></sub>](https://github.com/LouMM)<br />[🤔](#ideas-LouMM "Ideas & Planning") [👀](#review-LouMM "Reviewed Pull Requests") | [<img src="https://avatars.githubusercontent.com/u/604089?v=4" width="100px;"/><br /><sub><b>Josef H.B. Schneider</b></sub>](https://j0s.at/)<br />[🐛](https://github.com/microsoftgraph/msgraph-sdk-java/issues?q=is%3Aissue+author%3AJ0s3f "Bug reports") [💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=J0s3f "Code") | [<img src="https://avatars2.githubusercontent.com/u/3197588?v=4" width="100px;"/><br /><sub><b>Deepak Agrawal</b></sub>](https://github.com/deepak2016)<br />[💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=deepak2016 "Code") | <img src="https://avatars.githubusercontent.com/u/22523479?v=4" width="100px;"/><br /><sub><b>Ben Tipper</b></sub><br /> | [<img src="https://avatars3.githubusercontent.com/u/16473684?v=4" width="100px;"/><br /><sub><b>Nakul Sabharwal</b></sub>](https://github.com/NakulSabharwal)<br />[💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=NakulSabharwal "Code") [👀](#review-NakulSabharwal "Reviewed Pull Requests")
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind are welcome!

build.gradle

@@ -35,6 +35,9 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.2'
 
     compile 'com.sun.jersey:jersey-server:1.19.4'
+    
+    // Core Http library 
+    compile('com.microsoft.graph:microsoft-graph-core:1.0.0')
 }
 
 def pomConfig = {

gradle.properties

@@ -26,8 +26,8 @@ mavenBintraySnapshotUrl = http://oss.jfrog.org/artifactory/oss-snapshot-local
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph
 mavenMajorVersion    = 1
-mavenMinorVersion    = 0
-mavenPatchVersion    = 1
+mavenMinorVersion    = 6
+mavenPatchVersion    = 0
 mavenArtifactSuffix = 
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 

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

@@ -82,7 +82,7 @@ public class ChunkedUploadProvider<UploadType> {
     /**
      * The stream size
      */
-    private final int streamSize;
+    private final long streamSize;
 
     /**
      * The upload response handler
@@ -92,7 +92,7 @@ public class ChunkedUploadProvider<UploadType> {
     /**
      * The counter for how many bytes have been read from input stream
      */
-    private int readSoFar;
+    private long readSoFar;
 
     /**
      * Creates the ChunkedUploadProvider
@@ -106,7 +106,7 @@ public class ChunkedUploadProvider<UploadType> {
     public ChunkedUploadProvider(final UploadSession uploadSession,
                                  final IGraphServiceClient client,
                                  final InputStream inputStream,
-                                 final int streamSize,
+                                 final long streamSize,
                                  final Class<UploadType> uploadTypeClass) {
         if (uploadSession == null) {
             throw new InvalidParameterException("Upload session is null.");

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

@@ -22,19 +22,22 @@
 
 package com.microsoft.graph.concurrency;
 
-import com.microsoft.graph.requests.extensions.ChunkedUploadResult;
-import com.microsoft.graph.models.extensions.UploadSession;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.microsoft.graph.http.DefaultHttpProvider;
 import com.microsoft.graph.http.GraphServiceException;
 import com.microsoft.graph.http.HttpResponseCode;
 import com.microsoft.graph.http.IConnection;
 import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.http.IStatefulResponseHandler;
 import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.models.extensions.UploadSession;
+import com.microsoft.graph.requests.extensions.ChunkedUploadResult;
 import com.microsoft.graph.serializer.ISerializer;
 
-import java.io.BufferedInputStream;
-import java.io.InputStream;
+import okhttp3.Response;
 
 /**
  * Handles the stateful response from the OneDrive upload session
@@ -66,6 +69,16 @@ public ChunkedUploadResponseHandler(final Class<UploadType> uploadType) {
     public void configConnection(final IConnection connection) {
         return;
     }
+    
+    /**
+     * Do nothing before getting the response
+     *
+     * @param response The response
+     */
+    @Override
+    public void configConnection(final Response response) {
+        return;
+    }
 
     /**
      * Generate the chunked upload response result
@@ -112,10 +125,68 @@ public ChunkedUploadResult<UploadType> generateResult(
             }
         } finally {
             if (in != null) {
-                in.close();
+                try{
+                	in.close();
+                } catch(IOException e) {
+                	logger.logError(e.getMessage(), e);
+                }
             }
         }
 
         return null;
     }
+    
+    /**
+     * Generate the chunked upload response result
+     *
+     * @param request    the HTTP request
+     * @param response the HTTP response
+     * @param serializer the serializer
+     * @param logger     the system logger
+     * @return the chunked upload result, which could be either an uploaded item or error
+     * @throws Exception an exception occurs if the request was unable to complete for any reason
+     */
+    @Override
+    public ChunkedUploadResult<UploadType> generateResult(
+            final IHttpRequest request,
+            final Response response,
+            final ISerializer serializer,
+            final ILogger logger) throws Exception {
+        InputStream in = null;
+        try {
+        	if (response.code() == HttpResponseCode.HTTP_ACCEPTED) {
+        		logger.logDebug("Chunk bytes has been accepted by the server.");
+        		in = new BufferedInputStream(response.body().byteStream());
+        		final UploadSession session = serializer.deserializeObject(
+        				DefaultHttpProvider.streamToString(in), UploadSession.class);
+
+        		return new ChunkedUploadResult<UploadType>(session);
+
+        	} else if (response.code() == HttpResponseCode.HTTP_CREATED
+        			|| response.code() == HttpResponseCode.HTTP_OK) {
+        		logger.logDebug("Upload session is completed, uploaded item returned.");
+        		in = new BufferedInputStream(response.body().byteStream());
+        		String rawJson = DefaultHttpProvider.streamToString(in);
+        		UploadType uploadedItem = serializer.deserializeObject(rawJson,
+        				this.deserializeTypeClass);
+
+        		return new ChunkedUploadResult<UploadType>(uploadedItem);
+        	} else if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
+        		logger.logDebug("Receiving error during upload, see detail on result error");
+
+        		return new ChunkedUploadResult<UploadType>(
+        				GraphServiceException.createFromConnection(request, null, serializer,
+        						response, logger));
+        	}
+        } finally {
+        	if (in != null) {
+        		try{
+        			in.close();
+        		} catch(IOException e) {
+        			logger.logError(e.getMessage(), e);
+        		}
+        	}
+        }
+        return null;
+    }
 }

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

@@ -5,12 +5,28 @@ private Constants() {
 	}
 
 	public static final String APPROOT = "approot";
+	/**
+	 * The content type header
+	 */
+	public static final String CONTENT_TYPE_HEADER_NAME = "Content-Type";
+	/**
+	 * The encoding type for getBytes
+	 */
+	public static final String JSON_ENCODING = "UTF-8";
+	/**
+	 * The content type for JSON responses
+	 */
+	public static final String JSON_CONTENT_TYPE = "application/json";
+	/**
+	 * The binary content type header's value 
+	 */
+	public static final String BINARY_CONTENT_TYPE = "application/octet-stream";
 
 	// Constants for functional tests
 	// TO-DO: document how to register an application for functional 
 	// testing purposes
 	public static final String APPID = "app-id";
 	public static final String USERNAME = "[email protected]";
 	public static final String PASSWORD = "password";
-	public static final String VERSION_NAME = "1.0.1";
+	public static final String VERSION_NAME = "1.6.0";
 }

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

@@ -25,7 +25,7 @@
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 import com.microsoft.graph.concurrency.DefaultExecutors;
 import com.microsoft.graph.concurrency.IExecutors;
-import com.microsoft.graph.http.DefaultHttpProvider;
+import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.http.IHttpProvider;
 import com.microsoft.graph.logger.DefaultLogger;
 import com.microsoft.graph.logger.ILogger;
@@ -45,7 +45,7 @@ public abstract class DefaultClientConfig implements IClientConfig {
     /**
      * The HTTP provider instance
      */
-    private DefaultHttpProvider httpProvider;
+    private IHttpProvider httpProvider;
 
     /**
      * The logger
@@ -98,11 +98,11 @@ public IAuthenticationProvider getAuthenticationProvider() {
     @Override
     public IHttpProvider getHttpProvider() {
         if (httpProvider == null) {
-            httpProvider = new DefaultHttpProvider(getSerializer(),
+            httpProvider = new CoreHttpProvider(getSerializer(),
                     getAuthenticationProvider(),
                     getExecutors(),
                     getLogger());
-            getLogger().logDebug("Created DefaultHttpProvider");
+            getLogger().logDebug("Created CoreHttpProvider");
         }
         return httpProvider;
     }