Merge pull request #70 from microsoftgraph/beta/pipelinebuild/40752

Generated beta 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-beta:0.4.0-SNAPSHOT'
+    implementation 'com.microsoft.graph:microsoft-graph-beta:0.5.0-SNAPSHOT'
 }
 ```
 
@@ -31,7 +31,7 @@ Add the dependency in `dependencies` in pom.xml
 <dependency>
   <groupId>com.microsoft.graph</groupId>
   <artifactId>microsoft-graph-beta</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.5.0-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -131,3 +131,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
 [Third-party notices](THIRD%20PARTY%20NOTICES)
 
 
+

gradle.properties

@@ -26,7 +26,7 @@ org.gradle.caching=true
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-beta
 mavenMajorVersion = 0
-mavenMinorVersion = 4
+mavenMinorVersion = 5
 mavenPatchVersion = 0
 mavenArtifactSuffix = 
 
@@ -44,3 +44,4 @@ mavenCentralPublishingEnabled=false
 
 
 
+

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

@@ -30,8 +30,9 @@ 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 = "0.4.0";
+	public static final String VERSION_NAME = "0.5.0";
 }
 
 
 
+

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

@@ -27,71 +27,71 @@ public class ActivityHistoryItem extends Entity implements IJsonBackedObject {
 
     /**
      * The Active Duration Seconds.
-     * 
+     * Optional. The duration of active user engagement. if not supplied, this is calculated from the startedDateTime and lastActiveDateTime.
      */
     @SerializedName(value = "activeDurationSeconds", alternate = {"ActiveDurationSeconds"})
     @Expose
     public Integer activeDurationSeconds;
 
     /**
      * The Created Date Time.
-     * 
+     * Set by the server. DateTime in UTC when the object was created on the server.
      */
     @SerializedName(value = "createdDateTime", alternate = {"CreatedDateTime"})
     @Expose
     public java.util.Calendar createdDateTime;
 
     /**
      * The Expiration Date Time.
-     * 
+     * Optional. UTC DateTime when the historyItem will undergo hard-delete. Can be set by the client.
      */
     @SerializedName(value = "expirationDateTime", alternate = {"ExpirationDateTime"})
     @Expose
     public java.util.Calendar expirationDateTime;
 
     /**
      * The Last Active Date Time.
-     * 
+     * Optional. UTC DateTime when the historyItem (activity session) was last understood as active or finished - if null, historyItem status should be Ongoing.
      */
     @SerializedName(value = "lastActiveDateTime", alternate = {"LastActiveDateTime"})
     @Expose
     public java.util.Calendar lastActiveDateTime;
 
     /**
      * The Last Modified Date Time.
-     * 
+     * Set by the server. DateTime in UTC when the object was modified on the server.
      */
     @SerializedName(value = "lastModifiedDateTime", alternate = {"LastModifiedDateTime"})
     @Expose
     public java.util.Calendar lastModifiedDateTime;
 
     /**
      * The Started Date Time.
-     * 
+     * Required. UTC DateTime when the historyItem (activity session) was started. Required for timeline history.
      */
     @SerializedName(value = "startedDateTime", alternate = {"StartedDateTime"})
     @Expose
     public java.util.Calendar startedDateTime;
 
     /**
      * The Status.
-     * 
+     * Set by the server. A status code used to identify valid objects. Values: active, updated, deleted, ignored.
      */
     @SerializedName(value = "status", alternate = {"Status"})
     @Expose
     public Status status;
 
     /**
      * The User Timezone.
-     * 
+     * Optional. The timezone in which the user's device used to generate the activity was located at activity creation time. Values supplied as Olson IDs in order to support cross-platform representation.
      */
     @SerializedName(value = "userTimezone", alternate = {"UserTimezone"})
     @Expose
     public String userTimezone;
 
     /**
      * The Activity.
-     * 
+     * Optional. NavigationProperty/Containment; navigation property to the associated activity.
      */
     @SerializedName(value = "activity", alternate = {"Activity"})
     @Expose

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

@@ -52,39 +52,39 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The Display Name.
-     * 
+     * Refers to the Name of the conditional access policy (example: 'Require MFA for Salesforce').
      */
     @SerializedName(value = "displayName", alternate = {"DisplayName"})
     @Expose
     public String displayName;
 
     /**
      * The Enforced Grant Controls.
-     * 
+     * Refers to the grant controls enforced by the conditional access policy (example: 'Require multi-factor authentication').
      */
     @SerializedName(value = "enforcedGrantControls", alternate = {"EnforcedGrantControls"})
     @Expose
     public java.util.List<String> enforcedGrantControls;
 
     /**
      * The Enforced Session Controls.
-     * 
+     * Refers to the session controls enforced by the conditional access policy (example: 'Require app enforced controls').
      */
     @SerializedName(value = "enforcedSessionControls", alternate = {"EnforcedSessionControls"})
     @Expose
     public java.util.List<String> enforcedSessionControls;
 
     /**
      * The Id.
-     * 
+     * Unique GUID of the conditional access policy.
      */
     @SerializedName(value = "id", alternate = {"Id"})
     @Expose
     public String id;
 
     /**
      * The Result.
-     * 
+     * Indicates the result of the CA policy that was triggered. Possible values are:successfailurenotApplied - Policy isn't applied because policy conditions were not met.notEnabled - This is due to the policy in disabled state.
      */
     @SerializedName(value = "result", alternate = {"Result"})
     @Expose

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

@@ -12,6 +12,7 @@
 import com.microsoft.graph.models.extensions.ProvisioningObjectSummary;
 import com.microsoft.graph.models.extensions.RestrictedSignIn;
 import com.microsoft.graph.models.extensions.SignIn;
+import com.microsoft.graph.models.extensions.Entity;
 import com.microsoft.graph.requests.extensions.DirectoryAuditCollectionPage;
 import com.microsoft.graph.requests.extensions.ProvisioningObjectSummaryCollectionPage;
 import com.microsoft.graph.requests.extensions.RestrictedSignInCollectionPage;
@@ -27,22 +28,12 @@
 /**
  * The class for the Audit Log Root.
  */
-public class AuditLogRoot implements IJsonBackedObject {
+public class AuditLogRoot extends Entity implements IJsonBackedObject {
 
-    @SerializedName("@odata.type")
-    @Expose
-    public String oDataType;
-
-    private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
-
-    @Override
-    public final AdditionalDataManager additionalDataManager() {
-        return additionalDataManager;
-    }
 
     /**
      * The Directory Audits.
-     * 
+     * Read-only. Nullable.
      */
     @SerializedName(value = "directoryAudits", alternate = {"DirectoryAudits"})
     @Expose
@@ -74,7 +65,7 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The Sign Ins.
-     * 
+     * Read-only. Nullable.
      */
     @SerializedName(value = "signIns", alternate = {"SignIns"})
     @Expose

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

@@ -11,18 +11,22 @@
 import com.microsoft.graph.models.extensions.EmailAuthenticationMethod;
 import com.microsoft.graph.models.extensions.Fido2AuthenticationMethod;
 import com.microsoft.graph.models.extensions.AuthenticationMethod;
+import com.microsoft.graph.models.extensions.MicrosoftAuthenticatorAuthenticationMethod;
 import com.microsoft.graph.models.extensions.LongRunningOperation;
 import com.microsoft.graph.models.extensions.PasswordlessMicrosoftAuthenticatorAuthenticationMethod;
 import com.microsoft.graph.models.extensions.PasswordAuthenticationMethod;
 import com.microsoft.graph.models.extensions.PhoneAuthenticationMethod;
+import com.microsoft.graph.models.extensions.WindowsHelloForBusinessAuthenticationMethod;
 import com.microsoft.graph.models.extensions.Entity;
 import com.microsoft.graph.requests.extensions.EmailAuthenticationMethodCollectionPage;
 import com.microsoft.graph.requests.extensions.Fido2AuthenticationMethodCollectionPage;
 import com.microsoft.graph.requests.extensions.AuthenticationMethodCollectionPage;
+import com.microsoft.graph.requests.extensions.MicrosoftAuthenticatorAuthenticationMethodCollectionPage;
 import com.microsoft.graph.requests.extensions.LongRunningOperationCollectionPage;
 import com.microsoft.graph.requests.extensions.PasswordlessMicrosoftAuthenticatorAuthenticationMethodCollectionPage;
 import com.microsoft.graph.requests.extensions.PasswordAuthenticationMethodCollectionPage;
 import com.microsoft.graph.requests.extensions.PhoneAuthenticationMethodCollectionPage;
+import com.microsoft.graph.requests.extensions.WindowsHelloForBusinessAuthenticationMethodCollectionPage;
 
 
 import com.google.gson.JsonObject;
@@ -61,6 +65,14 @@ public class Authentication extends Entity implements IJsonBackedObject {
     @Expose
     public AuthenticationMethodCollectionPage methods;
 
+    /**
+     * The Microsoft Authenticator Methods.
+     * 
+     */
+    @SerializedName(value = "microsoftAuthenticatorMethods", alternate = {"MicrosoftAuthenticatorMethods"})
+    @Expose
+    public MicrosoftAuthenticatorAuthenticationMethodCollectionPage microsoftAuthenticatorMethods;
+
     /**
      * The Operations.
      * 
@@ -93,6 +105,14 @@ public class Authentication extends Entity implements IJsonBackedObject {
     @Expose
     public PhoneAuthenticationMethodCollectionPage phoneMethods;
 
+    /**
+     * The Windows Hello For Business Methods.
+     * 
+     */
+    @SerializedName(value = "windowsHelloForBusinessMethods", alternate = {"WindowsHelloForBusinessMethods"})
+    @Expose
+    public WindowsHelloForBusinessAuthenticationMethodCollectionPage windowsHelloForBusinessMethods;
+
 
     /**
      * The raw representation of this class
@@ -145,6 +165,10 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
             methods = serializer.deserializeObject(json.get("methods").toString(), AuthenticationMethodCollectionPage.class);
         }
 
+        if (json.has("microsoftAuthenticatorMethods")) {
+            microsoftAuthenticatorMethods = serializer.deserializeObject(json.get("microsoftAuthenticatorMethods").toString(), MicrosoftAuthenticatorAuthenticationMethodCollectionPage.class);
+        }
+
         if (json.has("operations")) {
             operations = serializer.deserializeObject(json.get("operations").toString(), LongRunningOperationCollectionPage.class);
         }
@@ -160,5 +184,9 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
         if (json.has("phoneMethods")) {
             phoneMethods = serializer.deserializeObject(json.get("phoneMethods").toString(), PhoneAuthenticationMethodCollectionPage.class);
         }
+
+        if (json.has("windowsHelloForBusinessMethods")) {
+            windowsHelloForBusinessMethods = serializer.deserializeObject(json.get("windowsHelloForBusinessMethods").toString(), WindowsHelloForBusinessAuthenticationMethodCollectionPage.class);
+        }
     }
 }

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

@@ -34,15 +34,15 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The Average Score.
-     * 
+     * Average score within specified basis.
      */
     @SerializedName(value = "averageScore", alternate = {"AverageScore"})
     @Expose
     public Double averageScore;
 
     /**
      * The Basis.
-     * 
+     * Scope type. The possible values are: AllTenants, TotalSeats, IndustryTypes.
      */
     @SerializedName(value = "basis", alternate = {"Basis"})
     @Expose

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

@@ -44,7 +44,7 @@ public class BaseItem extends Entity implements IJsonBackedObject {
 
     /**
      * The Description.
-     * 
+     * Provides a user-visible description of the item. Optional.
      */
     @SerializedName(value = "description", alternate = {"Description"})
     @Expose
@@ -100,15 +100,15 @@ public class BaseItem extends Entity implements IJsonBackedObject {
 
     /**
      * The Created By User.
-     * 
+     * Identity of the user who created the item. Read-only.
      */
     @SerializedName(value = "createdByUser", alternate = {"CreatedByUser"})
     @Expose
     public User createdByUser;
 
     /**
      * The Last Modified By User.
-     * 
+     * Identity of the user who last modified the item. Read-only.
      */
     @SerializedName(value = "lastModifiedByUser", alternate = {"LastModifiedByUser"})
     @Expose

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

@@ -34,15 +34,15 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The Name.
-     * 
+     * Certification control name
      */
     @SerializedName(value = "name", alternate = {"Name"})
     @Expose
     public String name;
 
     /**
      * The Url.
-     * 
+     * URL for the Microsoft Service Trust Portal
      */
     @SerializedName(value = "url", alternate = {"Url"})
     @Expose