From 749758580d3e43cff91bc2e105a88f4e03e9d7ae Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Fri, 10 Sep 2021 12:20:50 +0800 Subject: [PATCH] mgmt, specs changed (#24025) --- .../models/AllowedPrincipalsProperties.java | 77 ------ .../models/AppRegistrationProperties.java | 76 ------ .../fluent/models/AppleProperties.java | 113 --------- .../AzureActiveDirectoryLoginProperties.java | 84 ------- ...ActiveDirectoryRegistrationProperties.java | 230 ------------------ ...reActiveDirectoryValidationProperties.java | 118 --------- .../models/AzureStaticWebAppsProperties.java | 83 ------- .../BlobStorageTokenStoreProperties.java | 53 ---- ...CustomOpenIdConnectProviderProperties.java | 117 --------- .../fluent/models/GitHubProperties.java | 114 --------- .../fluent/models/GoogleProperties.java | 145 ----------- .../LegacyMicrosoftAccountProperties.java | 149 ------------ .../fluent/models/TwitterProperties.java | 84 ------- .../appservice/models/AllowedPrincipals.java | 46 +--- .../appservice/models/AppRegistration.java | 46 +--- .../appservice/models/Apple.java | 62 ++--- .../models/AzureActiveDirectoryLogin.java | 49 ++-- .../AzureActiveDirectoryRegistration.java | 122 +++++----- .../AzureActiveDirectoryValidation.java | 63 ++--- .../appservice/models/AzureStaticWebApps.java | 48 ++-- .../models/BlobStorageTokenStore.java | 38 +-- .../models/CustomOpenIdConnectProvider.java | 64 ++--- .../appservice/models/GitHub.java | 63 ++--- .../appservice/models/Google.java | 80 +++--- .../appservice/models/IdentityProviders.java | 126 +++++----- .../models/LegacyMicrosoftAccount.java | 80 +++--- .../appservice/models/Twitter.java | 49 ++-- 27 files changed, 385 insertions(+), 1994 deletions(-) delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AllowedPrincipalsProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AppRegistrationProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AppleProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryLoginProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryRegistrationProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryValidationProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureStaticWebAppsProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/BlobStorageTokenStoreProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/CustomOpenIdConnectProviderProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/GitHubProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/GoogleProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/LegacyMicrosoftAccountProperties.java delete mode 100644 sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/TwitterProperties.java diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AllowedPrincipalsProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AllowedPrincipalsProperties.java deleted file mode 100644 index 79f48798686e0..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AllowedPrincipalsProperties.java +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** AllowedPrincipals resource specific properties. */ -@Fluent -public final class AllowedPrincipalsProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AllowedPrincipalsProperties.class); - - /* - * The list of the allowed groups. - */ - @JsonProperty(value = "groups") - private List groups; - - /* - * The list of the allowed identities. - */ - @JsonProperty(value = "identities") - private List identities; - - /** - * Get the groups property: The list of the allowed groups. - * - * @return the groups value. - */ - public List groups() { - return this.groups; - } - - /** - * Set the groups property: The list of the allowed groups. - * - * @param groups the groups value to set. - * @return the AllowedPrincipalsProperties object itself. - */ - public AllowedPrincipalsProperties withGroups(List groups) { - this.groups = groups; - return this; - } - - /** - * Get the identities property: The list of the allowed identities. - * - * @return the identities value. - */ - public List identities() { - return this.identities; - } - - /** - * Set the identities property: The list of the allowed identities. - * - * @param identities the identities value to set. - * @return the AllowedPrincipalsProperties object itself. - */ - public AllowedPrincipalsProperties withIdentities(List identities) { - this.identities = identities; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AppRegistrationProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AppRegistrationProperties.java deleted file mode 100644 index e1981ee48faf0..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AppRegistrationProperties.java +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** AppRegistration resource specific properties. */ -@Fluent -public final class AppRegistrationProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AppRegistrationProperties.class); - - /* - * The App ID of the app used for login. - */ - @JsonProperty(value = "appId") - private String appId; - - /* - * The app setting name that contains the app secret. - */ - @JsonProperty(value = "appSecretSettingName") - private String appSecretSettingName; - - /** - * Get the appId property: The App ID of the app used for login. - * - * @return the appId value. - */ - public String appId() { - return this.appId; - } - - /** - * Set the appId property: The App ID of the app used for login. - * - * @param appId the appId value to set. - * @return the AppRegistrationProperties object itself. - */ - public AppRegistrationProperties withAppId(String appId) { - this.appId = appId; - return this; - } - - /** - * Get the appSecretSettingName property: The app setting name that contains the app secret. - * - * @return the appSecretSettingName value. - */ - public String appSecretSettingName() { - return this.appSecretSettingName; - } - - /** - * Set the appSecretSettingName property: The app setting name that contains the app secret. - * - * @param appSecretSettingName the appSecretSettingName value to set. - * @return the AppRegistrationProperties object itself. - */ - public AppRegistrationProperties withAppSecretSettingName(String appSecretSettingName) { - this.appSecretSettingName = appSecretSettingName; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AppleProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AppleProperties.java deleted file mode 100644 index b6d89e8b212a1..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AppleProperties.java +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.models.AppleRegistration; -import com.azure.resourcemanager.appservice.models.LoginScopes; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Apple resource specific properties. */ -@Fluent -public final class AppleProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AppleProperties.class); - - /* - * false if the Apple provider should not be enabled despite - * the set registration; otherwise, true. - */ - @JsonProperty(value = "enabled") - private Boolean enabled; - - /* - * The configuration settings of the Apple registration. - */ - @JsonProperty(value = "registration") - private AppleRegistration registration; - - /* - * The configuration settings of the login flow. - */ - @JsonProperty(value = "login") - private LoginScopes login; - - /** - * Get the enabled property: <code>false</code> if the Apple provider should not be enabled despite the - * set registration; otherwise, <code>true</code>. - * - * @return the enabled value. - */ - public Boolean enabled() { - return this.enabled; - } - - /** - * Set the enabled property: <code>false</code> if the Apple provider should not be enabled despite the - * set registration; otherwise, <code>true</code>. - * - * @param enabled the enabled value to set. - * @return the AppleProperties object itself. - */ - public AppleProperties withEnabled(Boolean enabled) { - this.enabled = enabled; - return this; - } - - /** - * Get the registration property: The configuration settings of the Apple registration. - * - * @return the registration value. - */ - public AppleRegistration registration() { - return this.registration; - } - - /** - * Set the registration property: The configuration settings of the Apple registration. - * - * @param registration the registration value to set. - * @return the AppleProperties object itself. - */ - public AppleProperties withRegistration(AppleRegistration registration) { - this.registration = registration; - return this; - } - - /** - * Get the login property: The configuration settings of the login flow. - * - * @return the login value. - */ - public LoginScopes login() { - return this.login; - } - - /** - * Set the login property: The configuration settings of the login flow. - * - * @param login the login value to set. - * @return the AppleProperties object itself. - */ - public AppleProperties withLogin(LoginScopes login) { - this.login = login; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (registration() != null) { - registration().validate(); - } - if (login() != null) { - login().validate(); - } - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryLoginProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryLoginProperties.java deleted file mode 100644 index bf237c932378b..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryLoginProperties.java +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** AzureActiveDirectoryLogin resource specific properties. */ -@Fluent -public final class AzureActiveDirectoryLoginProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AzureActiveDirectoryLoginProperties.class); - - /* - * Login parameters to send to the OpenID Connect authorization endpoint - * when - * a user logs in. Each parameter must be in the form "key=value". - */ - @JsonProperty(value = "loginParameters") - private List loginParameters; - - /* - * true if the www-authenticate provider should be omitted - * from the request; otherwise, false. - */ - @JsonProperty(value = "disableWWWAuthenticate") - private Boolean disableWwwAuthenticate; - - /** - * Get the loginParameters property: Login parameters to send to the OpenID Connect authorization endpoint when a - * user logs in. Each parameter must be in the form "key=value". - * - * @return the loginParameters value. - */ - public List loginParameters() { - return this.loginParameters; - } - - /** - * Set the loginParameters property: Login parameters to send to the OpenID Connect authorization endpoint when a - * user logs in. Each parameter must be in the form "key=value". - * - * @param loginParameters the loginParameters value to set. - * @return the AzureActiveDirectoryLoginProperties object itself. - */ - public AzureActiveDirectoryLoginProperties withLoginParameters(List loginParameters) { - this.loginParameters = loginParameters; - return this; - } - - /** - * Get the disableWwwAuthenticate property: <code>true</code> if the www-authenticate provider should be - * omitted from the request; otherwise, <code>false</code>. - * - * @return the disableWwwAuthenticate value. - */ - public Boolean disableWwwAuthenticate() { - return this.disableWwwAuthenticate; - } - - /** - * Set the disableWwwAuthenticate property: <code>true</code> if the www-authenticate provider should be - * omitted from the request; otherwise, <code>false</code>. - * - * @param disableWwwAuthenticate the disableWwwAuthenticate value to set. - * @return the AzureActiveDirectoryLoginProperties object itself. - */ - public AzureActiveDirectoryLoginProperties withDisableWwwAuthenticate(Boolean disableWwwAuthenticate) { - this.disableWwwAuthenticate = disableWwwAuthenticate; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryRegistrationProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryRegistrationProperties.java deleted file mode 100644 index 5d8979f2571b8..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryRegistrationProperties.java +++ /dev/null @@ -1,230 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** AzureActiveDirectoryRegistration resource specific properties. */ -@Fluent -public final class AzureActiveDirectoryRegistrationProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AzureActiveDirectoryRegistrationProperties.class); - - /* - * The OpenID Connect Issuer URI that represents the entity which issues - * access tokens for this application. - * When using Azure Active Directory, this value is the URI of the - * directory tenant, e.g. - * https://login.microsoftonline.com/v2.0/{tenant-guid}/. - * This URI is a case-sensitive identifier for the token issuer. - * More information on OpenID Connect Discovery: - * http://openid.net/specs/openid-connect-discovery-1_0.html - */ - @JsonProperty(value = "openIdIssuer") - private String openIdIssuer; - - /* - * The Client ID of this relying party application, known as the client_id. - * This setting is required for enabling OpenID Connection authentication - * with Azure Active Directory or - * other 3rd party OpenID Connect providers. - * More information on OpenID Connect: - * http://openid.net/specs/openid-connect-core-1_0.html - */ - @JsonProperty(value = "clientId") - private String clientId; - - /* - * The app setting name that contains the client secret of the relying - * party application. - */ - @JsonProperty(value = "clientSecretSettingName") - private String clientSecretSettingName; - - /* - * An alternative to the client secret, that is the thumbprint of a - * certificate used for signing purposes. This property acts as - * a replacement for the Client Secret. It is also optional. - */ - @JsonProperty(value = "clientSecretCertificateThumbprint") - private String clientSecretCertificateThumbprint; - - /* - * An alternative to the client secret thumbprint, that is the subject - * alternative name of a certificate used for signing purposes. This - * property acts as - * a replacement for the Client Secret Certificate Thumbprint. It is also - * optional. - */ - @JsonProperty(value = "clientSecretCertificateSubjectAlternativeName") - private String clientSecretCertificateSubjectAlternativeName; - - /* - * An alternative to the client secret thumbprint, that is the issuer of a - * certificate used for signing purposes. This property acts as - * a replacement for the Client Secret Certificate Thumbprint. It is also - * optional. - */ - @JsonProperty(value = "clientSecretCertificateIssuer") - private String clientSecretCertificateIssuer; - - /** - * Get the openIdIssuer property: The OpenID Connect Issuer URI that represents the entity which issues access - * tokens for this application. When using Azure Active Directory, this value is the URI of the directory tenant, - * e.g. https://login.microsoftonline.com/v2.0/{tenant-guid}/. This URI is a case-sensitive identifier for the token - * issuer. More information on OpenID Connect Discovery: http://openid.net/specs/openid-connect-discovery-1_0.html. - * - * @return the openIdIssuer value. - */ - public String openIdIssuer() { - return this.openIdIssuer; - } - - /** - * Set the openIdIssuer property: The OpenID Connect Issuer URI that represents the entity which issues access - * tokens for this application. When using Azure Active Directory, this value is the URI of the directory tenant, - * e.g. https://login.microsoftonline.com/v2.0/{tenant-guid}/. This URI is a case-sensitive identifier for the token - * issuer. More information on OpenID Connect Discovery: http://openid.net/specs/openid-connect-discovery-1_0.html. - * - * @param openIdIssuer the openIdIssuer value to set. - * @return the AzureActiveDirectoryRegistrationProperties object itself. - */ - public AzureActiveDirectoryRegistrationProperties withOpenIdIssuer(String openIdIssuer) { - this.openIdIssuer = openIdIssuer; - return this; - } - - /** - * Get the clientId property: The Client ID of this relying party application, known as the client_id. This setting - * is required for enabling OpenID Connection authentication with Azure Active Directory or other 3rd party OpenID - * Connect providers. More information on OpenID Connect: http://openid.net/specs/openid-connect-core-1_0.html. - * - * @return the clientId value. - */ - public String clientId() { - return this.clientId; - } - - /** - * Set the clientId property: The Client ID of this relying party application, known as the client_id. This setting - * is required for enabling OpenID Connection authentication with Azure Active Directory or other 3rd party OpenID - * Connect providers. More information on OpenID Connect: http://openid.net/specs/openid-connect-core-1_0.html. - * - * @param clientId the clientId value to set. - * @return the AzureActiveDirectoryRegistrationProperties object itself. - */ - public AzureActiveDirectoryRegistrationProperties withClientId(String clientId) { - this.clientId = clientId; - return this; - } - - /** - * Get the clientSecretSettingName property: The app setting name that contains the client secret of the relying - * party application. - * - * @return the clientSecretSettingName value. - */ - public String clientSecretSettingName() { - return this.clientSecretSettingName; - } - - /** - * Set the clientSecretSettingName property: The app setting name that contains the client secret of the relying - * party application. - * - * @param clientSecretSettingName the clientSecretSettingName value to set. - * @return the AzureActiveDirectoryRegistrationProperties object itself. - */ - public AzureActiveDirectoryRegistrationProperties withClientSecretSettingName(String clientSecretSettingName) { - this.clientSecretSettingName = clientSecretSettingName; - return this; - } - - /** - * Get the clientSecretCertificateThumbprint property: An alternative to the client secret, that is the thumbprint - * of a certificate used for signing purposes. This property acts as a replacement for the Client Secret. It is also - * optional. - * - * @return the clientSecretCertificateThumbprint value. - */ - public String clientSecretCertificateThumbprint() { - return this.clientSecretCertificateThumbprint; - } - - /** - * Set the clientSecretCertificateThumbprint property: An alternative to the client secret, that is the thumbprint - * of a certificate used for signing purposes. This property acts as a replacement for the Client Secret. It is also - * optional. - * - * @param clientSecretCertificateThumbprint the clientSecretCertificateThumbprint value to set. - * @return the AzureActiveDirectoryRegistrationProperties object itself. - */ - public AzureActiveDirectoryRegistrationProperties withClientSecretCertificateThumbprint( - String clientSecretCertificateThumbprint) { - this.clientSecretCertificateThumbprint = clientSecretCertificateThumbprint; - return this; - } - - /** - * Get the clientSecretCertificateSubjectAlternativeName property: An alternative to the client secret thumbprint, - * that is the subject alternative name of a certificate used for signing purposes. This property acts as a - * replacement for the Client Secret Certificate Thumbprint. It is also optional. - * - * @return the clientSecretCertificateSubjectAlternativeName value. - */ - public String clientSecretCertificateSubjectAlternativeName() { - return this.clientSecretCertificateSubjectAlternativeName; - } - - /** - * Set the clientSecretCertificateSubjectAlternativeName property: An alternative to the client secret thumbprint, - * that is the subject alternative name of a certificate used for signing purposes. This property acts as a - * replacement for the Client Secret Certificate Thumbprint. It is also optional. - * - * @param clientSecretCertificateSubjectAlternativeName the clientSecretCertificateSubjectAlternativeName value to - * set. - * @return the AzureActiveDirectoryRegistrationProperties object itself. - */ - public AzureActiveDirectoryRegistrationProperties withClientSecretCertificateSubjectAlternativeName( - String clientSecretCertificateSubjectAlternativeName) { - this.clientSecretCertificateSubjectAlternativeName = clientSecretCertificateSubjectAlternativeName; - return this; - } - - /** - * Get the clientSecretCertificateIssuer property: An alternative to the client secret thumbprint, that is the - * issuer of a certificate used for signing purposes. This property acts as a replacement for the Client Secret - * Certificate Thumbprint. It is also optional. - * - * @return the clientSecretCertificateIssuer value. - */ - public String clientSecretCertificateIssuer() { - return this.clientSecretCertificateIssuer; - } - - /** - * Set the clientSecretCertificateIssuer property: An alternative to the client secret thumbprint, that is the - * issuer of a certificate used for signing purposes. This property acts as a replacement for the Client Secret - * Certificate Thumbprint. It is also optional. - * - * @param clientSecretCertificateIssuer the clientSecretCertificateIssuer value to set. - * @return the AzureActiveDirectoryRegistrationProperties object itself. - */ - public AzureActiveDirectoryRegistrationProperties withClientSecretCertificateIssuer( - String clientSecretCertificateIssuer) { - this.clientSecretCertificateIssuer = clientSecretCertificateIssuer; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryValidationProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryValidationProperties.java deleted file mode 100644 index 07695b17629f6..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureActiveDirectoryValidationProperties.java +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.models.DefaultAuthorizationPolicy; -import com.azure.resourcemanager.appservice.models.JwtClaimChecks; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** AzureActiveDirectoryValidation resource specific properties. */ -@Fluent -public final class AzureActiveDirectoryValidationProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AzureActiveDirectoryValidationProperties.class); - - /* - * The configuration settings of the checks that should be made while - * validating the JWT Claims. - */ - @JsonProperty(value = "jwtClaimChecks") - private JwtClaimChecks jwtClaimChecks; - - /* - * The list of audiences that can make successful - * authentication/authorization requests. - */ - @JsonProperty(value = "allowedAudiences") - private List allowedAudiences; - - /* - * The configuration settings of the default authorization policy. - */ - @JsonProperty(value = "defaultAuthorizationPolicy") - private DefaultAuthorizationPolicy defaultAuthorizationPolicy; - - /** - * Get the jwtClaimChecks property: The configuration settings of the checks that should be made while validating - * the JWT Claims. - * - * @return the jwtClaimChecks value. - */ - public JwtClaimChecks jwtClaimChecks() { - return this.jwtClaimChecks; - } - - /** - * Set the jwtClaimChecks property: The configuration settings of the checks that should be made while validating - * the JWT Claims. - * - * @param jwtClaimChecks the jwtClaimChecks value to set. - * @return the AzureActiveDirectoryValidationProperties object itself. - */ - public AzureActiveDirectoryValidationProperties withJwtClaimChecks(JwtClaimChecks jwtClaimChecks) { - this.jwtClaimChecks = jwtClaimChecks; - return this; - } - - /** - * Get the allowedAudiences property: The list of audiences that can make successful authentication/authorization - * requests. - * - * @return the allowedAudiences value. - */ - public List allowedAudiences() { - return this.allowedAudiences; - } - - /** - * Set the allowedAudiences property: The list of audiences that can make successful authentication/authorization - * requests. - * - * @param allowedAudiences the allowedAudiences value to set. - * @return the AzureActiveDirectoryValidationProperties object itself. - */ - public AzureActiveDirectoryValidationProperties withAllowedAudiences(List allowedAudiences) { - this.allowedAudiences = allowedAudiences; - return this; - } - - /** - * Get the defaultAuthorizationPolicy property: The configuration settings of the default authorization policy. - * - * @return the defaultAuthorizationPolicy value. - */ - public DefaultAuthorizationPolicy defaultAuthorizationPolicy() { - return this.defaultAuthorizationPolicy; - } - - /** - * Set the defaultAuthorizationPolicy property: The configuration settings of the default authorization policy. - * - * @param defaultAuthorizationPolicy the defaultAuthorizationPolicy value to set. - * @return the AzureActiveDirectoryValidationProperties object itself. - */ - public AzureActiveDirectoryValidationProperties withDefaultAuthorizationPolicy( - DefaultAuthorizationPolicy defaultAuthorizationPolicy) { - this.defaultAuthorizationPolicy = defaultAuthorizationPolicy; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (jwtClaimChecks() != null) { - jwtClaimChecks().validate(); - } - if (defaultAuthorizationPolicy() != null) { - defaultAuthorizationPolicy().validate(); - } - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureStaticWebAppsProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureStaticWebAppsProperties.java deleted file mode 100644 index d7ed2d4249c42..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/AzureStaticWebAppsProperties.java +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.models.AzureStaticWebAppsRegistration; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** AzureStaticWebApps resource specific properties. */ -@Fluent -public final class AzureStaticWebAppsProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AzureStaticWebAppsProperties.class); - - /* - * false if the Azure Static Web Apps provider should not be - * enabled despite the set registration; otherwise, true. - */ - @JsonProperty(value = "enabled") - private Boolean enabled; - - /* - * The configuration settings of the Azure Static Web Apps registration. - */ - @JsonProperty(value = "registration") - private AzureStaticWebAppsRegistration registration; - - /** - * Get the enabled property: <code>false</code> if the Azure Static Web Apps provider should not be - * enabled despite the set registration; otherwise, <code>true</code>. - * - * @return the enabled value. - */ - public Boolean enabled() { - return this.enabled; - } - - /** - * Set the enabled property: <code>false</code> if the Azure Static Web Apps provider should not be - * enabled despite the set registration; otherwise, <code>true</code>. - * - * @param enabled the enabled value to set. - * @return the AzureStaticWebAppsProperties object itself. - */ - public AzureStaticWebAppsProperties withEnabled(Boolean enabled) { - this.enabled = enabled; - return this; - } - - /** - * Get the registration property: The configuration settings of the Azure Static Web Apps registration. - * - * @return the registration value. - */ - public AzureStaticWebAppsRegistration registration() { - return this.registration; - } - - /** - * Set the registration property: The configuration settings of the Azure Static Web Apps registration. - * - * @param registration the registration value to set. - * @return the AzureStaticWebAppsProperties object itself. - */ - public AzureStaticWebAppsProperties withRegistration(AzureStaticWebAppsRegistration registration) { - this.registration = registration; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (registration() != null) { - registration().validate(); - } - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/BlobStorageTokenStoreProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/BlobStorageTokenStoreProperties.java deleted file mode 100644 index 8ab29b1006031..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/BlobStorageTokenStoreProperties.java +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** BlobStorageTokenStore resource specific properties. */ -@Fluent -public final class BlobStorageTokenStoreProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(BlobStorageTokenStoreProperties.class); - - /* - * The name of the app setting containing the SAS URL of the blob storage - * containing the tokens. - */ - @JsonProperty(value = "sasUrlSettingName") - private String sasUrlSettingName; - - /** - * Get the sasUrlSettingName property: The name of the app setting containing the SAS URL of the blob storage - * containing the tokens. - * - * @return the sasUrlSettingName value. - */ - public String sasUrlSettingName() { - return this.sasUrlSettingName; - } - - /** - * Set the sasUrlSettingName property: The name of the app setting containing the SAS URL of the blob storage - * containing the tokens. - * - * @param sasUrlSettingName the sasUrlSettingName value to set. - * @return the BlobStorageTokenStoreProperties object itself. - */ - public BlobStorageTokenStoreProperties withSasUrlSettingName(String sasUrlSettingName) { - this.sasUrlSettingName = sasUrlSettingName; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/CustomOpenIdConnectProviderProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/CustomOpenIdConnectProviderProperties.java deleted file mode 100644 index e18610ae3c394..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/CustomOpenIdConnectProviderProperties.java +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.models.OpenIdConnectLogin; -import com.azure.resourcemanager.appservice.models.OpenIdConnectRegistration; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** CustomOpenIdConnectProvider resource specific properties. */ -@Fluent -public final class CustomOpenIdConnectProviderProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(CustomOpenIdConnectProviderProperties.class); - - /* - * false if the custom Open ID provider provider should not be - * enabled; otherwise, true. - */ - @JsonProperty(value = "enabled") - private Boolean enabled; - - /* - * The configuration settings of the app registration for the custom Open - * ID Connect provider. - */ - @JsonProperty(value = "registration") - private OpenIdConnectRegistration registration; - - /* - * The configuration settings of the login flow of the custom Open ID - * Connect provider. - */ - @JsonProperty(value = "login") - private OpenIdConnectLogin login; - - /** - * Get the enabled property: <code>false</code> if the custom Open ID provider provider should not be - * enabled; otherwise, <code>true</code>. - * - * @return the enabled value. - */ - public Boolean enabled() { - return this.enabled; - } - - /** - * Set the enabled property: <code>false</code> if the custom Open ID provider provider should not be - * enabled; otherwise, <code>true</code>. - * - * @param enabled the enabled value to set. - * @return the CustomOpenIdConnectProviderProperties object itself. - */ - public CustomOpenIdConnectProviderProperties withEnabled(Boolean enabled) { - this.enabled = enabled; - return this; - } - - /** - * Get the registration property: The configuration settings of the app registration for the custom Open ID Connect - * provider. - * - * @return the registration value. - */ - public OpenIdConnectRegistration registration() { - return this.registration; - } - - /** - * Set the registration property: The configuration settings of the app registration for the custom Open ID Connect - * provider. - * - * @param registration the registration value to set. - * @return the CustomOpenIdConnectProviderProperties object itself. - */ - public CustomOpenIdConnectProviderProperties withRegistration(OpenIdConnectRegistration registration) { - this.registration = registration; - return this; - } - - /** - * Get the login property: The configuration settings of the login flow of the custom Open ID Connect provider. - * - * @return the login value. - */ - public OpenIdConnectLogin login() { - return this.login; - } - - /** - * Set the login property: The configuration settings of the login flow of the custom Open ID Connect provider. - * - * @param login the login value to set. - * @return the CustomOpenIdConnectProviderProperties object itself. - */ - public CustomOpenIdConnectProviderProperties withLogin(OpenIdConnectLogin login) { - this.login = login; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (registration() != null) { - registration().validate(); - } - if (login() != null) { - login().validate(); - } - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/GitHubProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/GitHubProperties.java deleted file mode 100644 index 882f76ac60880..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/GitHubProperties.java +++ /dev/null @@ -1,114 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.models.ClientRegistration; -import com.azure.resourcemanager.appservice.models.LoginScopes; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** GitHub resource specific properties. */ -@Fluent -public final class GitHubProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(GitHubProperties.class); - - /* - * false if the GitHub provider should not be enabled despite - * the set registration; otherwise, true. - */ - @JsonProperty(value = "enabled") - private Boolean enabled; - - /* - * The configuration settings of the app registration for the GitHub - * provider. - */ - @JsonProperty(value = "registration") - private ClientRegistration registration; - - /* - * The configuration settings of the login flow. - */ - @JsonProperty(value = "login") - private LoginScopes login; - - /** - * Get the enabled property: <code>false</code> if the GitHub provider should not be enabled despite the - * set registration; otherwise, <code>true</code>. - * - * @return the enabled value. - */ - public Boolean enabled() { - return this.enabled; - } - - /** - * Set the enabled property: <code>false</code> if the GitHub provider should not be enabled despite the - * set registration; otherwise, <code>true</code>. - * - * @param enabled the enabled value to set. - * @return the GitHubProperties object itself. - */ - public GitHubProperties withEnabled(Boolean enabled) { - this.enabled = enabled; - return this; - } - - /** - * Get the registration property: The configuration settings of the app registration for the GitHub provider. - * - * @return the registration value. - */ - public ClientRegistration registration() { - return this.registration; - } - - /** - * Set the registration property: The configuration settings of the app registration for the GitHub provider. - * - * @param registration the registration value to set. - * @return the GitHubProperties object itself. - */ - public GitHubProperties withRegistration(ClientRegistration registration) { - this.registration = registration; - return this; - } - - /** - * Get the login property: The configuration settings of the login flow. - * - * @return the login value. - */ - public LoginScopes login() { - return this.login; - } - - /** - * Set the login property: The configuration settings of the login flow. - * - * @param login the login value to set. - * @return the GitHubProperties object itself. - */ - public GitHubProperties withLogin(LoginScopes login) { - this.login = login; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (registration() != null) { - registration().validate(); - } - if (login() != null) { - login().validate(); - } - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/GoogleProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/GoogleProperties.java deleted file mode 100644 index 6fcfa7f34f19d..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/GoogleProperties.java +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.models.AllowedAudiencesValidation; -import com.azure.resourcemanager.appservice.models.ClientRegistration; -import com.azure.resourcemanager.appservice.models.LoginScopes; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Google resource specific properties. */ -@Fluent -public final class GoogleProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(GoogleProperties.class); - - /* - * false if the Google provider should not be enabled despite - * the set registration; otherwise, true. - */ - @JsonProperty(value = "enabled") - private Boolean enabled; - - /* - * The configuration settings of the app registration for the Google - * provider. - */ - @JsonProperty(value = "registration") - private ClientRegistration registration; - - /* - * The configuration settings of the login flow. - */ - @JsonProperty(value = "login") - private LoginScopes login; - - /* - * The configuration settings of the Azure Active Directory token - * validation flow. - */ - @JsonProperty(value = "validation") - private AllowedAudiencesValidation validation; - - /** - * Get the enabled property: <code>false</code> if the Google provider should not be enabled despite the - * set registration; otherwise, <code>true</code>. - * - * @return the enabled value. - */ - public Boolean enabled() { - return this.enabled; - } - - /** - * Set the enabled property: <code>false</code> if the Google provider should not be enabled despite the - * set registration; otherwise, <code>true</code>. - * - * @param enabled the enabled value to set. - * @return the GoogleProperties object itself. - */ - public GoogleProperties withEnabled(Boolean enabled) { - this.enabled = enabled; - return this; - } - - /** - * Get the registration property: The configuration settings of the app registration for the Google provider. - * - * @return the registration value. - */ - public ClientRegistration registration() { - return this.registration; - } - - /** - * Set the registration property: The configuration settings of the app registration for the Google provider. - * - * @param registration the registration value to set. - * @return the GoogleProperties object itself. - */ - public GoogleProperties withRegistration(ClientRegistration registration) { - this.registration = registration; - return this; - } - - /** - * Get the login property: The configuration settings of the login flow. - * - * @return the login value. - */ - public LoginScopes login() { - return this.login; - } - - /** - * Set the login property: The configuration settings of the login flow. - * - * @param login the login value to set. - * @return the GoogleProperties object itself. - */ - public GoogleProperties withLogin(LoginScopes login) { - this.login = login; - return this; - } - - /** - * Get the validation property: The configuration settings of the Azure Active Directory token validation flow. - * - * @return the validation value. - */ - public AllowedAudiencesValidation validation() { - return this.validation; - } - - /** - * Set the validation property: The configuration settings of the Azure Active Directory token validation flow. - * - * @param validation the validation value to set. - * @return the GoogleProperties object itself. - */ - public GoogleProperties withValidation(AllowedAudiencesValidation validation) { - this.validation = validation; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (registration() != null) { - registration().validate(); - } - if (login() != null) { - login().validate(); - } - if (validation() != null) { - validation().validate(); - } - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/LegacyMicrosoftAccountProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/LegacyMicrosoftAccountProperties.java deleted file mode 100644 index df3c5194f9ceb..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/LegacyMicrosoftAccountProperties.java +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.models.AllowedAudiencesValidation; -import com.azure.resourcemanager.appservice.models.ClientRegistration; -import com.azure.resourcemanager.appservice.models.LoginScopes; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** LegacyMicrosoftAccount resource specific properties. */ -@Fluent -public final class LegacyMicrosoftAccountProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(LegacyMicrosoftAccountProperties.class); - - /* - * false if the legacy Microsoft Account provider should not - * be enabled despite the set registration; otherwise, true. - */ - @JsonProperty(value = "enabled") - private Boolean enabled; - - /* - * The configuration settings of the app registration for the legacy - * Microsoft Account provider. - */ - @JsonProperty(value = "registration") - private ClientRegistration registration; - - /* - * The configuration settings of the login flow. - */ - @JsonProperty(value = "login") - private LoginScopes login; - - /* - * The configuration settings of the legacy Microsoft Account provider - * token validation flow. - */ - @JsonProperty(value = "validation") - private AllowedAudiencesValidation validation; - - /** - * Get the enabled property: <code>false</code> if the legacy Microsoft Account provider should not be - * enabled despite the set registration; otherwise, <code>true</code>. - * - * @return the enabled value. - */ - public Boolean enabled() { - return this.enabled; - } - - /** - * Set the enabled property: <code>false</code> if the legacy Microsoft Account provider should not be - * enabled despite the set registration; otherwise, <code>true</code>. - * - * @param enabled the enabled value to set. - * @return the LegacyMicrosoftAccountProperties object itself. - */ - public LegacyMicrosoftAccountProperties withEnabled(Boolean enabled) { - this.enabled = enabled; - return this; - } - - /** - * Get the registration property: The configuration settings of the app registration for the legacy Microsoft - * Account provider. - * - * @return the registration value. - */ - public ClientRegistration registration() { - return this.registration; - } - - /** - * Set the registration property: The configuration settings of the app registration for the legacy Microsoft - * Account provider. - * - * @param registration the registration value to set. - * @return the LegacyMicrosoftAccountProperties object itself. - */ - public LegacyMicrosoftAccountProperties withRegistration(ClientRegistration registration) { - this.registration = registration; - return this; - } - - /** - * Get the login property: The configuration settings of the login flow. - * - * @return the login value. - */ - public LoginScopes login() { - return this.login; - } - - /** - * Set the login property: The configuration settings of the login flow. - * - * @param login the login value to set. - * @return the LegacyMicrosoftAccountProperties object itself. - */ - public LegacyMicrosoftAccountProperties withLogin(LoginScopes login) { - this.login = login; - return this; - } - - /** - * Get the validation property: The configuration settings of the legacy Microsoft Account provider token validation - * flow. - * - * @return the validation value. - */ - public AllowedAudiencesValidation validation() { - return this.validation; - } - - /** - * Set the validation property: The configuration settings of the legacy Microsoft Account provider token validation - * flow. - * - * @param validation the validation value to set. - * @return the LegacyMicrosoftAccountProperties object itself. - */ - public LegacyMicrosoftAccountProperties withValidation(AllowedAudiencesValidation validation) { - this.validation = validation; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (registration() != null) { - registration().validate(); - } - if (login() != null) { - login().validate(); - } - if (validation() != null) { - validation().validate(); - } - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/TwitterProperties.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/TwitterProperties.java deleted file mode 100644 index c1f9c85e867cb..0000000000000 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/models/TwitterProperties.java +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.resourcemanager.appservice.fluent.models; - -import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.models.TwitterRegistration; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** Twitter resource specific properties. */ -@Fluent -public final class TwitterProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(TwitterProperties.class); - - /* - * false if the Twitter provider should not be enabled despite - * the set registration; otherwise, true. - */ - @JsonProperty(value = "enabled") - private Boolean enabled; - - /* - * The configuration settings of the app registration for the Twitter - * provider. - */ - @JsonProperty(value = "registration") - private TwitterRegistration registration; - - /** - * Get the enabled property: <code>false</code> if the Twitter provider should not be enabled despite - * the set registration; otherwise, <code>true</code>. - * - * @return the enabled value. - */ - public Boolean enabled() { - return this.enabled; - } - - /** - * Set the enabled property: <code>false</code> if the Twitter provider should not be enabled despite - * the set registration; otherwise, <code>true</code>. - * - * @param enabled the enabled value to set. - * @return the TwitterProperties object itself. - */ - public TwitterProperties withEnabled(Boolean enabled) { - this.enabled = enabled; - return this; - } - - /** - * Get the registration property: The configuration settings of the app registration for the Twitter provider. - * - * @return the registration value. - */ - public TwitterRegistration registration() { - return this.registration; - } - - /** - * Set the registration property: The configuration settings of the app registration for the Twitter provider. - * - * @param registration the registration value to set. - * @return the TwitterProperties object itself. - */ - public TwitterProperties withRegistration(TwitterRegistration registration) { - this.registration = registration; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (registration() != null) { - registration().validate(); - } - } -} diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AllowedPrincipals.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AllowedPrincipals.java index 81abe3f1c3226..ad857ec468d02 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AllowedPrincipals.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AllowedPrincipals.java @@ -6,37 +6,26 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.AllowedPrincipalsProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** The configuration settings of the Azure Active Directory allowed principals. */ @Fluent -public final class AllowedPrincipals extends ProxyOnlyResource { +public final class AllowedPrincipals { @JsonIgnore private final ClientLogger logger = new ClientLogger(AllowedPrincipals.class); /* - * AllowedPrincipals resource specific properties + * The list of the allowed groups. */ - @JsonProperty(value = "properties") - private AllowedPrincipalsProperties innerProperties; + @JsonProperty(value = "groups") + private List groups; - /** - * Get the innerProperties property: AllowedPrincipals resource specific properties. - * - * @return the innerProperties value. + /* + * The list of the allowed identities. */ - private AllowedPrincipalsProperties innerProperties() { - return this.innerProperties; - } - - /** {@inheritDoc} */ - @Override - public AllowedPrincipals withKind(String kind) { - super.withKind(kind); - return this; - } + @JsonProperty(value = "identities") + private List identities; /** * Get the groups property: The list of the allowed groups. @@ -44,7 +33,7 @@ public AllowedPrincipals withKind(String kind) { * @return the groups value. */ public List groups() { - return this.innerProperties() == null ? null : this.innerProperties().groups(); + return this.groups; } /** @@ -54,10 +43,7 @@ public List groups() { * @return the AllowedPrincipals object itself. */ public AllowedPrincipals withGroups(List groups) { - if (this.innerProperties() == null) { - this.innerProperties = new AllowedPrincipalsProperties(); - } - this.innerProperties().withGroups(groups); + this.groups = groups; return this; } @@ -67,7 +53,7 @@ public AllowedPrincipals withGroups(List groups) { * @return the identities value. */ public List identities() { - return this.innerProperties() == null ? null : this.innerProperties().identities(); + return this.identities; } /** @@ -77,10 +63,7 @@ public List identities() { * @return the AllowedPrincipals object itself. */ public AllowedPrincipals withIdentities(List identities) { - if (this.innerProperties() == null) { - this.innerProperties = new AllowedPrincipalsProperties(); - } - this.innerProperties().withIdentities(identities); + this.identities = identities; return this; } @@ -89,11 +72,6 @@ public AllowedPrincipals withIdentities(List identities) { * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); - } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AppRegistration.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AppRegistration.java index 1c1e4d1b96745..21d4f7f6aa30f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AppRegistration.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AppRegistration.java @@ -6,36 +6,25 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.AppRegistrationProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the app registration for providers that have app ids and app secrets. */ @Fluent -public final class AppRegistration extends ProxyOnlyResource { +public final class AppRegistration { @JsonIgnore private final ClientLogger logger = new ClientLogger(AppRegistration.class); /* - * AppRegistration resource specific properties + * The App ID of the app used for login. */ - @JsonProperty(value = "properties") - private AppRegistrationProperties innerProperties; + @JsonProperty(value = "appId") + private String appId; - /** - * Get the innerProperties property: AppRegistration resource specific properties. - * - * @return the innerProperties value. + /* + * The app setting name that contains the app secret. */ - private AppRegistrationProperties innerProperties() { - return this.innerProperties; - } - - /** {@inheritDoc} */ - @Override - public AppRegistration withKind(String kind) { - super.withKind(kind); - return this; - } + @JsonProperty(value = "appSecretSettingName") + private String appSecretSettingName; /** * Get the appId property: The App ID of the app used for login. @@ -43,7 +32,7 @@ public AppRegistration withKind(String kind) { * @return the appId value. */ public String appId() { - return this.innerProperties() == null ? null : this.innerProperties().appId(); + return this.appId; } /** @@ -53,10 +42,7 @@ public String appId() { * @return the AppRegistration object itself. */ public AppRegistration withAppId(String appId) { - if (this.innerProperties() == null) { - this.innerProperties = new AppRegistrationProperties(); - } - this.innerProperties().withAppId(appId); + this.appId = appId; return this; } @@ -66,7 +52,7 @@ public AppRegistration withAppId(String appId) { * @return the appSecretSettingName value. */ public String appSecretSettingName() { - return this.innerProperties() == null ? null : this.innerProperties().appSecretSettingName(); + return this.appSecretSettingName; } /** @@ -76,10 +62,7 @@ public String appSecretSettingName() { * @return the AppRegistration object itself. */ public AppRegistration withAppSecretSettingName(String appSecretSettingName) { - if (this.innerProperties() == null) { - this.innerProperties = new AppRegistrationProperties(); - } - this.innerProperties().withAppSecretSettingName(appSecretSettingName); + this.appSecretSettingName = appSecretSettingName; return this; } @@ -88,11 +71,6 @@ public AppRegistration withAppSecretSettingName(String appSecretSettingName) { * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); - } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Apple.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Apple.java index c3998bd2bc1e2..5a66fc58abcb6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Apple.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Apple.java @@ -6,36 +6,32 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.AppleProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the Apple provider. */ @Fluent -public final class Apple extends ProxyOnlyResource { +public final class Apple { @JsonIgnore private final ClientLogger logger = new ClientLogger(Apple.class); /* - * Apple resource specific properties + * false if the Apple provider should not be enabled despite + * the set registration; otherwise, true. */ - @JsonProperty(value = "properties") - private AppleProperties innerProperties; + @JsonProperty(value = "enabled") + private Boolean enabled; - /** - * Get the innerProperties property: Apple resource specific properties. - * - * @return the innerProperties value. + /* + * The configuration settings of the Apple registration. */ - private AppleProperties innerProperties() { - return this.innerProperties; - } + @JsonProperty(value = "registration") + private AppleRegistration registration; - /** {@inheritDoc} */ - @Override - public Apple withKind(String kind) { - super.withKind(kind); - return this; - } + /* + * The configuration settings of the login flow. + */ + @JsonProperty(value = "login") + private LoginScopes login; /** * Get the enabled property: <code>false</code> if the Apple provider should not be enabled despite the @@ -44,7 +40,7 @@ public Apple withKind(String kind) { * @return the enabled value. */ public Boolean enabled() { - return this.innerProperties() == null ? null : this.innerProperties().enabled(); + return this.enabled; } /** @@ -55,10 +51,7 @@ public Boolean enabled() { * @return the Apple object itself. */ public Apple withEnabled(Boolean enabled) { - if (this.innerProperties() == null) { - this.innerProperties = new AppleProperties(); - } - this.innerProperties().withEnabled(enabled); + this.enabled = enabled; return this; } @@ -68,7 +61,7 @@ public Apple withEnabled(Boolean enabled) { * @return the registration value. */ public AppleRegistration registration() { - return this.innerProperties() == null ? null : this.innerProperties().registration(); + return this.registration; } /** @@ -78,10 +71,7 @@ public AppleRegistration registration() { * @return the Apple object itself. */ public Apple withRegistration(AppleRegistration registration) { - if (this.innerProperties() == null) { - this.innerProperties = new AppleProperties(); - } - this.innerProperties().withRegistration(registration); + this.registration = registration; return this; } @@ -91,7 +81,7 @@ public Apple withRegistration(AppleRegistration registration) { * @return the login value. */ public LoginScopes login() { - return this.innerProperties() == null ? null : this.innerProperties().login(); + return this.login; } /** @@ -101,10 +91,7 @@ public LoginScopes login() { * @return the Apple object itself. */ public Apple withLogin(LoginScopes login) { - if (this.innerProperties() == null) { - this.innerProperties = new AppleProperties(); - } - this.innerProperties().withLogin(login); + this.login = login; return this; } @@ -113,11 +100,12 @@ public Apple withLogin(LoginScopes login) { * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); + if (registration() != null) { + registration().validate(); + } + if (login() != null) { + login().validate(); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryLogin.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryLogin.java index 0650c1bcffb80..e180d27be8339 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryLogin.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryLogin.java @@ -6,37 +6,29 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.AzureActiveDirectoryLoginProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** The configuration settings of the Azure Active Directory login flow. */ @Fluent -public final class AzureActiveDirectoryLogin extends ProxyOnlyResource { +public final class AzureActiveDirectoryLogin { @JsonIgnore private final ClientLogger logger = new ClientLogger(AzureActiveDirectoryLogin.class); /* - * AzureActiveDirectoryLogin resource specific properties + * Login parameters to send to the OpenID Connect authorization endpoint + * when + * a user logs in. Each parameter must be in the form "key=value". */ - @JsonProperty(value = "properties") - private AzureActiveDirectoryLoginProperties innerProperties; + @JsonProperty(value = "loginParameters") + private List loginParameters; - /** - * Get the innerProperties property: AzureActiveDirectoryLogin resource specific properties. - * - * @return the innerProperties value. + /* + * true if the www-authenticate provider should be omitted + * from the request; otherwise, false. */ - private AzureActiveDirectoryLoginProperties innerProperties() { - return this.innerProperties; - } - - /** {@inheritDoc} */ - @Override - public AzureActiveDirectoryLogin withKind(String kind) { - super.withKind(kind); - return this; - } + @JsonProperty(value = "disableWWWAuthenticate") + private Boolean disableWwwAuthenticate; /** * Get the loginParameters property: Login parameters to send to the OpenID Connect authorization endpoint when a @@ -45,7 +37,7 @@ public AzureActiveDirectoryLogin withKind(String kind) { * @return the loginParameters value. */ public List loginParameters() { - return this.innerProperties() == null ? null : this.innerProperties().loginParameters(); + return this.loginParameters; } /** @@ -56,10 +48,7 @@ public List loginParameters() { * @return the AzureActiveDirectoryLogin object itself. */ public AzureActiveDirectoryLogin withLoginParameters(List loginParameters) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryLoginProperties(); - } - this.innerProperties().withLoginParameters(loginParameters); + this.loginParameters = loginParameters; return this; } @@ -70,7 +59,7 @@ public AzureActiveDirectoryLogin withLoginParameters(List loginParameter * @return the disableWwwAuthenticate value. */ public Boolean disableWwwAuthenticate() { - return this.innerProperties() == null ? null : this.innerProperties().disableWwwAuthenticate(); + return this.disableWwwAuthenticate; } /** @@ -81,10 +70,7 @@ public Boolean disableWwwAuthenticate() { * @return the AzureActiveDirectoryLogin object itself. */ public AzureActiveDirectoryLogin withDisableWwwAuthenticate(Boolean disableWwwAuthenticate) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryLoginProperties(); - } - this.innerProperties().withDisableWwwAuthenticate(disableWwwAuthenticate); + this.disableWwwAuthenticate = disableWwwAuthenticate; return this; } @@ -93,11 +79,6 @@ public AzureActiveDirectoryLogin withDisableWwwAuthenticate(Boolean disableWwwAu * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); - } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryRegistration.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryRegistration.java index 131b3d7843b4d..8477bca86e3da 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryRegistration.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryRegistration.java @@ -6,36 +6,71 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.AzureActiveDirectoryRegistrationProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the Azure Active Directory app registration. */ @Fluent -public final class AzureActiveDirectoryRegistration extends ProxyOnlyResource { +public final class AzureActiveDirectoryRegistration { @JsonIgnore private final ClientLogger logger = new ClientLogger(AzureActiveDirectoryRegistration.class); /* - * AzureActiveDirectoryRegistration resource specific properties + * The OpenID Connect Issuer URI that represents the entity which issues + * access tokens for this application. + * When using Azure Active Directory, this value is the URI of the + * directory tenant, e.g. + * https://login.microsoftonline.com/v2.0/{tenant-guid}/. + * This URI is a case-sensitive identifier for the token issuer. + * More information on OpenID Connect Discovery: + * http://openid.net/specs/openid-connect-discovery-1_0.html */ - @JsonProperty(value = "properties") - private AzureActiveDirectoryRegistrationProperties innerProperties; + @JsonProperty(value = "openIdIssuer") + private String openIdIssuer; - /** - * Get the innerProperties property: AzureActiveDirectoryRegistration resource specific properties. - * - * @return the innerProperties value. + /* + * The Client ID of this relying party application, known as the client_id. + * This setting is required for enabling OpenID Connection authentication + * with Azure Active Directory or + * other 3rd party OpenID Connect providers. + * More information on OpenID Connect: + * http://openid.net/specs/openid-connect-core-1_0.html */ - private AzureActiveDirectoryRegistrationProperties innerProperties() { - return this.innerProperties; - } + @JsonProperty(value = "clientId") + private String clientId; - /** {@inheritDoc} */ - @Override - public AzureActiveDirectoryRegistration withKind(String kind) { - super.withKind(kind); - return this; - } + /* + * The app setting name that contains the client secret of the relying + * party application. + */ + @JsonProperty(value = "clientSecretSettingName") + private String clientSecretSettingName; + + /* + * An alternative to the client secret, that is the thumbprint of a + * certificate used for signing purposes. This property acts as + * a replacement for the Client Secret. It is also optional. + */ + @JsonProperty(value = "clientSecretCertificateThumbprint") + private String clientSecretCertificateThumbprint; + + /* + * An alternative to the client secret thumbprint, that is the subject + * alternative name of a certificate used for signing purposes. This + * property acts as + * a replacement for the Client Secret Certificate Thumbprint. It is also + * optional. + */ + @JsonProperty(value = "clientSecretCertificateSubjectAlternativeName") + private String clientSecretCertificateSubjectAlternativeName; + + /* + * An alternative to the client secret thumbprint, that is the issuer of a + * certificate used for signing purposes. This property acts as + * a replacement for the Client Secret Certificate Thumbprint. It is also + * optional. + */ + @JsonProperty(value = "clientSecretCertificateIssuer") + private String clientSecretCertificateIssuer; /** * Get the openIdIssuer property: The OpenID Connect Issuer URI that represents the entity which issues access @@ -46,7 +81,7 @@ public AzureActiveDirectoryRegistration withKind(String kind) { * @return the openIdIssuer value. */ public String openIdIssuer() { - return this.innerProperties() == null ? null : this.innerProperties().openIdIssuer(); + return this.openIdIssuer; } /** @@ -59,10 +94,7 @@ public String openIdIssuer() { * @return the AzureActiveDirectoryRegistration object itself. */ public AzureActiveDirectoryRegistration withOpenIdIssuer(String openIdIssuer) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryRegistrationProperties(); - } - this.innerProperties().withOpenIdIssuer(openIdIssuer); + this.openIdIssuer = openIdIssuer; return this; } @@ -74,7 +106,7 @@ public AzureActiveDirectoryRegistration withOpenIdIssuer(String openIdIssuer) { * @return the clientId value. */ public String clientId() { - return this.innerProperties() == null ? null : this.innerProperties().clientId(); + return this.clientId; } /** @@ -86,10 +118,7 @@ public String clientId() { * @return the AzureActiveDirectoryRegistration object itself. */ public AzureActiveDirectoryRegistration withClientId(String clientId) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryRegistrationProperties(); - } - this.innerProperties().withClientId(clientId); + this.clientId = clientId; return this; } @@ -100,7 +129,7 @@ public AzureActiveDirectoryRegistration withClientId(String clientId) { * @return the clientSecretSettingName value. */ public String clientSecretSettingName() { - return this.innerProperties() == null ? null : this.innerProperties().clientSecretSettingName(); + return this.clientSecretSettingName; } /** @@ -111,10 +140,7 @@ public String clientSecretSettingName() { * @return the AzureActiveDirectoryRegistration object itself. */ public AzureActiveDirectoryRegistration withClientSecretSettingName(String clientSecretSettingName) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryRegistrationProperties(); - } - this.innerProperties().withClientSecretSettingName(clientSecretSettingName); + this.clientSecretSettingName = clientSecretSettingName; return this; } @@ -126,7 +152,7 @@ public AzureActiveDirectoryRegistration withClientSecretSettingName(String clien * @return the clientSecretCertificateThumbprint value. */ public String clientSecretCertificateThumbprint() { - return this.innerProperties() == null ? null : this.innerProperties().clientSecretCertificateThumbprint(); + return this.clientSecretCertificateThumbprint; } /** @@ -139,10 +165,7 @@ public String clientSecretCertificateThumbprint() { */ public AzureActiveDirectoryRegistration withClientSecretCertificateThumbprint( String clientSecretCertificateThumbprint) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryRegistrationProperties(); - } - this.innerProperties().withClientSecretCertificateThumbprint(clientSecretCertificateThumbprint); + this.clientSecretCertificateThumbprint = clientSecretCertificateThumbprint; return this; } @@ -154,9 +177,7 @@ public AzureActiveDirectoryRegistration withClientSecretCertificateThumbprint( * @return the clientSecretCertificateSubjectAlternativeName value. */ public String clientSecretCertificateSubjectAlternativeName() { - return this.innerProperties() == null - ? null - : this.innerProperties().clientSecretCertificateSubjectAlternativeName(); + return this.clientSecretCertificateSubjectAlternativeName; } /** @@ -170,12 +191,7 @@ public String clientSecretCertificateSubjectAlternativeName() { */ public AzureActiveDirectoryRegistration withClientSecretCertificateSubjectAlternativeName( String clientSecretCertificateSubjectAlternativeName) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryRegistrationProperties(); - } - this - .innerProperties() - .withClientSecretCertificateSubjectAlternativeName(clientSecretCertificateSubjectAlternativeName); + this.clientSecretCertificateSubjectAlternativeName = clientSecretCertificateSubjectAlternativeName; return this; } @@ -187,7 +203,7 @@ public AzureActiveDirectoryRegistration withClientSecretCertificateSubjectAltern * @return the clientSecretCertificateIssuer value. */ public String clientSecretCertificateIssuer() { - return this.innerProperties() == null ? null : this.innerProperties().clientSecretCertificateIssuer(); + return this.clientSecretCertificateIssuer; } /** @@ -199,10 +215,7 @@ public String clientSecretCertificateIssuer() { * @return the AzureActiveDirectoryRegistration object itself. */ public AzureActiveDirectoryRegistration withClientSecretCertificateIssuer(String clientSecretCertificateIssuer) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryRegistrationProperties(); - } - this.innerProperties().withClientSecretCertificateIssuer(clientSecretCertificateIssuer); + this.clientSecretCertificateIssuer = clientSecretCertificateIssuer; return this; } @@ -211,11 +224,6 @@ public AzureActiveDirectoryRegistration withClientSecretCertificateIssuer(String * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); - } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryValidation.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryValidation.java index 2af314fc1d0c0..8368c3ef117e6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryValidation.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureActiveDirectoryValidation.java @@ -6,37 +6,34 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.AzureActiveDirectoryValidationProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** The configuration settings of the Azure Active Directory token validation flow. */ @Fluent -public final class AzureActiveDirectoryValidation extends ProxyOnlyResource { +public final class AzureActiveDirectoryValidation { @JsonIgnore private final ClientLogger logger = new ClientLogger(AzureActiveDirectoryValidation.class); /* - * AzureActiveDirectoryValidation resource specific properties + * The configuration settings of the checks that should be made while + * validating the JWT Claims. */ - @JsonProperty(value = "properties") - private AzureActiveDirectoryValidationProperties innerProperties; + @JsonProperty(value = "jwtClaimChecks") + private JwtClaimChecks jwtClaimChecks; - /** - * Get the innerProperties property: AzureActiveDirectoryValidation resource specific properties. - * - * @return the innerProperties value. + /* + * The list of audiences that can make successful + * authentication/authorization requests. */ - private AzureActiveDirectoryValidationProperties innerProperties() { - return this.innerProperties; - } + @JsonProperty(value = "allowedAudiences") + private List allowedAudiences; - /** {@inheritDoc} */ - @Override - public AzureActiveDirectoryValidation withKind(String kind) { - super.withKind(kind); - return this; - } + /* + * The configuration settings of the default authorization policy. + */ + @JsonProperty(value = "defaultAuthorizationPolicy") + private DefaultAuthorizationPolicy defaultAuthorizationPolicy; /** * Get the jwtClaimChecks property: The configuration settings of the checks that should be made while validating @@ -45,7 +42,7 @@ public AzureActiveDirectoryValidation withKind(String kind) { * @return the jwtClaimChecks value. */ public JwtClaimChecks jwtClaimChecks() { - return this.innerProperties() == null ? null : this.innerProperties().jwtClaimChecks(); + return this.jwtClaimChecks; } /** @@ -56,10 +53,7 @@ public JwtClaimChecks jwtClaimChecks() { * @return the AzureActiveDirectoryValidation object itself. */ public AzureActiveDirectoryValidation withJwtClaimChecks(JwtClaimChecks jwtClaimChecks) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryValidationProperties(); - } - this.innerProperties().withJwtClaimChecks(jwtClaimChecks); + this.jwtClaimChecks = jwtClaimChecks; return this; } @@ -70,7 +64,7 @@ public AzureActiveDirectoryValidation withJwtClaimChecks(JwtClaimChecks jwtClaim * @return the allowedAudiences value. */ public List allowedAudiences() { - return this.innerProperties() == null ? null : this.innerProperties().allowedAudiences(); + return this.allowedAudiences; } /** @@ -81,10 +75,7 @@ public List allowedAudiences() { * @return the AzureActiveDirectoryValidation object itself. */ public AzureActiveDirectoryValidation withAllowedAudiences(List allowedAudiences) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryValidationProperties(); - } - this.innerProperties().withAllowedAudiences(allowedAudiences); + this.allowedAudiences = allowedAudiences; return this; } @@ -94,7 +85,7 @@ public AzureActiveDirectoryValidation withAllowedAudiences(List allowedA * @return the defaultAuthorizationPolicy value. */ public DefaultAuthorizationPolicy defaultAuthorizationPolicy() { - return this.innerProperties() == null ? null : this.innerProperties().defaultAuthorizationPolicy(); + return this.defaultAuthorizationPolicy; } /** @@ -105,10 +96,7 @@ public DefaultAuthorizationPolicy defaultAuthorizationPolicy() { */ public AzureActiveDirectoryValidation withDefaultAuthorizationPolicy( DefaultAuthorizationPolicy defaultAuthorizationPolicy) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureActiveDirectoryValidationProperties(); - } - this.innerProperties().withDefaultAuthorizationPolicy(defaultAuthorizationPolicy); + this.defaultAuthorizationPolicy = defaultAuthorizationPolicy; return this; } @@ -117,11 +105,12 @@ public AzureActiveDirectoryValidation withDefaultAuthorizationPolicy( * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); + if (jwtClaimChecks() != null) { + jwtClaimChecks().validate(); + } + if (defaultAuthorizationPolicy() != null) { + defaultAuthorizationPolicy().validate(); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureStaticWebApps.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureStaticWebApps.java index 86836cb3e853e..834c72f0dd873 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureStaticWebApps.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/AzureStaticWebApps.java @@ -6,36 +6,26 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.AzureStaticWebAppsProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the Azure Static Web Apps provider. */ @Fluent -public final class AzureStaticWebApps extends ProxyOnlyResource { +public final class AzureStaticWebApps { @JsonIgnore private final ClientLogger logger = new ClientLogger(AzureStaticWebApps.class); /* - * AzureStaticWebApps resource specific properties + * false if the Azure Static Web Apps provider should not be + * enabled despite the set registration; otherwise, true. */ - @JsonProperty(value = "properties") - private AzureStaticWebAppsProperties innerProperties; + @JsonProperty(value = "enabled") + private Boolean enabled; - /** - * Get the innerProperties property: AzureStaticWebApps resource specific properties. - * - * @return the innerProperties value. + /* + * The configuration settings of the Azure Static Web Apps registration. */ - private AzureStaticWebAppsProperties innerProperties() { - return this.innerProperties; - } - - /** {@inheritDoc} */ - @Override - public AzureStaticWebApps withKind(String kind) { - super.withKind(kind); - return this; - } + @JsonProperty(value = "registration") + private AzureStaticWebAppsRegistration registration; /** * Get the enabled property: <code>false</code> if the Azure Static Web Apps provider should not be @@ -44,7 +34,7 @@ public AzureStaticWebApps withKind(String kind) { * @return the enabled value. */ public Boolean enabled() { - return this.innerProperties() == null ? null : this.innerProperties().enabled(); + return this.enabled; } /** @@ -55,10 +45,7 @@ public Boolean enabled() { * @return the AzureStaticWebApps object itself. */ public AzureStaticWebApps withEnabled(Boolean enabled) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureStaticWebAppsProperties(); - } - this.innerProperties().withEnabled(enabled); + this.enabled = enabled; return this; } @@ -68,7 +55,7 @@ public AzureStaticWebApps withEnabled(Boolean enabled) { * @return the registration value. */ public AzureStaticWebAppsRegistration registration() { - return this.innerProperties() == null ? null : this.innerProperties().registration(); + return this.registration; } /** @@ -78,10 +65,7 @@ public AzureStaticWebAppsRegistration registration() { * @return the AzureStaticWebApps object itself. */ public AzureStaticWebApps withRegistration(AzureStaticWebAppsRegistration registration) { - if (this.innerProperties() == null) { - this.innerProperties = new AzureStaticWebAppsProperties(); - } - this.innerProperties().withRegistration(registration); + this.registration = registration; return this; } @@ -90,11 +74,9 @@ public AzureStaticWebApps withRegistration(AzureStaticWebAppsRegistration regist * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); + if (registration() != null) { + registration().validate(); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/BlobStorageTokenStore.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/BlobStorageTokenStore.java index 0b1539b1644bd..333ead2261993 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/BlobStorageTokenStore.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/BlobStorageTokenStore.java @@ -6,36 +6,20 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.BlobStorageTokenStoreProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the storage of the tokens if blob storage is used. */ @Fluent -public final class BlobStorageTokenStore extends ProxyOnlyResource { +public final class BlobStorageTokenStore { @JsonIgnore private final ClientLogger logger = new ClientLogger(BlobStorageTokenStore.class); /* - * BlobStorageTokenStore resource specific properties - */ - @JsonProperty(value = "properties") - private BlobStorageTokenStoreProperties innerProperties; - - /** - * Get the innerProperties property: BlobStorageTokenStore resource specific properties. - * - * @return the innerProperties value. + * The name of the app setting containing the SAS URL of the blob storage + * containing the tokens. */ - private BlobStorageTokenStoreProperties innerProperties() { - return this.innerProperties; - } - - /** {@inheritDoc} */ - @Override - public BlobStorageTokenStore withKind(String kind) { - super.withKind(kind); - return this; - } + @JsonProperty(value = "sasUrlSettingName") + private String sasUrlSettingName; /** * Get the sasUrlSettingName property: The name of the app setting containing the SAS URL of the blob storage @@ -44,7 +28,7 @@ public BlobStorageTokenStore withKind(String kind) { * @return the sasUrlSettingName value. */ public String sasUrlSettingName() { - return this.innerProperties() == null ? null : this.innerProperties().sasUrlSettingName(); + return this.sasUrlSettingName; } /** @@ -55,10 +39,7 @@ public String sasUrlSettingName() { * @return the BlobStorageTokenStore object itself. */ public BlobStorageTokenStore withSasUrlSettingName(String sasUrlSettingName) { - if (this.innerProperties() == null) { - this.innerProperties = new BlobStorageTokenStoreProperties(); - } - this.innerProperties().withSasUrlSettingName(sasUrlSettingName); + this.sasUrlSettingName = sasUrlSettingName; return this; } @@ -67,11 +48,6 @@ public BlobStorageTokenStore withSasUrlSettingName(String sasUrlSettingName) { * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); - } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/CustomOpenIdConnectProvider.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/CustomOpenIdConnectProvider.java index c6b26ad1cdaeb..ca979b798f885 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/CustomOpenIdConnectProvider.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/CustomOpenIdConnectProvider.java @@ -6,36 +6,34 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.CustomOpenIdConnectProviderProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the custom Open ID Connect provider. */ @Fluent -public final class CustomOpenIdConnectProvider extends ProxyOnlyResource { +public final class CustomOpenIdConnectProvider { @JsonIgnore private final ClientLogger logger = new ClientLogger(CustomOpenIdConnectProvider.class); /* - * CustomOpenIdConnectProvider resource specific properties + * false if the custom Open ID provider provider should not be + * enabled; otherwise, true. */ - @JsonProperty(value = "properties") - private CustomOpenIdConnectProviderProperties innerProperties; + @JsonProperty(value = "enabled") + private Boolean enabled; - /** - * Get the innerProperties property: CustomOpenIdConnectProvider resource specific properties. - * - * @return the innerProperties value. + /* + * The configuration settings of the app registration for the custom Open + * ID Connect provider. */ - private CustomOpenIdConnectProviderProperties innerProperties() { - return this.innerProperties; - } + @JsonProperty(value = "registration") + private OpenIdConnectRegistration registration; - /** {@inheritDoc} */ - @Override - public CustomOpenIdConnectProvider withKind(String kind) { - super.withKind(kind); - return this; - } + /* + * The configuration settings of the login flow of the custom Open ID + * Connect provider. + */ + @JsonProperty(value = "login") + private OpenIdConnectLogin login; /** * Get the enabled property: <code>false</code> if the custom Open ID provider provider should not be @@ -44,7 +42,7 @@ public CustomOpenIdConnectProvider withKind(String kind) { * @return the enabled value. */ public Boolean enabled() { - return this.innerProperties() == null ? null : this.innerProperties().enabled(); + return this.enabled; } /** @@ -55,10 +53,7 @@ public Boolean enabled() { * @return the CustomOpenIdConnectProvider object itself. */ public CustomOpenIdConnectProvider withEnabled(Boolean enabled) { - if (this.innerProperties() == null) { - this.innerProperties = new CustomOpenIdConnectProviderProperties(); - } - this.innerProperties().withEnabled(enabled); + this.enabled = enabled; return this; } @@ -69,7 +64,7 @@ public CustomOpenIdConnectProvider withEnabled(Boolean enabled) { * @return the registration value. */ public OpenIdConnectRegistration registration() { - return this.innerProperties() == null ? null : this.innerProperties().registration(); + return this.registration; } /** @@ -80,10 +75,7 @@ public OpenIdConnectRegistration registration() { * @return the CustomOpenIdConnectProvider object itself. */ public CustomOpenIdConnectProvider withRegistration(OpenIdConnectRegistration registration) { - if (this.innerProperties() == null) { - this.innerProperties = new CustomOpenIdConnectProviderProperties(); - } - this.innerProperties().withRegistration(registration); + this.registration = registration; return this; } @@ -93,7 +85,7 @@ public CustomOpenIdConnectProvider withRegistration(OpenIdConnectRegistration re * @return the login value. */ public OpenIdConnectLogin login() { - return this.innerProperties() == null ? null : this.innerProperties().login(); + return this.login; } /** @@ -103,10 +95,7 @@ public OpenIdConnectLogin login() { * @return the CustomOpenIdConnectProvider object itself. */ public CustomOpenIdConnectProvider withLogin(OpenIdConnectLogin login) { - if (this.innerProperties() == null) { - this.innerProperties = new CustomOpenIdConnectProviderProperties(); - } - this.innerProperties().withLogin(login); + this.login = login; return this; } @@ -115,11 +104,12 @@ public CustomOpenIdConnectProvider withLogin(OpenIdConnectLogin login) { * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); + if (registration() != null) { + registration().validate(); + } + if (login() != null) { + login().validate(); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/GitHub.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/GitHub.java index 31c9106f657df..5ddd8d0ef5971 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/GitHub.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/GitHub.java @@ -6,36 +6,33 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.GitHubProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the GitHub provider. */ @Fluent -public final class GitHub extends ProxyOnlyResource { +public final class GitHub { @JsonIgnore private final ClientLogger logger = new ClientLogger(GitHub.class); /* - * GitHub resource specific properties + * false if the GitHub provider should not be enabled despite + * the set registration; otherwise, true. */ - @JsonProperty(value = "properties") - private GitHubProperties innerProperties; + @JsonProperty(value = "enabled") + private Boolean enabled; - /** - * Get the innerProperties property: GitHub resource specific properties. - * - * @return the innerProperties value. + /* + * The configuration settings of the app registration for the GitHub + * provider. */ - private GitHubProperties innerProperties() { - return this.innerProperties; - } + @JsonProperty(value = "registration") + private ClientRegistration registration; - /** {@inheritDoc} */ - @Override - public GitHub withKind(String kind) { - super.withKind(kind); - return this; - } + /* + * The configuration settings of the login flow. + */ + @JsonProperty(value = "login") + private LoginScopes login; /** * Get the enabled property: <code>false</code> if the GitHub provider should not be enabled despite the @@ -44,7 +41,7 @@ public GitHub withKind(String kind) { * @return the enabled value. */ public Boolean enabled() { - return this.innerProperties() == null ? null : this.innerProperties().enabled(); + return this.enabled; } /** @@ -55,10 +52,7 @@ public Boolean enabled() { * @return the GitHub object itself. */ public GitHub withEnabled(Boolean enabled) { - if (this.innerProperties() == null) { - this.innerProperties = new GitHubProperties(); - } - this.innerProperties().withEnabled(enabled); + this.enabled = enabled; return this; } @@ -68,7 +62,7 @@ public GitHub withEnabled(Boolean enabled) { * @return the registration value. */ public ClientRegistration registration() { - return this.innerProperties() == null ? null : this.innerProperties().registration(); + return this.registration; } /** @@ -78,10 +72,7 @@ public ClientRegistration registration() { * @return the GitHub object itself. */ public GitHub withRegistration(ClientRegistration registration) { - if (this.innerProperties() == null) { - this.innerProperties = new GitHubProperties(); - } - this.innerProperties().withRegistration(registration); + this.registration = registration; return this; } @@ -91,7 +82,7 @@ public GitHub withRegistration(ClientRegistration registration) { * @return the login value. */ public LoginScopes login() { - return this.innerProperties() == null ? null : this.innerProperties().login(); + return this.login; } /** @@ -101,10 +92,7 @@ public LoginScopes login() { * @return the GitHub object itself. */ public GitHub withLogin(LoginScopes login) { - if (this.innerProperties() == null) { - this.innerProperties = new GitHubProperties(); - } - this.innerProperties().withLogin(login); + this.login = login; return this; } @@ -113,11 +101,12 @@ public GitHub withLogin(LoginScopes login) { * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); + if (registration() != null) { + registration().validate(); + } + if (login() != null) { + login().validate(); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Google.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Google.java index 324726038ee37..1c3376702b82f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Google.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Google.java @@ -6,36 +6,40 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.GoogleProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the Google provider. */ @Fluent -public final class Google extends ProxyOnlyResource { +public final class Google { @JsonIgnore private final ClientLogger logger = new ClientLogger(Google.class); /* - * Google resource specific properties + * false if the Google provider should not be enabled despite + * the set registration; otherwise, true. */ - @JsonProperty(value = "properties") - private GoogleProperties innerProperties; + @JsonProperty(value = "enabled") + private Boolean enabled; - /** - * Get the innerProperties property: Google resource specific properties. - * - * @return the innerProperties value. + /* + * The configuration settings of the app registration for the Google + * provider. */ - private GoogleProperties innerProperties() { - return this.innerProperties; - } + @JsonProperty(value = "registration") + private ClientRegistration registration; - /** {@inheritDoc} */ - @Override - public Google withKind(String kind) { - super.withKind(kind); - return this; - } + /* + * The configuration settings of the login flow. + */ + @JsonProperty(value = "login") + private LoginScopes login; + + /* + * The configuration settings of the Azure Active Directory token + * validation flow. + */ + @JsonProperty(value = "validation") + private AllowedAudiencesValidation validation; /** * Get the enabled property: <code>false</code> if the Google provider should not be enabled despite the @@ -44,7 +48,7 @@ public Google withKind(String kind) { * @return the enabled value. */ public Boolean enabled() { - return this.innerProperties() == null ? null : this.innerProperties().enabled(); + return this.enabled; } /** @@ -55,10 +59,7 @@ public Boolean enabled() { * @return the Google object itself. */ public Google withEnabled(Boolean enabled) { - if (this.innerProperties() == null) { - this.innerProperties = new GoogleProperties(); - } - this.innerProperties().withEnabled(enabled); + this.enabled = enabled; return this; } @@ -68,7 +69,7 @@ public Google withEnabled(Boolean enabled) { * @return the registration value. */ public ClientRegistration registration() { - return this.innerProperties() == null ? null : this.innerProperties().registration(); + return this.registration; } /** @@ -78,10 +79,7 @@ public ClientRegistration registration() { * @return the Google object itself. */ public Google withRegistration(ClientRegistration registration) { - if (this.innerProperties() == null) { - this.innerProperties = new GoogleProperties(); - } - this.innerProperties().withRegistration(registration); + this.registration = registration; return this; } @@ -91,7 +89,7 @@ public Google withRegistration(ClientRegistration registration) { * @return the login value. */ public LoginScopes login() { - return this.innerProperties() == null ? null : this.innerProperties().login(); + return this.login; } /** @@ -101,10 +99,7 @@ public LoginScopes login() { * @return the Google object itself. */ public Google withLogin(LoginScopes login) { - if (this.innerProperties() == null) { - this.innerProperties = new GoogleProperties(); - } - this.innerProperties().withLogin(login); + this.login = login; return this; } @@ -114,7 +109,7 @@ public Google withLogin(LoginScopes login) { * @return the validation value. */ public AllowedAudiencesValidation validation() { - return this.innerProperties() == null ? null : this.innerProperties().validation(); + return this.validation; } /** @@ -124,10 +119,7 @@ public AllowedAudiencesValidation validation() { * @return the Google object itself. */ public Google withValidation(AllowedAudiencesValidation validation) { - if (this.innerProperties() == null) { - this.innerProperties = new GoogleProperties(); - } - this.innerProperties().withValidation(validation); + this.validation = validation; return this; } @@ -136,11 +128,15 @@ public Google withValidation(AllowedAudiencesValidation validation) { * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); + if (registration() != null) { + registration().validate(); + } + if (login() != null) { + login().validate(); + } + if (validation() != null) { + validation().validate(); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/IdentityProviders.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/IdentityProviders.java index c7612105d190a..1d831cdff77ed 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/IdentityProviders.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/IdentityProviders.java @@ -43,27 +43,18 @@ public final class IdentityProviders { @JsonProperty(value = "google") private Google google; - /* - * The configuration settings of the Twitter provider. - */ - @JsonProperty(value = "twitter") - private Twitter twitter; - - /* - * The map of the name of the alias of each custom Open ID Connect provider - * to the - * configuration settings of the custom Open ID Connect provider. - */ - @JsonProperty(value = "customOpenIdConnectProviders") - @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) - private Map customOpenIdConnectProviders; - /* * The configuration settings of the legacy Microsoft Account provider. */ @JsonProperty(value = "legacyMicrosoftAccount") private LegacyMicrosoftAccount legacyMicrosoftAccount; + /* + * The configuration settings of the Twitter provider. + */ + @JsonProperty(value = "twitter") + private Twitter twitter; + /* * The configuration settings of the Apple provider. */ @@ -76,6 +67,15 @@ public final class IdentityProviders { @JsonProperty(value = "azureStaticWebApps") private AzureStaticWebApps azureStaticWebApps; + /* + * The map of the name of the alias of each custom Open ID Connect provider + * to the + * configuration settings of the custom Open ID Connect provider. + */ + @JsonProperty(value = "customOpenIdConnectProviders") + @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) + private Map customOpenIdConnectProviders; + /** * Get the azureActiveDirectory property: The configuration settings of the Azure Active directory provider. * @@ -157,65 +157,42 @@ public IdentityProviders withGoogle(Google google) { } /** - * Get the twitter property: The configuration settings of the Twitter provider. - * - * @return the twitter value. - */ - public Twitter twitter() { - return this.twitter; - } - - /** - * Set the twitter property: The configuration settings of the Twitter provider. - * - * @param twitter the twitter value to set. - * @return the IdentityProviders object itself. - */ - public IdentityProviders withTwitter(Twitter twitter) { - this.twitter = twitter; - return this; - } - - /** - * Get the customOpenIdConnectProviders property: The map of the name of the alias of each custom Open ID Connect - * provider to the configuration settings of the custom Open ID Connect provider. + * Get the legacyMicrosoftAccount property: The configuration settings of the legacy Microsoft Account provider. * - * @return the customOpenIdConnectProviders value. + * @return the legacyMicrosoftAccount value. */ - public Map customOpenIdConnectProviders() { - return this.customOpenIdConnectProviders; + public LegacyMicrosoftAccount legacyMicrosoftAccount() { + return this.legacyMicrosoftAccount; } /** - * Set the customOpenIdConnectProviders property: The map of the name of the alias of each custom Open ID Connect - * provider to the configuration settings of the custom Open ID Connect provider. + * Set the legacyMicrosoftAccount property: The configuration settings of the legacy Microsoft Account provider. * - * @param customOpenIdConnectProviders the customOpenIdConnectProviders value to set. + * @param legacyMicrosoftAccount the legacyMicrosoftAccount value to set. * @return the IdentityProviders object itself. */ - public IdentityProviders withCustomOpenIdConnectProviders( - Map customOpenIdConnectProviders) { - this.customOpenIdConnectProviders = customOpenIdConnectProviders; + public IdentityProviders withLegacyMicrosoftAccount(LegacyMicrosoftAccount legacyMicrosoftAccount) { + this.legacyMicrosoftAccount = legacyMicrosoftAccount; return this; } /** - * Get the legacyMicrosoftAccount property: The configuration settings of the legacy Microsoft Account provider. + * Get the twitter property: The configuration settings of the Twitter provider. * - * @return the legacyMicrosoftAccount value. + * @return the twitter value. */ - public LegacyMicrosoftAccount legacyMicrosoftAccount() { - return this.legacyMicrosoftAccount; + public Twitter twitter() { + return this.twitter; } /** - * Set the legacyMicrosoftAccount property: The configuration settings of the legacy Microsoft Account provider. + * Set the twitter property: The configuration settings of the Twitter provider. * - * @param legacyMicrosoftAccount the legacyMicrosoftAccount value to set. + * @param twitter the twitter value to set. * @return the IdentityProviders object itself. */ - public IdentityProviders withLegacyMicrosoftAccount(LegacyMicrosoftAccount legacyMicrosoftAccount) { - this.legacyMicrosoftAccount = legacyMicrosoftAccount; + public IdentityProviders withTwitter(Twitter twitter) { + this.twitter = twitter; return this; } @@ -259,6 +236,29 @@ public IdentityProviders withAzureStaticWebApps(AzureStaticWebApps azureStaticWe return this; } + /** + * Get the customOpenIdConnectProviders property: The map of the name of the alias of each custom Open ID Connect + * provider to the configuration settings of the custom Open ID Connect provider. + * + * @return the customOpenIdConnectProviders value. + */ + public Map customOpenIdConnectProviders() { + return this.customOpenIdConnectProviders; + } + + /** + * Set the customOpenIdConnectProviders property: The map of the name of the alias of each custom Open ID Connect + * provider to the configuration settings of the custom Open ID Connect provider. + * + * @param customOpenIdConnectProviders the customOpenIdConnectProviders value to set. + * @return the IdentityProviders object itself. + */ + public IdentityProviders withCustomOpenIdConnectProviders( + Map customOpenIdConnectProviders) { + this.customOpenIdConnectProviders = customOpenIdConnectProviders; + return this; + } + /** * Validates the instance. * @@ -277,9 +277,18 @@ public void validate() { if (google() != null) { google().validate(); } + if (legacyMicrosoftAccount() != null) { + legacyMicrosoftAccount().validate(); + } if (twitter() != null) { twitter().validate(); } + if (apple() != null) { + apple().validate(); + } + if (azureStaticWebApps() != null) { + azureStaticWebApps().validate(); + } if (customOpenIdConnectProviders() != null) { customOpenIdConnectProviders() .values() @@ -290,14 +299,5 @@ public void validate() { } }); } - if (legacyMicrosoftAccount() != null) { - legacyMicrosoftAccount().validate(); - } - if (apple() != null) { - apple().validate(); - } - if (azureStaticWebApps() != null) { - azureStaticWebApps().validate(); - } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/LegacyMicrosoftAccount.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/LegacyMicrosoftAccount.java index 1bd9aaf5f4611..57601a0c46353 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/LegacyMicrosoftAccount.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/LegacyMicrosoftAccount.java @@ -6,36 +6,40 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.LegacyMicrosoftAccountProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the legacy Microsoft Account provider. */ @Fluent -public final class LegacyMicrosoftAccount extends ProxyOnlyResource { +public final class LegacyMicrosoftAccount { @JsonIgnore private final ClientLogger logger = new ClientLogger(LegacyMicrosoftAccount.class); /* - * LegacyMicrosoftAccount resource specific properties + * false if the legacy Microsoft Account provider should not + * be enabled despite the set registration; otherwise, true. */ - @JsonProperty(value = "properties") - private LegacyMicrosoftAccountProperties innerProperties; + @JsonProperty(value = "enabled") + private Boolean enabled; - /** - * Get the innerProperties property: LegacyMicrosoftAccount resource specific properties. - * - * @return the innerProperties value. + /* + * The configuration settings of the app registration for the legacy + * Microsoft Account provider. */ - private LegacyMicrosoftAccountProperties innerProperties() { - return this.innerProperties; - } + @JsonProperty(value = "registration") + private ClientRegistration registration; - /** {@inheritDoc} */ - @Override - public LegacyMicrosoftAccount withKind(String kind) { - super.withKind(kind); - return this; - } + /* + * The configuration settings of the login flow. + */ + @JsonProperty(value = "login") + private LoginScopes login; + + /* + * The configuration settings of the legacy Microsoft Account provider + * token validation flow. + */ + @JsonProperty(value = "validation") + private AllowedAudiencesValidation validation; /** * Get the enabled property: <code>false</code> if the legacy Microsoft Account provider should not be @@ -44,7 +48,7 @@ public LegacyMicrosoftAccount withKind(String kind) { * @return the enabled value. */ public Boolean enabled() { - return this.innerProperties() == null ? null : this.innerProperties().enabled(); + return this.enabled; } /** @@ -55,10 +59,7 @@ public Boolean enabled() { * @return the LegacyMicrosoftAccount object itself. */ public LegacyMicrosoftAccount withEnabled(Boolean enabled) { - if (this.innerProperties() == null) { - this.innerProperties = new LegacyMicrosoftAccountProperties(); - } - this.innerProperties().withEnabled(enabled); + this.enabled = enabled; return this; } @@ -69,7 +70,7 @@ public LegacyMicrosoftAccount withEnabled(Boolean enabled) { * @return the registration value. */ public ClientRegistration registration() { - return this.innerProperties() == null ? null : this.innerProperties().registration(); + return this.registration; } /** @@ -80,10 +81,7 @@ public ClientRegistration registration() { * @return the LegacyMicrosoftAccount object itself. */ public LegacyMicrosoftAccount withRegistration(ClientRegistration registration) { - if (this.innerProperties() == null) { - this.innerProperties = new LegacyMicrosoftAccountProperties(); - } - this.innerProperties().withRegistration(registration); + this.registration = registration; return this; } @@ -93,7 +91,7 @@ public LegacyMicrosoftAccount withRegistration(ClientRegistration registration) * @return the login value. */ public LoginScopes login() { - return this.innerProperties() == null ? null : this.innerProperties().login(); + return this.login; } /** @@ -103,10 +101,7 @@ public LoginScopes login() { * @return the LegacyMicrosoftAccount object itself. */ public LegacyMicrosoftAccount withLogin(LoginScopes login) { - if (this.innerProperties() == null) { - this.innerProperties = new LegacyMicrosoftAccountProperties(); - } - this.innerProperties().withLogin(login); + this.login = login; return this; } @@ -117,7 +112,7 @@ public LegacyMicrosoftAccount withLogin(LoginScopes login) { * @return the validation value. */ public AllowedAudiencesValidation validation() { - return this.innerProperties() == null ? null : this.innerProperties().validation(); + return this.validation; } /** @@ -128,10 +123,7 @@ public AllowedAudiencesValidation validation() { * @return the LegacyMicrosoftAccount object itself. */ public LegacyMicrosoftAccount withValidation(AllowedAudiencesValidation validation) { - if (this.innerProperties() == null) { - this.innerProperties = new LegacyMicrosoftAccountProperties(); - } - this.innerProperties().withValidation(validation); + this.validation = validation; return this; } @@ -140,11 +132,15 @@ public LegacyMicrosoftAccount withValidation(AllowedAudiencesValidation validati * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); + if (registration() != null) { + registration().validate(); + } + if (login() != null) { + login().validate(); + } + if (validation() != null) { + validation().validate(); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Twitter.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Twitter.java index be2e43d6555a7..3beb8cd5a0d7b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Twitter.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/models/Twitter.java @@ -6,36 +6,27 @@ import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.appservice.fluent.models.TwitterProperties; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The configuration settings of the Twitter provider. */ @Fluent -public final class Twitter extends ProxyOnlyResource { +public final class Twitter { @JsonIgnore private final ClientLogger logger = new ClientLogger(Twitter.class); /* - * Twitter resource specific properties + * false if the Twitter provider should not be enabled despite + * the set registration; otherwise, true. */ - @JsonProperty(value = "properties") - private TwitterProperties innerProperties; + @JsonProperty(value = "enabled") + private Boolean enabled; - /** - * Get the innerProperties property: Twitter resource specific properties. - * - * @return the innerProperties value. + /* + * The configuration settings of the app registration for the Twitter + * provider. */ - private TwitterProperties innerProperties() { - return this.innerProperties; - } - - /** {@inheritDoc} */ - @Override - public Twitter withKind(String kind) { - super.withKind(kind); - return this; - } + @JsonProperty(value = "registration") + private TwitterRegistration registration; /** * Get the enabled property: <code>false</code> if the Twitter provider should not be enabled despite @@ -44,7 +35,7 @@ public Twitter withKind(String kind) { * @return the enabled value. */ public Boolean enabled() { - return this.innerProperties() == null ? null : this.innerProperties().enabled(); + return this.enabled; } /** @@ -55,10 +46,7 @@ public Boolean enabled() { * @return the Twitter object itself. */ public Twitter withEnabled(Boolean enabled) { - if (this.innerProperties() == null) { - this.innerProperties = new TwitterProperties(); - } - this.innerProperties().withEnabled(enabled); + this.enabled = enabled; return this; } @@ -68,7 +56,7 @@ public Twitter withEnabled(Boolean enabled) { * @return the registration value. */ public TwitterRegistration registration() { - return this.innerProperties() == null ? null : this.innerProperties().registration(); + return this.registration; } /** @@ -78,10 +66,7 @@ public TwitterRegistration registration() { * @return the Twitter object itself. */ public Twitter withRegistration(TwitterRegistration registration) { - if (this.innerProperties() == null) { - this.innerProperties = new TwitterProperties(); - } - this.innerProperties().withRegistration(registration); + this.registration = registration; return this; } @@ -90,11 +75,9 @@ public Twitter withRegistration(TwitterRegistration registration) { * * @throws IllegalArgumentException thrown if the instance is not valid. */ - @Override public void validate() { - super.validate(); - if (innerProperties() != null) { - innerProperties().validate(); + if (registration() != null) { + registration().validate(); } } }