Merge pull request #561 from microsoftgraph/v1.0/pipelinebuild/4090728

Generated v1.0 models and request builders using Typewriter

Author: baywet

README.md

@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph:2.3.+'
+    implementation 'com.microsoft.graph:microsoft-graph:2.4.+'
 }
 ```
 
@@ -31,7 +31,7 @@ Add the dependency in `dependencies` in pom.xml
 <dependency>
   <groupId>com.microsoft.graph</groupId>
   <artifactId>microsoft-graph</artifactId>
-  <version>2.3.2</version>
+  <version>2.4.0</version>
 </dependency>
 ```
 

gradle.properties

@@ -26,8 +26,8 @@ org.gradle.caching=true
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph
 mavenMajorVersion    = 2
-mavenMinorVersion    = 3
-mavenPatchVersion    = 2
+mavenMinorVersion    = 4
+mavenPatchVersion    = 0
 mavenArtifactSuffix = 
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 

src/main/java/com/microsoft/graph/core/Constants.java

@@ -30,5 +30,5 @@ private Constants() {
 	public static final String PASSWORD = "password";
 	public static final String TENANTID = "tenantid";
 	public static final String CLIENTSECRET = "clientsecret";
-	public static final String VERSION_NAME = "2.3.2";
+	public static final String VERSION_NAME = "2.4.0";
 }

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

@@ -54,6 +54,14 @@ public class Channel extends Entity implements IJsonBackedObject {
     @Expose
     public String email;
 
+    /**
+     * The Is Favorite By Default.
+     * Indicates whether the channel should automatically be marked 'favorite' for all members of the team. Can only be set programmatically with Create team. Default: false.
+     */
+    @SerializedName(value = "isFavoriteByDefault", alternate = {"IsFavoriteByDefault"})
+    @Expose
+    public Boolean isFavoriteByDefault;
+
     /**
      * The Membership Type.
      * 

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

@@ -92,7 +92,7 @@ public class DirectoryAudit extends Entity implements IJsonBackedObject {
 
     /**
      * The Result.
-     * Indicates the result of the activity.Possible values are: success, failure, timeout, unknownFutureValue.
+     * Indicates the result of the activity. Possible values are: success, failure, timeout, unknownFutureValue.
      */
     @SerializedName(value = "result", alternate = {"Result"})
     @Expose

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

@@ -320,7 +320,7 @@ public class Event extends OutlookItem implements IJsonBackedObject {
 
     /**
      * The Web Link.
-     * The URL to open the event in Outlook on the web.Outlook on the web opens the event in the browser if you are signed in to your mailbox. Otherwise, Outlook on the web prompts you to sign in.This URL can be accessed from within an iFrame.
+     * The URL to open the event in Outlook on the web.Outlook on the web opens the event in the browser if you are signed in to your mailbox. Otherwise, Outlook on the web prompts you to sign in.This URL cannot be accessed from within an iFrame.
      */
     @SerializedName(value = "webLink", alternate = {"WebLink"})
     @Expose

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

@@ -13,6 +13,7 @@
 import com.microsoft.graph.models.extensions.OnPremisesProvisioningError;
 import com.microsoft.graph.models.extensions.AppRoleAssignment;
 import com.microsoft.graph.models.extensions.DirectoryObject;
+import com.microsoft.graph.models.extensions.ResourceSpecificPermissionGrant;
 import com.microsoft.graph.models.extensions.GroupSetting;
 import com.microsoft.graph.models.extensions.Calendar;
 import com.microsoft.graph.models.extensions.Event;
@@ -28,6 +29,7 @@
 import com.microsoft.graph.models.extensions.Team;
 import com.microsoft.graph.requests.extensions.AppRoleAssignmentCollectionPage;
 import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionPage;
+import com.microsoft.graph.requests.extensions.ResourceSpecificPermissionGrantCollectionPage;
 import com.microsoft.graph.requests.extensions.GroupSettingCollectionPage;
 import com.microsoft.graph.requests.extensions.EventCollectionPage;
 import com.microsoft.graph.requests.extensions.ConversationCollectionPage;
@@ -387,6 +389,14 @@ public class Group extends DirectoryObject implements IJsonBackedObject {
      */
     public DirectoryObjectCollectionPage owners;
 
+    /**
+     * The Permission Grants.
+     * 
+     */
+    @SerializedName(value = "permissionGrants", alternate = {"PermissionGrants"})
+    @Expose
+    public ResourceSpecificPermissionGrantCollectionPage permissionGrants;
+
     /**
      * The Settings.
      * Read-only. Nullable.
@@ -603,6 +613,10 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
             owners = serializer.deserializeObject(json.get("owners").toString(), DirectoryObjectCollectionPage.class);
         }
 
+        if (json.has("permissionGrants")) {
+            permissionGrants = serializer.deserializeObject(json.get("permissionGrants").toString(), ResourceSpecificPermissionGrantCollectionPage.class);
+        }
+
         if (json.has("settings")) {
             settings = serializer.deserializeObject(json.get("settings").toString(), GroupSettingCollectionPage.class);
         }

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.IResourceSpecificPermissionGrantCollectionRequestBuilder;
+import com.microsoft.graph.requests.extensions.IResourceSpecificPermissionGrantRequestBuilder;
 import com.microsoft.graph.requests.extensions.IScopedRoleMembershipCollectionRequestBuilder;
 import com.microsoft.graph.requests.extensions.IScopedRoleMembershipRequestBuilder;
 import com.microsoft.graph.requests.extensions.IServicePrincipalCollectionRequestBuilder;
@@ -82,6 +84,7 @@
 import com.microsoft.graph.requests.extensions.IDeviceAppManagementRequestBuilder;
 import com.microsoft.graph.requests.extensions.IDeviceManagementRequestBuilder;
 import com.microsoft.graph.requests.extensions.IReportRootRequestBuilder;
+import com.microsoft.graph.requests.extensions.ISearchEntityRequestBuilder;
 import com.microsoft.graph.requests.extensions.IPlannerRequestBuilder;
 import com.microsoft.graph.requests.extensions.ISecurityRequestBuilder;
 import com.microsoft.graph.requests.extensions.IAppCatalogsRequestBuilder;
@@ -368,6 +371,21 @@ public interface IBaseGraphServiceClient extends IBaseClient {
      */
     IOrganizationRequestBuilder organization(final String id);
 
+    /**
+     * Gets the collection of PermissionGrants objects
+     *
+     * @return the request builder for the collection of PermissionGrants objects
+     */
+    IResourceSpecificPermissionGrantCollectionRequestBuilder permissionGrants();
+
+    /**
+     * Gets a single PermissionGrants
+     *
+     * @param id the id of the PermissionGrants to retrieve
+     * @return the request builder for the PermissionGrants object
+     */
+    IResourceSpecificPermissionGrantRequestBuilder permissionGrants(final String id);
+
     /**
      * Gets the collection of ScopedRoleMemberships objects
      *
@@ -670,6 +688,13 @@ public interface IBaseGraphServiceClient extends IBaseClient {
      */
     IReportRootRequestBuilder reports();
 
+    /**
+     * Gets the GraphServiceRequestBuilder
+     *
+     * @return the SearchEntity
+     */
+    ISearchEntityRequestBuilder search();
+
     /**
      * Gets the GraphServiceRequestBuilder
      *

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.IResourceSpecificPermissionGrantCollectionRequestBuilder;
+import com.microsoft.graph.requests.extensions.IResourceSpecificPermissionGrantRequestBuilder;
 import com.microsoft.graph.requests.extensions.IScopedRoleMembershipCollectionRequestBuilder;
 import com.microsoft.graph.requests.extensions.IScopedRoleMembershipRequestBuilder;
 import com.microsoft.graph.requests.extensions.IServicePrincipalCollectionRequestBuilder;
@@ -82,6 +84,7 @@
 import com.microsoft.graph.requests.extensions.IDeviceAppManagementRequestBuilder;
 import com.microsoft.graph.requests.extensions.IDeviceManagementRequestBuilder;
 import com.microsoft.graph.requests.extensions.IReportRootRequestBuilder;
+import com.microsoft.graph.requests.extensions.ISearchEntityRequestBuilder;
 import com.microsoft.graph.requests.extensions.IPlannerRequestBuilder;
 import com.microsoft.graph.requests.extensions.ISecurityRequestBuilder;
 import com.microsoft.graph.requests.extensions.IAppCatalogsRequestBuilder;

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

@@ -0,0 +1,91 @@
+// ------------------------------------------------------------------------------
+// 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.EnumSet;
+import com.microsoft.graph.models.extensions.ResourcePermission;
+
+
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
+
+// **NOTE** This file was generated by a tool and any changes will be overwritten.
+
+/**
+ * The class for the Instance Resource Access.
+ */
+public class InstanceResourceAccess implements IJsonBackedObject {
+
+    @SerializedName("@odata.type")
+    @Expose
+    public String oDataType;
+
+    private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
+
+    @Override
+    public final AdditionalDataManager additionalDataManager() {
+        return additionalDataManager;
+    }
+
+    /**
+     * The Permissions.
+     * 
+     */
+    @SerializedName(value = "permissions", alternate = {"Permissions"})
+    @Expose
+    public java.util.List<ResourcePermission> permissions;
+
+    /**
+     * The Resource App Id.
+     * 
+     */
+    @SerializedName(value = "resourceAppId", alternate = {"ResourceAppId"})
+    @Expose
+    public String resourceAppId;
+
+
+    /**
+     * 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;
+
+    }
+}