Update generated v1.0 Java models and requests with build 3688896 [sk…

src/main/java/com/microsoft/graph/models/extensions/AdministrativeUnit.java

@@ -9,6 +9,14 @@
 import java.util.Arrays;
 import java.util.EnumSet;
 import com.microsoft.graph.models.extensions.DirectoryObject;
+import com.microsoft.graph.models.extensions.ScopedRoleMembership;
+import com.microsoft.graph.models.extensions.Extension;
+import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionResponse;
+import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionPage;
+import com.microsoft.graph.requests.extensions.ScopedRoleMembershipCollectionResponse;
+import com.microsoft.graph.requests.extensions.ScopedRoleMembershipCollectionPage;
+import com.microsoft.graph.requests.extensions.ExtensionCollectionResponse;
+import com.microsoft.graph.requests.extensions.ExtensionCollectionPage;
 
 
 import com.google.gson.JsonObject;
@@ -26,6 +34,52 @@
 public class AdministrativeUnit extends DirectoryObject implements IJsonBackedObject {
 
 
+    /**
+     * The Description.
+     * 
+     */
+    @SerializedName("description")
+    @Expose
+    public String description;
+
+    /**
+     * The Display Name.
+     * 
+     */
+    @SerializedName("displayName")
+    @Expose
+    public String displayName;
+
+    /**
+     * The Visibility.
+     * 
+     */
+    @SerializedName("visibility")
+    @Expose
+    public String visibility;
+
+    /**
+     * The Members.
+     * 
+     */
+    public DirectoryObjectCollectionPage members;
+
+    /**
+     * The Scoped Role Members.
+     * 
+     */
+    @SerializedName("scopedRoleMembers")
+    @Expose
+    public ScopedRoleMembershipCollectionPage scopedRoleMembers;
+
+    /**
+     * The Extensions.
+     * 
+     */
+    @SerializedName("extensions")
+    @Expose
+    public ExtensionCollectionPage extensions;
+
 
     /**
      * The raw representation of this class
@@ -65,5 +119,53 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
         this.serializer = serializer;
         rawObject = json;
 
+
+        if (json.has("members")) {
+            final DirectoryObjectCollectionResponse response = new DirectoryObjectCollectionResponse();
+            if (json.has("members@odata.nextLink")) {
+                response.nextLink = json.get("members@odata.nextLink").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("members").toString(), JsonObject[].class);
+            final DirectoryObject[] array = new DirectoryObject[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), DirectoryObject.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            members = new DirectoryObjectCollectionPage(response, null);
+        }
+
+        if (json.has("scopedRoleMembers")) {
+            final ScopedRoleMembershipCollectionResponse response = new ScopedRoleMembershipCollectionResponse();
+            if (json.has("scopedRoleMembers@odata.nextLink")) {
+                response.nextLink = json.get("scopedRoleMembers@odata.nextLink").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("scopedRoleMembers").toString(), JsonObject[].class);
+            final ScopedRoleMembership[] array = new ScopedRoleMembership[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), ScopedRoleMembership.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            scopedRoleMembers = new ScopedRoleMembershipCollectionPage(response, null);
+        }
+
+        if (json.has("extensions")) {
+            final ExtensionCollectionResponse response = new ExtensionCollectionResponse();
+            if (json.has("extensions@odata.nextLink")) {
+                response.nextLink = json.get("extensions@odata.nextLink").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("extensions").toString(), JsonObject[].class);
+            final Extension[] array = new Extension[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Extension.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            extensions = new ExtensionCollectionPage(response, null);
+        }
     }
 }

src/main/java/com/microsoft/graph/models/extensions/DelegatedPermissionClassification.java

@@ -0,0 +1,94 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.models.extensions;
+import com.microsoft.graph.serializer.ISerializer;
+import com.microsoft.graph.serializer.IJsonBackedObject;
+import com.microsoft.graph.serializer.AdditionalDataManager;
+import java.util.Arrays;
+import java.util.EnumSet;
+import com.microsoft.graph.models.generated.PermissionClassificationType;
+import com.microsoft.graph.models.extensions.Entity;
+
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
+import java.util.HashMap;
+import java.util.Map;
+
+// **NOTE** This file was generated by a tool and any changes will be overwritten.
+
+/**
+ * The class for the Delegated Permission Classification.
+ */
+public class DelegatedPermissionClassification extends Entity implements IJsonBackedObject {
+
+
+    /**
+     * The Classification.
+     * 
+     */
+    @SerializedName("classification")
+    @Expose
+    public PermissionClassificationType classification;
+
+    /**
+     * The Permission Id.
+     * 
+     */
+    @SerializedName("permissionId")
+    @Expose
+    public String permissionId;
+
+    /**
+     * The Permission Name.
+     * 
+     */
+    @SerializedName("permissionName")
+    @Expose
+    public String permissionName;
+
+
+    /**
+     * The raw representation of this class
+     */
+    private JsonObject rawObject;
+
+    /**
+     * The serializer
+     */
+    private ISerializer serializer;
+
+    /**
+     * Gets the raw representation of this class
+     *
+     * @return the raw representation of this class
+     */
+    public JsonObject getRawObject() {
+        return rawObject;
+    }
+
+    /**
+     * Gets serializer
+     *
+     * @return the serializer
+     */
+    protected ISerializer getSerializer() {
+        return serializer;
+    }
+
+    /**
+     * Sets the raw JSON object
+     *
+     * @param serializer the serializer
+     * @param json the JSON object to set this object to
+     */
+    public void setRawObject(final ISerializer serializer, final JsonObject json) {
+        this.serializer = serializer;
+        rawObject = json;
+
+    }
+}

src/main/java/com/microsoft/graph/models/extensions/Directory.java

@@ -8,8 +8,11 @@
 import com.microsoft.graph.serializer.AdditionalDataManager;
 import java.util.Arrays;
 import java.util.EnumSet;
+import com.microsoft.graph.models.extensions.AdministrativeUnit;
 import com.microsoft.graph.models.extensions.DirectoryObject;
 import com.microsoft.graph.models.extensions.Entity;
+import com.microsoft.graph.requests.extensions.AdministrativeUnitCollectionResponse;
+import com.microsoft.graph.requests.extensions.AdministrativeUnitCollectionPage;
 import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionResponse;
 import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionPage;
 
@@ -29,6 +32,14 @@
 public class Directory extends Entity implements IJsonBackedObject {
 
 
+    /**
+     * The Administrative Units.
+     * 
+     */
+    @SerializedName("administrativeUnits")
+    @Expose
+    public AdministrativeUnitCollectionPage administrativeUnits;
+
     /**
      * The Deleted Items.
      * Recently deleted items. Read-only. Nullable.
@@ -77,6 +88,22 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
         rawObject = json;
 
 
+        if (json.has("administrativeUnits")) {
+            final AdministrativeUnitCollectionResponse response = new AdministrativeUnitCollectionResponse();
+            if (json.has("administrativeUnits@odata.nextLink")) {
+                response.nextLink = json.get("administrativeUnits@odata.nextLink").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("administrativeUnits").toString(), JsonObject[].class);
+            final AdministrativeUnit[] array = new AdministrativeUnit[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), AdministrativeUnit.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            administrativeUnits = new AdministrativeUnitCollectionPage(response, null);
+        }
+
         if (json.has("deletedItems")) {
             final DirectoryObjectCollectionResponse response = new DirectoryObjectCollectionResponse();
             if (json.has("deletedItems@odata.nextLink")) {

src/main/java/com/microsoft/graph/models/extensions/DirectoryRole.java

@@ -9,8 +9,11 @@
 import java.util.Arrays;
 import java.util.EnumSet;
 import com.microsoft.graph.models.extensions.DirectoryObject;
+import com.microsoft.graph.models.extensions.ScopedRoleMembership;
 import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionResponse;
 import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionPage;
+import com.microsoft.graph.requests.extensions.ScopedRoleMembershipCollectionResponse;
+import com.microsoft.graph.requests.extensions.ScopedRoleMembershipCollectionPage;
 
 
 import com.google.gson.JsonObject;
@@ -58,6 +61,14 @@ public class DirectoryRole extends DirectoryObject implements IJsonBackedObject
      */
     public DirectoryObjectCollectionPage members;
 
+    /**
+     * The Scoped Members.
+     * 
+     */
+    @SerializedName("scopedMembers")
+    @Expose
+    public ScopedRoleMembershipCollectionPage scopedMembers;
+
 
     /**
      * The raw representation of this class
@@ -113,5 +124,21 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
             response.value = Arrays.asList(array);
             members = new DirectoryObjectCollectionPage(response, null);
         }
+
+        if (json.has("scopedMembers")) {
+            final ScopedRoleMembershipCollectionResponse response = new ScopedRoleMembershipCollectionResponse();
+            if (json.has("scopedMembers@odata.nextLink")) {
+                response.nextLink = json.get("scopedMembers@odata.nextLink").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("scopedMembers").toString(), JsonObject[].class);
+            final ScopedRoleMembership[] array = new ScopedRoleMembership[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), ScopedRoleMembership.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            scopedMembers = new ScopedRoleMembershipCollectionPage(response, null);
+        }
     }
 }

src/main/java/com/microsoft/graph/models/extensions/IBaseGraphServiceClient.java

@@ -43,6 +43,8 @@
 import com.microsoft.graph.requests.extensions.IOAuth2PermissionGrantRequestBuilder;
 import com.microsoft.graph.requests.extensions.IOrganizationCollectionRequestBuilder;
 import com.microsoft.graph.requests.extensions.IOrganizationRequestBuilder;
+import com.microsoft.graph.requests.extensions.IScopedRoleMembershipCollectionRequestBuilder;
+import com.microsoft.graph.requests.extensions.IScopedRoleMembershipRequestBuilder;
 import com.microsoft.graph.requests.extensions.IServicePrincipalCollectionRequestBuilder;
 import com.microsoft.graph.requests.extensions.IServicePrincipalRequestBuilder;
 import com.microsoft.graph.requests.extensions.ISubscribedSkuCollectionRequestBuilder;
@@ -364,6 +366,21 @@ public interface IBaseGraphServiceClient extends IBaseClient {
      */
     IOrganizationRequestBuilder organization(final String id);
 
+    /**
+     * Gets the collection of ScopedRoleMemberships objects
+     *
+     * @return the request builder for the collection of ScopedRoleMemberships objects
+     */
+    IScopedRoleMembershipCollectionRequestBuilder scopedRoleMemberships();
+
+    /**
+     * Gets a single ScopedRoleMemberships
+     *
+     * @param id the id of the ScopedRoleMemberships to retrieve
+     * @return the request builder for the ScopedRoleMemberships object
+     */
+    IScopedRoleMembershipRequestBuilder scopedRoleMemberships(final String id);
+
     /**
      * Gets the collection of ServicePrincipals objects
      *

src/main/java/com/microsoft/graph/models/extensions/IGraphServiceClient.java

@@ -43,6 +43,8 @@
 import com.microsoft.graph.requests.extensions.IOAuth2PermissionGrantRequestBuilder;
 import com.microsoft.graph.requests.extensions.IOrganizationCollectionRequestBuilder;
 import com.microsoft.graph.requests.extensions.IOrganizationRequestBuilder;
+import com.microsoft.graph.requests.extensions.IScopedRoleMembershipCollectionRequestBuilder;
+import com.microsoft.graph.requests.extensions.IScopedRoleMembershipRequestBuilder;
 import com.microsoft.graph.requests.extensions.IServicePrincipalCollectionRequestBuilder;
 import com.microsoft.graph.requests.extensions.IServicePrincipalRequestBuilder;
 import com.microsoft.graph.requests.extensions.ISubscribedSkuCollectionRequestBuilder;