Merge branch 'dev' into vidadhee/AdditionalDataManagerTest

Author: baywet

README.md

@@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
 
 ### 1.3 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 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).
+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). Checkout the [recommended rules](./docs/proguard-rules.txt).
 
 ## 2. Getting started
 

build.gradle

@@ -36,7 +36,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:3.12.1'
 
     // Core Http library 
-    implementation 'com.microsoft.graph:microsoft-graph-core:1.0.3'
+    implementation 'com.microsoft.graph:microsoft-graph-core:1.0.4'
 }
 
 def pomConfig = {

docs/proguard-rules.txt

@@ -0,0 +1,39 @@
+-keep class com.microsoft.** { *; }
+
+## GSON 2.2.4 specific rules ##
+# Source: https://github.com/google/gson/blob/master/examples/android-proguard-example/proguard.cfg
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+-keepattributes EnclosingMethod
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+-keep class com.google.gson.stream.** { *; }
+# Gson specific classes used by Broker.
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+-dontnote sun.misc.Unsafe
+-dontnote com.google.gson.**
+
+# JUnit
+-dontwarn org.junit.**
+-dontwarn junit.**
+
+# okhttp
+
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+
+# okio
+
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okio.**

src/main/java/com/microsoft/graph/callrecords/requests/extensions/CallRecordCollectionRequestBuilder.java

@@ -36,10 +36,22 @@ public CallRecordCollectionRequestBuilder(final String requestUrl, final IBaseCl
         super(requestUrl, client, requestOptions);
     }
 
-    public ICallRecordCollectionRequest buildRequest() {
-        return buildRequest(getOptions());
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
+    public ICallRecordCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
+        return buildRequest(getOptions(requestOptions));
     }
 
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
     public ICallRecordCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
         return new CallRecordCollectionRequest(getRequestUrl(), getClient(), requestOptions);
     }

src/main/java/com/microsoft/graph/callrecords/requests/extensions/CallRecordRequestBuilder.java

@@ -38,10 +38,11 @@ public CallRecordRequestBuilder(final String requestUrl, final IBaseClient clien
     /**
      * Creates the request
      *
+     * @param requestOptions the options for this request
      * @return the ICallRecordRequest instance
      */
-    public ICallRecordRequest buildRequest() {
-        return buildRequest(getOptions());
+    public ICallRecordRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
+        return buildRequest(getOptions(requestOptions));
     }
 
     /**

src/main/java/com/microsoft/graph/callrecords/requests/extensions/ICallRecordCollectionRequestBuilder.java

@@ -23,8 +23,20 @@
  */
 public interface ICallRecordCollectionRequestBuilder extends IRequestBuilder {
 
-    ICallRecordCollectionRequest buildRequest();
-
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
+    ICallRecordCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);
+
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
     ICallRecordCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions);
 
     ICallRecordRequestBuilder byId(final String id);

src/main/java/com/microsoft/graph/callrecords/requests/extensions/ICallRecordRequestBuilder.java

@@ -22,9 +22,10 @@ public interface ICallRecordRequestBuilder extends IRequestBuilder {
     /**
      * Creates the request
      *
+     * @param requestOptions the options for this request
      * @return the ICallRecordRequest instance
      */
-    ICallRecordRequest buildRequest();
+    ICallRecordRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);
 
     /**
      * Creates the request with specific options instead of the existing options

src/main/java/com/microsoft/graph/callrecords/requests/extensions/ISegmentCollectionRequestBuilder.java

@@ -23,8 +23,20 @@
  */
 public interface ISegmentCollectionRequestBuilder extends IRequestBuilder {
 
-    ISegmentCollectionRequest buildRequest();
-
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
+    ISegmentCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);
+
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
     ISegmentCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions);
 
     ISegmentRequestBuilder byId(final String id);

src/main/java/com/microsoft/graph/callrecords/requests/extensions/ISegmentRequestBuilder.java

@@ -20,9 +20,10 @@ public interface ISegmentRequestBuilder extends IRequestBuilder {
     /**
      * Creates the request
      *
+     * @param requestOptions the options for this request
      * @return the ISegmentRequest instance
      */
-    ISegmentRequest buildRequest();
+    ISegmentRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);
 
     /**
      * Creates the request with specific options instead of the existing options

src/main/java/com/microsoft/graph/callrecords/requests/extensions/ISessionCollectionRequestBuilder.java

@@ -23,8 +23,20 @@
  */
 public interface ISessionCollectionRequestBuilder extends IRequestBuilder {
 
-    ISessionCollectionRequest buildRequest();
-
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
+    ISessionCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);
+
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
     ISessionCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions);
 
     ISessionRequestBuilder byId(final String id);