Merge branch 'master' into preview-release

Author: Caitlin Bales (MSFT)

README.md

@@ -1,13 +1,12 @@
 # Preview Microsoft Graph SDK for Java
 *This SDK is currently in preview. Please continue to provide [feedback](https://github.com/microsoftgraph/msgraph-sdk-java/issues/new) as we iterate towards a production-supported library.*
 
-# Get started with the Microsoft Graph SDK for Java
-
-Integrate the [Microsoft Graph API](https://developer.microsoft.com/graph) into your Java application!
+Get started with the Microsoft Graph SDK for Java by integrating the [Microsoft Graph API](https://graph.microsoft.io/en-us/getting-started) into your Java application!
 
 ## 1. Installation
+
 ### 1.1 Install via Gradle
-Add the JCenter repository and a compile dependency for `microsoft-graph` to your project's `build.gradle`
+Add the JCenter repository and a compile dependency for `microsoft-graph` to your project's `build.gradle`:
 
 ```gradle
 repository {
@@ -21,27 +20,22 @@ dependency {
 ```
 
 ### 1.2 Enable ProGuard (Android)
-
-The nature of the Graph API is such that the SDK needs quite a large set of classes to describe its functionality. You will need to ensure that [ProGuard](https://developer.android.com/studio/build/shrink-code.html) is enabled on your project. Otherwise, you will incur long build times for functionality that is not necessary relevant to your particular application. If you are still hitting the 64k method limit, you can also enable [multidexing](https://developer.android.com/studio/build/multidex.html).
+The nature of the Graph API is such that the SDK needs quite a large set of classes to describe its functionality. You need to ensure that [ProGuard](https://developer.android.com/studio/build/shrink-code.html) is enabled on your project. Otherwise, you will incur long build times for functionality that is not necessarily relevant to your particular application. If you are still hitting the 64K method limit, you can also enable [multidexing](https://developer.android.com/studio/build/multidex.html).
 
 ## 2. Getting started
 
 ### 2.1 Register your application
 
-Register your application by following [these](https://developer.microsoft.com/en-us/graph/docs/concepts/auth_register_app_v2) steps.
+Register your application by following the steps at [Register your app with the Azure AD v2.0 endpoint](https://developer.microsoft.com/en-us/graph/docs/concepts/auth_register_app_v2).
 
 ### 2.2 Create an IAuthenticationProvider object
 
-An instance of the **GraphServiceClient** class handles building requests,
-sending them to the Microsoft Graph API, and processing the responses. To create a
-new instance of this class, you need to provide an instance of
-`IAuthenticationProvider` which can authenticate requests to Microsoft Graph.
+An instance of the **GraphServiceClient** class handles building requests, sending them to the Microsoft Graph API, and processing the responses. To create a new instance of this class, you need to provide an instance of `IAuthenticationProvider`, which can authenticate requests to Microsoft Graph.
 
-For an example of authentication in a client application see the [MSGraph SDK Android MSA Auth for Android Adapter](https://github.com/microsoftgraph/msgraph-sdk-android-msa-auth-for-android-adapter).
+For an example of authentication in a client application, see the [MSGraph SDK Android MSA Auth for Android Adapter](https://github.com/microsoftgraph/msgraph-sdk-android-msa-auth-for-android-adapter).
 
 ### 2.3 Get a GraphServiceClient object
-
-Once you have set the correct application ID and url, you must get a **GraphServiceClient** object to make requests against the service. The SDK will store the account information for you, but when a user logs on for the first time, it will invoke UI to get the user's account information.
+After you have set the correct application ID and URL, you must get a **GraphServiceClient** object to make requests against the service. The SDK stores the account information for you, but when a user signs in for the first time, it invokes the UI to get the user's account information.
 
 ```java
 IClientConfig clientConfig = 
@@ -55,9 +49,9 @@ IGraphServiceClient graphClient =
 
 ## 3. Make requests against the service
 
-Once you have a GraphServiceClient that is authenticated you can begin making calls against the service. The requests against the service look like our [REST API](https://developer.microsoft.com/en-us/graph/docs/concepts/overview).
+After you have a GraphServiceClient that is authenticated, you can begin making calls against the service. The requests against the service look like our [REST API](https://developer.microsoft.com/en-us/graph/docs/concepts/overview).
 
-### Get the user's drive
+### 3.1 Get the user's drive
 
 To retrieve the user's drive:
 
@@ -80,14 +74,14 @@ For a general overview of how the SDK is designed, see [overview](https://github
 
 ## 4. Documentation
 
-For a more detailed documentation see:
+For more detailed documentation, see:
 
 * [Overview](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Overview)
 * [Extending the library](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Extending-the-Library)
 * [Handling Open Types, PATCH support with `null` values](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Working-with-Open-Types)
 * [Collections](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Working-with-Collections)
-* [Making Custom Requests](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Custom-Requests)
-* [Known Issues](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Known-Issues)
+* [Making custom requests](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Custom-Requests)
+* [Known issues](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Known-Issues)
 * [Contributions](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/CONTRIBUTING.md)
 
 ## 5. Issues
@@ -96,7 +90,7 @@ For known issues, see [issues](https://github.com/MicrosoftGraph/msgraph-sdk-jav
 
 ## 6. Contributions
 
-The Microsoft Graph SDK is open for contribution. Please read how to contribute to this project [here](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/CONTRIBUTING.md).
+The Microsoft Graph SDK is open for contribution. To contribute to this project, see [Contributing](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/CONTRIBUTING.md).
 
 Thanks to everyone who has already devoted time to improving the library:
 
@@ -109,13 +103,13 @@ Thanks to everyone who has already devoted time to improving the library:
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind are welcome!
 
-## 7. Supported Java Versions
+## 7. Supported Java versions
 The Microsoft Graph SDK for Java library is supported at runtime for Java 7+ and [Android API revision 15](http://source.android.com/source/build-numbers.html) and greater.
 
 ## 8. License
 
 Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MIT license](LICENSE).
 
-## 9. Third Party Notices
+## 9. Third-party notices
 
-[Third Party Notices](THIRD%20PARTY%20NOTICES)
+[Third-party notices](THIRD%20PARTY%20NOTICES)

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,13 +102,13 @@ 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));
+                                connection, logger));
             }
         } finally {
             if (in != null) {

src/main/java/com/microsoft/graph/concurrency/ResultGetter.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/concurrency/SimpleWaiter.java

@@ -27,28 +27,15 @@
  */
 public class ClientException extends RuntimeException {
 
-    /**
-     * The error code for this exception.
-     */
-    private final GraphErrorCodes errorCode;
+    private static final long serialVersionUID = -1066560879567392559L;
 
     /**
      * Creates the client exception.
      * @param message The message to display.
      * @param ex The exception from.
      * @param errorCode The error code for this exception.
      */
-    public ClientException(final String message, final Throwable ex, final GraphErrorCodes errorCode) {
+    public ClientException(final String message, final Throwable ex) {
         super(message, ex);
-        this.errorCode = errorCode;
-    }
-
-    /**
-     * Determines if the given error code is expected.
-     * @param expectedCode The expected error code.
-     * @return true if the error code matches, and false if there was no match.
-     */
-    public boolean isError(final GraphErrorCodes expectedCode) {
-        return this.errorCode == expectedCode;
     }
 }

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

@@ -106,7 +106,7 @@ public IHttpProvider getHttpProvider() {
                     getAuthenticationProvider(),
                     getExecutors(),
                     getLogger());
-            logger.logDebug("Created DefaultHttpProvider");
+            getLogger().logDebug("Created DefaultHttpProvider");
         }
         return httpProvider;
     }
@@ -120,7 +120,7 @@ public IHttpProvider getHttpProvider() {
     public ISerializer getSerializer() {
         if (serializer == null) {
             serializer = new DefaultSerializer(getLogger());
-            logger.logDebug("Created DefaultSerializer");
+            getLogger().logDebug("Created DefaultSerializer");
         }
         return serializer;
     }
@@ -134,7 +134,7 @@ public ISerializer getSerializer() {
     public IExecutors getExecutors() {
         if (executors == null) {
             executors = new DefaultExecutors(getLogger());
-            logger.logDebug("Created DefaultExecutors");
+            getLogger().logDebug("Created DefaultExecutors");
         }
         return executors;
     }

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;
@@ -153,8 +153,13 @@ public URL getRequestUrl() {
         try {
             return new URL(uriBuilder.build().toString());
         } catch (final MalformedURLException e) {
-            throw new ClientException("Invalid URL: " + uriBuilder.toString(), e, GraphErrorCodes.INVALID_REQUEST);
+        	if (this instanceof CustomRequest) {
+        		this.getClient().getLogger().logError("Invalid custom URL: " + uriBuilder.toString(), e);
+        	} else {
+        		throw new ClientException("Invalid URL: " + uriBuilder.toString(), e);
+        	}
         }
+		return null;
     }
 
     private String addFunctionParameters() {
@@ -344,7 +349,8 @@ public IBaseClient getClient() {
      *
      * @return The response type.
      */
-    public Class getResponseType() {
+    @SuppressWarnings("unchecked")
+	public Class getResponseType() {
         return responseClass;
     }
 }

src/main/java/com/microsoft/graph/core/DefaultClientConfig.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);
         }