Merge pull request #28 from microsoftgraph/iambmelt/work

Excel + Bugfixes (v1.1.0)

Author: iambmelt

README.md

@@ -1,6 +1,6 @@
 # Get started with the Microsoft Graph SDK for Android
 
-[ ![Download](https://api.bintray.com/packages/microsoftgraph/Maven/msgraph-sdk-android/images/download.svg) ](https://bintray.com/microsoftgraph/Maven/msgraph-sdk-android/_latestVersion)[![Build Status](https://travis-ci.org/microsoftgraph/msgraph-sdk-android.svg?branch=master)](https://travis-ci.org/microsoftgraph/msgraph-sdk-android)
+[ ![Download](https://api.bintray.com/packages/microsoftgraph/Maven/msgraph-sdk-android/images/download.svg) ](https://bintray.com/microsoftgraph/Maven/msgraph-sdk-android/_latestVersion)
 
 Integrate the [Microsoft Graph API](https://graph.microsoft.io/en-us/getting-started) into your Android application!
 

gradle.properties

@@ -22,6 +22,6 @@ mavenRepoUrl         = https://api.bintray.com/maven/microsoftgraph/Maven/msgrap
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = msgraph-sdk-android
 mavenMajorVersion    = 1
-mavenMinorVersion    = 0
+mavenMinorVersion    = 1
 mavenPatchVersion    = 0
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven

graphsdk/src/androidTest/java/com/microsoft/graph/serializer/DefaultSerializerTests.java

@@ -70,7 +70,7 @@ public void testRecurrenceRangeDeserialization() throws Exception {
     }
 
     public void testRecurrenceRangeSerialization() throws Exception {
-        final String expected = "{\"endDate\":\"2016-05-25\",\"numberOfOccurrences\":4,\"@odata.type\":\"microsoft.graph.recurrenceRange\",\"recurrenceTimeZone\":\"PST\",\"startDate\":\"2016-04-25\",\"type\":\"endDate\"}";
+        final String expected = "{\"endDate\":\"2016-05-25\",\"numberOfOccurrences\":4,\"recurrenceTimeZone\":\"PST\",\"startDate\":\"2016-04-25\",\"type\":\"endDate\"}";
         final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
         BaseRecurrenceRange brr = new BaseRecurrenceRange();
         brr.type = RecurrenceRangeType.endDate;

…h/core/BasePostMethodRequestBuilder.java …graph/core/BaseActionRequestBuilder.javagraphsdk/src/main/java/com/microsoft/graph/core/BasePostMethodRequestBuilder.java renamed to graphsdk/src/main/java/com/microsoft/graph/core/BaseActionRequestBuilder.java graphsdk/src/main/java/com/microsoft/graph/core/BasePostMethodRequestBuilder.java renamed to graphsdk/src/main/java/com/microsoft/graph/core/BaseActionRequestBuilder.java

@@ -14,24 +14,24 @@
 /**
  * The base method request builder class used for POST actions.
  */
-public class BasePostMethodRequestBuilder extends BaseRequestBuilder {
+public class BaseActionRequestBuilder extends BaseRequestBuilder {
 
     /**
      * The body params to add to this request
      */
     protected Map<String, Object> mBodyParams = new HashMap<>();
 
     /**
-     * Constructs a new {@link BasePostMethodRequestBuilder}
+     * Constructs a new {@link BaseActionRequestBuilder}
      *
      * @param requestUrl the URL for the request
      * @param client     the {@link IBaseClient} for handling requests
      * @param options    {@link List} of {@link Option}s to add to this request
      */
-    public BasePostMethodRequestBuilder(
-            String requestUrl,
-            IBaseClient client,
-            List<Option> options
+    public BaseActionRequestBuilder(
+            final String requestUrl,
+            final IBaseClient client,
+            final List<Option> options
     ) {
         super(requestUrl, client, options);
     }
@@ -40,9 +40,9 @@ public BasePostMethodRequestBuilder(
      * Checks if the parameter map contains a object accessible by the supplied key
      *
      * @param name The key used to access the stored body param
-     * @return true, if {@link BasePostMethodRequestBuilder#mBodyParams} contains the key, otherwise false
+     * @return true, if {@link BaseActionRequestBuilder#mBodyParams} contains the key, otherwise false
      */
-    protected boolean hasParameter(String name) {
+    protected boolean hasParameter(final String name) {
         return mBodyParams.containsKey(name);
     }
 
@@ -53,7 +53,7 @@ protected boolean hasParameter(String name) {
      * @param <T>  The type to which this object should be cast
      * @return The stored instance of T, otherwise null
      */
-    protected <T> T getParameter(String name) {
+    protected <T> T getParameter(final String name) {
         return (T) mBodyParams.get(name);
     }
 }

…ph/core/BaseGetMethodRequestBuilder.java …aph/core/BaseFunctionRequestBuilder.javagraphsdk/src/main/java/com/microsoft/graph/core/BaseGetMethodRequestBuilder.java renamed to graphsdk/src/main/java/com/microsoft/graph/core/BaseFunctionRequestBuilder.java graphsdk/src/main/java/com/microsoft/graph/core/BaseGetMethodRequestBuilder.java renamed to graphsdk/src/main/java/com/microsoft/graph/core/BaseFunctionRequestBuilder.java

@@ -14,24 +14,24 @@
 /**
  * The base method request builder class.
  */
-public class BaseGetMethodRequestBuilder extends BaseRequestBuilder {
+public class BaseFunctionRequestBuilder extends BaseRequestBuilder {
 
     /**
      * The {@link FunctionOption}s to add to this request
      */
     protected List<FunctionOption> mFunctionOptions = new ArrayList<>();
 
     /**
-     * Constructs a new {@link BaseGetMethodRequestBuilder}
+     * Constructs a new {@link BaseFunctionRequestBuilder}
      *
      * @param requestUrl the URL for the request
      * @param client     the {@link IBaseClient} for handling requests
      * @param options    {@link List} of {@link Option}s to add to this request
      */
-    public BaseGetMethodRequestBuilder(
-            String requestUrl,
-            IBaseClient client,
-            List<Option> options
+    public BaseFunctionRequestBuilder(
+            final String requestUrl,
+            final IBaseClient client,
+            final List<Option> options
     ) {
         super(requestUrl, client, options);
     }

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

@@ -23,11 +23,11 @@
 package com.microsoft.graph.core;
 
 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.logger.DefaultLogger;
-import com.microsoft.graph.concurrency.DefaultExecutors;
 import com.microsoft.graph.http.IHttpProvider;
+import com.microsoft.graph.logger.DefaultLogger;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
@@ -64,18 +64,30 @@ public abstract class DefaultClientConfig implements IClientConfig {
 
     /**
      * Creates an instance of this config with an auth provider.
+     *
      * @param authenticationProvider The authentication provider.
      * @return The IClientConfig.
      */
-    public static IClientConfig createWithAuthenticationProvider(final IAuthenticationProvider authenticationProvider) {
-        DefaultClientConfig config = new DefaultClientConfig() { };
+    public static IClientConfig createWithAuthenticationProvider(
+            final IAuthenticationProvider authenticationProvider
+    ) {
+        DefaultClientConfig config = new DefaultClientConfig() {
+        };
         config.mAuthenticationProvider = authenticationProvider;
-        config.getLogger().logDebug("Using provided auth provider " + authenticationProvider.getClass().getSimpleName());
+        config
+                .getLogger()
+                .logDebug(
+                        "Using provided auth provider "
+                                + authenticationProvider
+                                .getClass()
+                                .getSimpleName()
+                );
         return config;
     }
 
     /**
      * Gets the authentication provider.
+     *
      * @return The authentication provider.
      */
     @Override
@@ -85,22 +97,24 @@ public IAuthenticationProvider getAuthenticationProvider() {
 
     /**
      * Gets the http provider.
+     *
      * @return The http provider.
      */
     @Override
     public IHttpProvider getHttpProvider() {
         if (mHttpProvider == null) {
             mHttpProvider = new DefaultHttpProvider(getSerializer(),
-                                                    getAuthenticationProvider(),
-                                                    getExecutors(),
-                                                    getLogger());
+                    getAuthenticationProvider(),
+                    getExecutors(),
+                    getLogger());
             mLogger.logDebug("Created DefaultHttpProvider");
         }
         return mHttpProvider;
     }
 
     /**
      * Gets the serializer.
+     *
      * @return The serializer.
      */
     @Override
@@ -114,6 +128,7 @@ public ISerializer getSerializer() {
 
     /**
      * Gets the executors.
+     *
      * @return The executors.
      */
     @Override
@@ -127,6 +142,7 @@ public IExecutors getExecutors() {
 
     /**
      * Gets the logger.
+     *
      * @return The logger.
      */
     public ILogger getLogger() {

graphsdk/src/main/java/com/microsoft/graph/extensions/AttachmentCollectionRequest.java

@@ -27,9 +27,9 @@ public class AttachmentCollectionRequest extends BaseAttachmentCollectionRequest
      *
      * @param requestUrl The request url
      * @param client The service client
-     * @param options The options for this request
+     * @param requestOptions The options for this request
      */
-    public AttachmentCollectionRequest(final String requestUrl, final IBaseClient client, final List<Option> options) {
-        super(requestUrl, client, options);
+    public AttachmentCollectionRequest(final String requestUrl, final IBaseClient client, final List<Option> requestOptions) {
+        super(requestUrl, client, requestOptions);
     }
 }

graphsdk/src/main/java/com/microsoft/graph/extensions/AttachmentCollectionRequestBuilder.java

@@ -27,9 +27,9 @@ public class AttachmentCollectionRequestBuilder extends BaseAttachmentCollection
      *
      * @param requestUrl The request url
      * @param client The service client
-     * @param options The options for this request
+     * @param requestOptions The options for this request
      */
-    public AttachmentCollectionRequestBuilder(final String requestUrl, final IBaseClient client, final List<Option> options) {
-        super(requestUrl, client, options);
+    public AttachmentCollectionRequestBuilder(final String requestUrl, final IBaseClient client, final List<Option> requestOptions) {
+        super(requestUrl, client, requestOptions);
     }
 }

graphsdk/src/main/java/com/microsoft/graph/extensions/AttachmentRequest.java

@@ -27,24 +27,24 @@ public class AttachmentRequest extends BaseAttachmentRequest implements IAttachm
      *
      * @param requestUrl The request url
      * @param client The service client
-     * @param options The options for this request
+     * @param requestOptions The options for this request
      * @param responseClass The class of the reponse
      */
     public AttachmentRequest(final String requestUrl,
             final IBaseClient client,
-            final List<Option> options,
+            final List<Option> requestOptions,
             final Class responseClass) {
-        super(requestUrl, client, options, responseClass);
+        super(requestUrl, client, requestOptions, responseClass);
     }
 
     /**
      * The request for the Attachment
      *
      * @param requestUrl The request url
      * @param client The service client
-     * @param options The options for this request
+     * @param requestOptions The options for this request
      */
-    public AttachmentRequest(final String requestUrl, final IBaseClient client, final List<Option> options) {
-        super(requestUrl, client, options, Attachment.class);
+    public AttachmentRequest(final String requestUrl, final IBaseClient client, final List<Option> requestOptions) {
+        super(requestUrl, client, requestOptions, Attachment.class);
     }
 }

graphsdk/src/main/java/com/microsoft/graph/extensions/AttachmentRequestBuilder.java

@@ -27,9 +27,9 @@ public class AttachmentRequestBuilder extends BaseAttachmentRequestBuilder imple
      *
      * @param requestUrl The request url
      * @param client The service client
-     * @param options The options for this request
+     * @param requestOptions The options for this request
      */
-    public AttachmentRequestBuilder(final String requestUrl, final IBaseClient client, final List<Option> options) {
-        super(requestUrl, client, options);
+    public AttachmentRequestBuilder(final String requestUrl, final IBaseClient client, final List<Option> requestOptions) {
+        super(requestUrl, client, requestOptions);
     }
 }