Merge pull request #157 from microsoftgraph/bugfix/collections-nextpage-null

- fixes a bug where next page would always be null because of deserialization regression

Author: baywet

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

@@ -24,6 +24,7 @@
 
 import java.net.URL;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -118,11 +119,10 @@ protected java.util.concurrent.CompletableFuture<T2> sendAsync() throws ClientEx
      */
     @Nullable
     public T3 buildFromResponse(@Nonnull final T2 response) {
-        final List<com.microsoft.graph.options.Option> options = new java.util.ArrayList<com.microsoft.graph.options.Option>();
         try {
             final Object builder = response.nextLink() == null ? null : this.collRequestBuilderClass
                     .getConstructor(String.class, IBaseClient.class, java.util.List.class)
-                    .newInstance(response.nextLink(), getBaseRequest().getClient(), options);
+                    .newInstance(response.nextLink(), getBaseRequest().getClient(), Collections.emptyList());
             final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), this.collRequestBuilderClass).newInstance(response, builder);
             return page;
         } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {

src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java

@@ -95,6 +95,9 @@ public static <T1> BaseCollectionResponse<T1> deserialize(@Nonnull final JsonEle
             }
             final BaseCollectionResponse<T1> response = (BaseCollectionResponse<T1>)responseClass.getConstructor().newInstance();
             response.value = list;
+            final JsonElement potentialNextLink = jsonAsObject.get("@odata.nextLink");
+            if(potentialNextLink != null)
+                response.nextLink = potentialNextLink.getAsString();
             response.setRawObject(serializer, jsonAsObject);
             return response;
         } catch(NoSuchMethodException | InstantiationException | InvocationTargetException ex) {