- updates beta with latest fixes from v1

Author: baywet

CONTRIBUTING.md

@@ -22,7 +22,8 @@ If major functionality is being added, or there will need to be gestation time f
 Revisions of this nature will result in a 0.X.X change of the version number.
 
 ## Submit pull requests for model or request files
-You can revise code in the extension folders of these folders. See [Extending the Library](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Extending-the-Library) for more information on how to work with the generated parts of the library.
+
+All the code of the current repository is being generated automatically by the [SDK generator](https://github.com/microsoftgraph/MSGraph-SDK-Code-Generator/) in which any change must be reflected.
 
 ## Add yourself as a contributor
 

README.md

@@ -107,12 +107,10 @@ For a general overview of how the SDK is designed, see [overview](https://github
 
 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)
+* [Overview](https://docs.microsoft.com/graph/overview)
+* [Collections](https://docs.microsoft.com/graph/sdks/paging)
+* [Making requests](https://docs.microsoft.com/graph/sdks/create-requests)
+* [Known issues](https://github.com/MicrosoftGraph/msgraph-sdk-java/issues)
 * [Contributions](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/CONTRIBUTING.md)
 
 ## 5. Issues

Scripts/incrementMinorVersion.ps1

@@ -56,4 +56,4 @@ function Update-MinorVersion() {
 	Update-TelemetryVersion -version $nextVersion -telemetryFilePath $telemetryFilePath
 	Update-PackageVersion -version $nextVersion -propertiesFilePath $propertiesFilePath
 }
-Update-MinorVersion
+Update-MinorVersion

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

@@ -1,16 +1,16 @@
 // ------------------------------------------------------------------------------
 // Copyright (c) 2017 Microsoft Corporation
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,6 +26,7 @@
 import com.microsoft.graph.serializer.AdditionalDataManager;
 import com.microsoft.graph.serializer.ISerializer;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -68,7 +69,7 @@ public abstract class BaseCollectionPage<T1, T2 extends IRequestBuilder> impleme
     public BaseCollectionPage(final List<T1> pageContents, final T2 nextRequestBuilder) {
         // CollectionPages are never directly modifiable, either 'update'/'delete' the specific child or 'add' the new
         // object to the 'children' of the collection.
-        this.pageContents = Collections.unmodifiableList(pageContents);
+        this.pageContents = Collections.unmodifiableList(pageContents == null ? new ArrayList<T1>() : pageContents);
         requestBuilder = nextRequestBuilder;
     }
 

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

@@ -156,8 +156,8 @@ else if (fieldObject instanceof List) {
 							final List<?> fieldObjectList = (List<?>) fieldObject;
 							if (collectionJson != null && collectionJson.isJsonArray()) {
 								final JsonArray rawJsonArray = (JsonArray) collectionJson;
-								final Integer fieldObjectListSize = fieldObjectList.size();
-								final Integer rawJsonArraySize = rawJsonArray.size();
+								final int fieldObjectListSize = fieldObjectList.size();
+								final int rawJsonArraySize = rawJsonArray.size();
 								for (int i = 0; i < fieldObjectListSize && i < rawJsonArraySize; i++) {
 									final Object element = fieldObjectList.get(i);
 									if (element instanceof IJsonBackedObject) {
@@ -167,8 +167,9 @@ else if (fieldObject instanceof List) {
 										}
 									}
 								}
-								if (rawJsonArraySize != fieldObjectListSize) 
+								if (rawJsonArraySize != fieldObjectListSize) {
 									logger.logDebug("rawJsonArray has a size of " + rawJsonArraySize + " and fieldObjectList of " + fieldObjectListSize);
+                                }
 							}
 						}
 						// If the object is a valid Graph object, set its additional data

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

@@ -41,6 +41,7 @@ public class EnumSetSerializer {
     private final Gson gson;
     /**
      * Not available for instantiation
+     * @param logger logger to use during serialization
      */
     public EnumSetSerializer(final ILogger logger) {
          gson = new GsonBuilder().registerTypeAdapterFactory(new FallbackTypeAdapterFactory(logger)).create();