Merge branch 'dev' into feature/v3

Author: baywet

src/main/java/com/microsoft/graph/callrecords/models/CallRecord.java

@@ -105,7 +105,7 @@ public class CallRecord extends Entity implements IJsonBackedObject {
 
     /**
      * The Version.
-     * Monotonically increasing version of the call record. Higher version call records with the same id includes additional data compared to the lower version.
+     * Monotonically increasing version of the call record. Higher version call records with the same ID includes additional data compared to the lower version.
      */
     @SerializedName(value = "version", alternate = {"Version"})
     @Expose

src/main/java/com/microsoft/graph/models/AadUserConversationMember.java

@@ -37,7 +37,7 @@ public class AadUserConversationMember extends ConversationMember implements IJs
 
     /**
      * The User Id.
-     * The guid of the user.
+     * The GUID of the user.
      */
     @SerializedName(value = "userId", alternate = {"UserId"})
     @Expose

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

@@ -51,7 +51,7 @@ public class AdministrativeUnit extends DirectoryObject implements IJsonBackedOb
 
     /**
      * The Visibility.
-     * Controls whether the administrative unit and its members are hidden or public. Can be set to HiddenMembership or Public. If not set, default behavior is Public. When set to HiddenMembership, only members of the administrative unit can list other members of the adminstrative unit.
+     * Controls whether the adminstrative unit and its members are hidden or public. Can be set to HiddenMembership or Public. If not set, default behavior is Public. When set to HiddenMembership, only members of the administrative unit can list other members of the adminstrative unit.
      */
     @SerializedName(value = "visibility", alternate = {"Visibility"})
     @Expose
@@ -76,7 +76,7 @@ public class AdministrativeUnit extends DirectoryObject implements IJsonBackedOb
 
     /**
      * The Extensions.
-     * 
+     * The collection of open extensions defined for this Administrative Unit. Nullable.
      */
     @SerializedName(value = "extensions", alternate = {"Extensions"})
     @Expose

src/main/java/com/microsoft/graph/models/Alert.java

@@ -192,7 +192,7 @@ public class Alert extends Entity implements IJsonBackedObject {
 
     /**
      * The History States.
-     * 
+     * A collection of alertHistoryStates comprising an audit log of all updates made to an alert.
      */
     @SerializedName(value = "historyStates", alternate = {"HistoryStates"})
     @Expose

src/main/java/com/microsoft/graph/models/AlertHistoryState.java

@@ -42,7 +42,7 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The App Id.
-     * 
+     * The Application ID of the calling application that submitted an update (PATCH) to the alert. The appId should be extracted from the auth token and not entered manually by the calling application.
      */
     @SerializedName(value = "appId", alternate = {"AppId"})
     @Expose
@@ -51,7 +51,7 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The Assigned To.
-     * 
+     * UPN of user the alert was assigned to (note: alert.assignedTo only stores the last value/UPN).
      */
     @SerializedName(value = "assignedTo", alternate = {"AssignedTo"})
     @Expose
@@ -60,7 +60,7 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The Comments.
-     * 
+     * Comment entered by signed-in user.
      */
     @SerializedName(value = "comments", alternate = {"Comments"})
     @Expose
@@ -69,7 +69,7 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The Feedback.
-     * 
+     * Analyst feedback on the alert in this update. Possible values are: unknown, truePositive, falsePositive, benignPositive.
      */
     @SerializedName(value = "feedback", alternate = {"Feedback"})
     @Expose
@@ -78,7 +78,7 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The Status.
-     * 
+     * Alert status value (if updated). Possible values are: unknown, newAlert, inProgress, resolved, dismissed.
      */
     @SerializedName(value = "status", alternate = {"Status"})
     @Expose
@@ -87,7 +87,7 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The Updated Date Time.
-     * 
+     * Date and time of the alert update. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 would look like this: '2014-01-01T00:00:00Z'
      */
     @SerializedName(value = "updatedDateTime", alternate = {"UpdatedDateTime"})
     @Expose
@@ -96,7 +96,7 @@ public final AdditionalDataManager additionalDataManager() {
 
     /**
      * The User.
-     * 
+     * UPN of the signed-in user that updated the alert (taken from the bearer token - if in user/delegated auth mode).
      */
     @SerializedName(value = "user", alternate = {"User"})
     @Expose

src/main/java/com/microsoft/graph/models/AndroidManagedAppProtection.java

@@ -31,7 +31,7 @@ public class AndroidManagedAppProtection extends TargetedManagedAppProtection im
 
     /**
      * The Custom Browser Display Name.
-     * Friendly name of the preferred custom browser to open weblink on Android. When this property is configured, ManagedBrowserToOpenLinksRequired should be true.
+     * Friendly name of the preferred custom browser to open weblink on Android.
      */
     @SerializedName(value = "customBrowserDisplayName", alternate = {"CustomBrowserDisplayName"})
     @Expose
@@ -40,7 +40,7 @@ public class AndroidManagedAppProtection extends TargetedManagedAppProtection im
 
     /**
      * The Custom Browser Package Id.
-     * Unique identifier of the preferred custom browser to open weblink on Android. When this property is configured, ManagedBrowserToOpenLinksRequired should be true.
+     * Unique identifier of a custom browser to open weblink on Android.
      */
     @SerializedName(value = "customBrowserPackageId", alternate = {"CustomBrowserPackageId"})
     @Expose

src/main/java/com/microsoft/graph/models/Application.java

@@ -67,7 +67,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
 
     /**
      * The App Id.
-     * The unique identifier for the application that is assigned to an application by Azure AD. Not nullable. Read-only.
+     * The unique identifier for the application that is assigned by Azure AD. Not nullable. Read-only.
      */
     @SerializedName(value = "appId", alternate = {"AppId"})
     @Expose
@@ -121,7 +121,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
 
     /**
      * The Group Membership Claims.
-     * Configures the groups claim issued in a user or OAuth 2.0 access token that the application expects. To set this attribute, use one of the following valid string values:NoneSecurityGroup: For security groups and Azure AD rolesAll: This gets all of the security groups, distribution groups, and Azure AD directory roles that the signed-in user is a member of.
+     * Configures the groups claim issued in a user or OAuth 2.0 access token that the application expects. To set this attribute, use one of the following string values:NoneSecurityGroup: For security groups and Azure AD rolesAll: This gets all of the security groups, distribution groups, and Azure AD directory roles that the signed-in user is a member of.
      */
     @SerializedName(value = "groupMembershipClaims", alternate = {"GroupMembershipClaims"})
     @Expose
@@ -130,7 +130,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
 
     /**
      * The Identifier Uris.
-     * The URIs that identify the application within its Azure AD tenant, or within a verified custom domain if the application is multi-tenant. For more information see Application Objects and Service Principal Objects. The any operator is required for filter expressions on multi-valued properties. Not nullable.
+     * The URIs that identify the application within its Azure AD tenant, or within a verified custom domain if the application is multi-tenant. For more information, see Application Objects and Service Principal Objects. The any operator is required for filter expressions on multi-valued properties. Not nullable.
      */
     @SerializedName(value = "identifierUris", alternate = {"IdentifierUris"})
     @Expose
@@ -139,7 +139,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
 
     /**
      * The Info.
-     * Basic profile information of the application such as  app's marketing, support, terms of service and privacy statement URLs. The terms of service and privacy statement are surfaced to users through the user consent experience. For more info, see How to: Add Terms of service and privacy statement for registered Azure AD apps.
+     * Basic profile information of the application, such as it's marketing, support, terms of service, and privacy statement URLs. The terms of service and privacy statement are surfaced to users through the user consent experience. For more information, see How to: Add Terms of service and privacy statement for registered Azure AD apps.
      */
     @SerializedName(value = "info", alternate = {"Info"})
     @Expose
@@ -157,7 +157,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
 
     /**
      * The Is Fallback Public Client.
-     * Specifies the fallback application type as public client, such as an installed application running on a mobile device. The default value is false which means the fallback application type is confidential client such as a web app. There are certain scenarios where Azure AD cannot determine the client application type. For example, the ROPC flow where it is configured without specifying a redirect URI. In those cases Azure AD interprets the application type based on the value of this property.
+     * Specifies the fallback application type as public client, such as an installed application running on a mobile device. The default value is false which means the fallback application type is confidential client such as a web app. There are certain scenarios where Azure AD cannot determine the client application type. For example, the ROPC flow where the application is configured without specifying a redirect URI. In those cases Azure AD interprets the application type based on the value of this property.
      */
     @SerializedName(value = "isFallbackPublicClient", alternate = {"IsFallbackPublicClient"})
     @Expose
@@ -229,7 +229,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
 
     /**
      * The Publisher Domain.
-     * The verified publisher domain for the application. Read-only. For more information, see How to: Configure an application's publisher domain.
+     * The verified publisher domain for the application. Read-only.
      */
     @SerializedName(value = "publisherDomain", alternate = {"PublisherDomain"})
     @Expose
@@ -247,7 +247,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
 
     /**
      * The Sign In Audience.
-     * Specifies the Microsoft accounts that are supported for the current application. Supported values are:AzureADMyOrg: Users with a Microsoft work or school account in my organization’s Azure AD tenant (single tenant)AzureADMultipleOrgs: Users with a Microsoft work or school account in any organization’s Azure AD tenant (multi-tenant).AzureADandPersonalMicrosoftAccount: Users with a personal Microsoft account, or a work or school account in any organization’s Azure AD tenant.PersonalMicrosoftAccount: Users with a personal Microsoft account only.For authenticating users with Azure AD B2C user flows, use AzureADandPersonalMicrosoftAccount. This value allows for the widest set of user identities including local accounts and user identities from Microsoft, Facebook, Google, Twitter, or any OpenID Connect provider.
+     * Specifies the Microsoft accounts that are supported for the current application. Supported values are:AzureADMyOrg: Users with a Microsoft work or school account in my organization’s Azure AD tenant (single-tenant).AzureADMultipleOrgs: Users with a Microsoft work or school account in any organization’s Azure AD tenant (multi-tenant).AzureADandPersonalMicrosoftAccount: Users with a personal Microsoft account, or a work or school account in any organization’s Azure AD tenant.PersonalMicrosoftAccount: Users with a personal Microsoft account only.
      */
     @SerializedName(value = "signInAudience", alternate = {"SignInAudience"})
     @Expose
@@ -256,7 +256,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
 
     /**
      * The Spa.
-     * 
+     * Specifies settings for a single-page application, including sign out URLs and redirect URIs for authorization codes and access tokens.
      */
     @SerializedName(value = "spa", alternate = {"Spa"})
     @Expose
@@ -331,7 +331,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
 
     /**
      * The Token Lifetime Policies.
-     * 
+     * The tokenLifetimePolicies assigned to this application.
      */
 	@Nullable
     public TokenLifetimePolicyCollectionPage tokenLifetimePolicies;

src/main/java/com/microsoft/graph/models/ApplicationServicePrincipal.java

@@ -0,0 +1,70 @@
+// Template Source: BaseEntity.java.tt
+// ------------------------------------------------------------------------------
+// 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;
+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.Application;
+import com.microsoft.graph.models.ServicePrincipal;
+
+
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+// **NOTE** This file was generated by a tool and any changes will be overwritten.
+
+/**
+ * The class for the Application Service Principal.
+ */
+public class ApplicationServicePrincipal implements IJsonBackedObject {
+
+    /** the OData type of the object as returned by the service */
+    @SerializedName("@odata.type")
+    @Expose
+    @Nullable
+    public String oDataType;
+
+    private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
+
+    @Override
+    @Nonnull
+    public final AdditionalDataManager additionalDataManager() {
+        return additionalDataManager;
+    }
+
+    /**
+     * The Application.
+     * 
+     */
+    @SerializedName(value = "application", alternate = {"Application"})
+    @Expose
+	@Nullable
+    public Application application;
+
+    /**
+     * The Service Principal.
+     * 
+     */
+    @SerializedName(value = "servicePrincipal", alternate = {"ServicePrincipal"})
+    @Expose
+	@Nullable
+    public ServicePrincipal servicePrincipal;
+
+
+    /**
+     * Sets the raw JSON object
+     *
+     * @param serializer the serializer
+     * @param json the JSON object to set this object to
+     */
+    public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
+
+    }
+}

src/main/java/com/microsoft/graph/models/ApplicationTemplate.java

@@ -0,0 +1,111 @@
+// Template Source: BaseEntity.java.tt
+// ------------------------------------------------------------------------------
+// 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;
+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.http.BaseCollectionPage;
+import com.microsoft.graph.models.Entity;
+
+
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+// **NOTE** This file was generated by a tool and any changes will be overwritten.
+
+/**
+ * The class for the Application Template.
+ */
+public class ApplicationTemplate extends Entity implements IJsonBackedObject {
+
+
+    /**
+     * The Categories.
+     * The list of categories for the application. Supported values can be: Collaboration, Business Management, Consumer,Content management, CRM, Data services, Developer services, E-commerce, Education, ERP, Finance, Health, Human resources, IT infrastructure, Mail, Management, Marketing, Media, Productivity, Project management, Telecommunications, Tools, Travel, and Web design & hosting.
+     */
+    @SerializedName(value = "categories", alternate = {"Categories"})
+    @Expose
+	@Nullable
+    public java.util.List<String> categories;
+
+    /**
+     * The Description.
+     * A description of the application.
+     */
+    @SerializedName(value = "description", alternate = {"Description"})
+    @Expose
+	@Nullable
+    public String description;
+
+    /**
+     * The Display Name.
+     * The name of the application.
+     */
+    @SerializedName(value = "displayName", alternate = {"DisplayName"})
+    @Expose
+	@Nullable
+    public String displayName;
+
+    /**
+     * The Home Page Url.
+     * The home page URL of the application.
+     */
+    @SerializedName(value = "homePageUrl", alternate = {"HomePageUrl"})
+    @Expose
+	@Nullable
+    public String homePageUrl;
+
+    /**
+     * The Logo Url.
+     * The URL to get the logo for this application.
+     */
+    @SerializedName(value = "logoUrl", alternate = {"LogoUrl"})
+    @Expose
+	@Nullable
+    public String logoUrl;
+
+    /**
+     * The Publisher.
+     * The name of the publisher for this application.
+     */
+    @SerializedName(value = "publisher", alternate = {"Publisher"})
+    @Expose
+	@Nullable
+    public String publisher;
+
+    /**
+     * The Supported Provisioning Types.
+     * The list of provisioning modes supported by this application. The only valid value is sync.
+     */
+    @SerializedName(value = "supportedProvisioningTypes", alternate = {"SupportedProvisioningTypes"})
+    @Expose
+	@Nullable
+    public java.util.List<String> supportedProvisioningTypes;
+
+    /**
+     * The Supported Single Sign On Modes.
+     * The list of single sign-on modes supported by this application. The supported values are password, saml, external, and oidc.
+     */
+    @SerializedName(value = "supportedSingleSignOnModes", alternate = {"SupportedSingleSignOnModes"})
+    @Expose
+	@Nullable
+    public java.util.List<String> supportedSingleSignOnModes;
+
+
+    /**
+     * Sets the raw JSON object
+     *
+     * @param serializer the serializer
+     * @param json the JSON object to set this object to
+     */
+    public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
+
+    }
+}