diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/CHANGELOG.md b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/CHANGELOG.md index 3c3705fa8e0c..1c52216f2b9e 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/CHANGELOG.md +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/CHANGELOG.md @@ -1,6 +1,8 @@ # Release History -## 1.0.0-beta.3 (Unreleased) +## 1.0.0-beta.1 (2022-05-24) + +- Azure Resource Manager SqlVirtualMachine client library for Java. This package contains Microsoft Azure SDK for SqlVirtualMachine Management SDK. The SQL virtual machine management API provides a RESTful set of web APIs that interact with Azure Compute, Network & Storage services to manage your SQL Server virtual machine. The API enables users to create, delete and retrieve a SQL virtual machine, SQL virtual machine group or availability group listener. Package tag package-preview-2021-11. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt). ### Features Added diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/README.md b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/README.md index 5de0f82cc7c9..29842a4b90db 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/README.md +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/README.md @@ -32,7 +32,7 @@ Various documentation is available to help you get started com.azure.resourcemanager azure-resourcemanager-sqlvirtualmachine - 1.0.0-beta.2 + 1.0.0-beta.3 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/SAMPLE.md b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/SAMPLE.md index 633760ff8f4e..2fbf351ee9d1 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/SAMPLE.md +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/SAMPLE.md @@ -353,13 +353,14 @@ public final class SqlVirtualMachineGroupsUpdateSamples { ```java import com.azure.resourcemanager.sqlvirtualmachine.models.AdditionalFeaturesServerConfigurations; +import com.azure.resourcemanager.sqlvirtualmachine.models.AssessmentDayOfWeek; import com.azure.resourcemanager.sqlvirtualmachine.models.AssessmentSettings; +import com.azure.resourcemanager.sqlvirtualmachine.models.AutoBackupDaysOfWeek; import com.azure.resourcemanager.sqlvirtualmachine.models.AutoBackupSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.AutoPatchingSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.BackupScheduleType; import com.azure.resourcemanager.sqlvirtualmachine.models.ConnectivityType; import com.azure.resourcemanager.sqlvirtualmachine.models.DayOfWeek; -import com.azure.resourcemanager.sqlvirtualmachine.models.DaysOfWeek; import com.azure.resourcemanager.sqlvirtualmachine.models.DiskConfigurationType; import com.azure.resourcemanager.sqlvirtualmachine.models.FullBackupFrequencyType; import com.azure.resourcemanager.sqlvirtualmachine.models.KeyVaultCredentialSettings; @@ -473,7 +474,7 @@ public final class SqlVirtualMachinesCreateOrUpdateSamples { .withBackupSystemDbs(true) .withBackupScheduleType(BackupScheduleType.MANUAL) .withFullBackupFrequency(FullBackupFrequencyType.WEEKLY) - .withDaysOfWeek(Arrays.asList(DaysOfWeek.MONDAY, DaysOfWeek.FRIDAY)) + .withDaysOfWeek(Arrays.asList(AutoBackupDaysOfWeek.MONDAY, AutoBackupDaysOfWeek.FRIDAY)) .withFullBackupStartTime(6) .withFullBackupWindowHours(11) .withLogBackupFrequency(10)) @@ -611,7 +612,7 @@ public final class SqlVirtualMachinesCreateOrUpdateSamples { new Schedule() .withEnable(true) .withWeeklyInterval(1) - .withDayOfWeek(DayOfWeek.SUNDAY) + .withDayOfWeek(AssessmentDayOfWeek.SUNDAY) .withStartTime("23:17"))) .create(); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/SqlVirtualMachineManager.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/SqlVirtualMachineManager.java index 95f09977ae6b..244d403d814a 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/SqlVirtualMachineManager.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/SqlVirtualMachineManager.java @@ -10,11 +10,13 @@ import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.HttpPipelinePosition; import com.azure.core.http.policy.AddDatePolicy; +import com.azure.core.http.policy.AddHeadersFromContextPolicy; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.http.policy.HttpLoggingPolicy; import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.http.policy.HttpPolicyProviders; import com.azure.core.http.policy.RequestIdPolicy; +import com.azure.core.http.policy.RetryOptions; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy; @@ -80,6 +82,19 @@ public static SqlVirtualMachineManager authenticate(TokenCredential credential, return configure().authenticate(credential, profile); } + /** + * Creates an instance of SqlVirtualMachine service API entry point. + * + * @param httpPipeline the {@link HttpPipeline} configured with Azure authentication credential. + * @param profile the Azure profile for client. + * @return the SqlVirtualMachine service API instance. + */ + public static SqlVirtualMachineManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { + Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null."); + Objects.requireNonNull(profile, "'profile' cannot be null."); + return new SqlVirtualMachineManager(httpPipeline, profile, null); + } + /** * Gets a Configurable instance that can be used to create SqlVirtualMachineManager with optional configuration. * @@ -91,13 +106,14 @@ public static Configurable configure() { /** The Configurable allowing configurations to be set. */ public static final class Configurable { - private final ClientLogger logger = new ClientLogger(Configurable.class); + private static final ClientLogger LOGGER = new ClientLogger(Configurable.class); private HttpClient httpClient; private HttpLogOptions httpLogOptions; private final List policies = new ArrayList<>(); private final List scopes = new ArrayList<>(); private RetryPolicy retryPolicy; + private RetryOptions retryOptions; private Duration defaultPollInterval; private Configurable() { @@ -158,6 +174,19 @@ public Configurable withRetryPolicy(RetryPolicy retryPolicy) { return this; } + /** + * Sets the retry options for the HTTP pipeline retry policy. + * + *

This setting has no effect, if retry policy is set via {@link #withRetryPolicy(RetryPolicy)}. + * + * @param retryOptions the retry options for the HTTP pipeline retry policy. + * @return the configurable object itself. + */ + public Configurable withRetryOptions(RetryOptions retryOptions) { + this.retryOptions = Objects.requireNonNull(retryOptions, "'retryOptions' cannot be null."); + return this; + } + /** * Sets the default poll interval, used when service does not provide "Retry-After" header. * @@ -165,9 +194,11 @@ public Configurable withRetryPolicy(RetryPolicy retryPolicy) { * @return the configurable object itself. */ public Configurable withDefaultPollInterval(Duration defaultPollInterval) { - this.defaultPollInterval = Objects.requireNonNull(defaultPollInterval, "'retryPolicy' cannot be null."); + this.defaultPollInterval = + Objects.requireNonNull(defaultPollInterval, "'defaultPollInterval' cannot be null."); if (this.defaultPollInterval.isNegative()) { - throw logger.logExceptionAsError(new IllegalArgumentException("'httpPipeline' cannot be negative")); + throw LOGGER + .logExceptionAsError(new IllegalArgumentException("'defaultPollInterval' cannot be negative")); } return this; } @@ -189,7 +220,7 @@ public SqlVirtualMachineManager authenticate(TokenCredential credential, AzurePr .append("-") .append("com.azure.resourcemanager.sqlvirtualmachine") .append("/") - .append("1.0.0-beta.2"); + .append("1.0.0-beta.1"); if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) { userAgentBuilder .append(" (") @@ -207,10 +238,15 @@ public SqlVirtualMachineManager authenticate(TokenCredential credential, AzurePr scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default"); } if (retryPolicy == null) { - retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS); + if (retryOptions != null) { + retryPolicy = new RetryPolicy(retryOptions); + } else { + retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS); + } } List policies = new ArrayList<>(); policies.add(new UserAgentPolicy(userAgentBuilder.toString())); + policies.add(new AddHeadersFromContextPolicy()); policies.add(new RequestIdPolicy()); policies .addAll( @@ -241,7 +277,11 @@ public SqlVirtualMachineManager authenticate(TokenCredential credential, AzurePr } } - /** @return Resource collection API of AvailabilityGroupListeners. */ + /** + * Gets the resource collection API of AvailabilityGroupListeners. It manages AvailabilityGroupListener. + * + * @return Resource collection API of AvailabilityGroupListeners. + */ public AvailabilityGroupListeners availabilityGroupListeners() { if (this.availabilityGroupListeners == null) { this.availabilityGroupListeners = @@ -250,7 +290,11 @@ public AvailabilityGroupListeners availabilityGroupListeners() { return availabilityGroupListeners; } - /** @return Resource collection API of Operations. */ + /** + * Gets the resource collection API of Operations. + * + * @return Resource collection API of Operations. + */ public Operations operations() { if (this.operations == null) { this.operations = new OperationsImpl(clientObject.getOperations(), this); @@ -258,7 +302,11 @@ public Operations operations() { return operations; } - /** @return Resource collection API of SqlVirtualMachineGroups. */ + /** + * Gets the resource collection API of SqlVirtualMachineGroups. It manages SqlVirtualMachineGroup. + * + * @return Resource collection API of SqlVirtualMachineGroups. + */ public SqlVirtualMachineGroups sqlVirtualMachineGroups() { if (this.sqlVirtualMachineGroups == null) { this.sqlVirtualMachineGroups = @@ -267,7 +315,11 @@ public SqlVirtualMachineGroups sqlVirtualMachineGroups() { return sqlVirtualMachineGroups; } - /** @return Resource collection API of SqlVirtualMachines. */ + /** + * Gets the resource collection API of SqlVirtualMachines. It manages SqlVirtualMachine. + * + * @return Resource collection API of SqlVirtualMachines. + */ public SqlVirtualMachines sqlVirtualMachines() { if (this.sqlVirtualMachines == null) { this.sqlVirtualMachines = new SqlVirtualMachinesImpl(clientObject.getSqlVirtualMachines(), this); diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerInner.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerInner.java index db15c49ec319..16b10b406a19 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerInner.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerInner.java @@ -7,18 +7,14 @@ import com.azure.core.annotation.Fluent; import com.azure.core.management.ProxyResource; import com.azure.core.management.SystemData; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.models.AgConfiguration; import com.azure.resourcemanager.sqlvirtualmachine.models.LoadBalancerConfiguration; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** A SQL Server availability group listener. */ @Fluent public final class AvailabilityGroupListenerInner extends ProxyResource { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AvailabilityGroupListenerInner.class); - /* * Resource properties. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerProperties.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerProperties.java index ef8f4ad9abc6..344487084155 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerProperties.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerProperties.java @@ -5,18 +5,14 @@ package com.azure.resourcemanager.sqlvirtualmachine.fluent.models; import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.models.AgConfiguration; import com.azure.resourcemanager.sqlvirtualmachine.models.LoadBalancerConfiguration; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** The properties of an availability group listener. */ @Fluent public final class AvailabilityGroupListenerProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AvailabilityGroupListenerProperties.class); - /* * Provisioning state to track the async operation status. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/OperationInner.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/OperationInner.java index b7eb2ffbc9f5..267e4b8899bd 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/OperationInner.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/OperationInner.java @@ -5,10 +5,8 @@ package com.azure.resourcemanager.sqlvirtualmachine.fluent.models; import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.models.OperationDisplay; import com.azure.resourcemanager.sqlvirtualmachine.models.OperationOrigin; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; @@ -16,8 +14,6 @@ /** SQL REST API operation definition. */ @Immutable public final class OperationInner { - @JsonIgnore private final ClientLogger logger = new ClientLogger(OperationInner.class); - /* * The name of the operation being performed on this particular object. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupInner.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupInner.java index 1cbca3acb829..6de89bd0c301 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupInner.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupInner.java @@ -7,21 +7,17 @@ import com.azure.core.annotation.Fluent; import com.azure.core.management.Resource; import com.azure.core.management.SystemData; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.models.ClusterConfiguration; import com.azure.resourcemanager.sqlvirtualmachine.models.ClusterManagerType; import com.azure.resourcemanager.sqlvirtualmachine.models.ScaleType; import com.azure.resourcemanager.sqlvirtualmachine.models.SqlVmGroupImageSku; import com.azure.resourcemanager.sqlvirtualmachine.models.WsfcDomainProfile; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; /** A SQL virtual machine group. */ @Fluent public final class SqlVirtualMachineGroupInner extends Resource { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineGroupInner.class); - /* * Resource properties. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupProperties.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupProperties.java index 3294061efdc2..1c62132e443d 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupProperties.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupProperties.java @@ -5,20 +5,16 @@ package com.azure.resourcemanager.sqlvirtualmachine.fluent.models; import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.models.ClusterConfiguration; import com.azure.resourcemanager.sqlvirtualmachine.models.ClusterManagerType; import com.azure.resourcemanager.sqlvirtualmachine.models.ScaleType; import com.azure.resourcemanager.sqlvirtualmachine.models.SqlVmGroupImageSku; import com.azure.resourcemanager.sqlvirtualmachine.models.WsfcDomainProfile; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The properties of a SQL virtual machine group. */ @Fluent public final class SqlVirtualMachineGroupProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineGroupProperties.class); - /* * Provisioning state to track the async operation status. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineInner.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineInner.java index eac89001ab04..e70c5c4eb63d 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineInner.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineInner.java @@ -7,7 +7,6 @@ import com.azure.core.annotation.Fluent; import com.azure.core.management.Resource; import com.azure.core.management.SystemData; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.models.AssessmentSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.AutoBackupSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.AutoPatchingSettings; @@ -19,15 +18,12 @@ import com.azure.resourcemanager.sqlvirtualmachine.models.SqlServerLicenseType; import com.azure.resourcemanager.sqlvirtualmachine.models.StorageConfigurationSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.WsfcDomainCredentials; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; /** A SQL virtual machine. */ @Fluent public final class SqlVirtualMachineInner extends Resource { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineInner.class); - /* * Azure Active Directory identity of the server. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineProperties.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineProperties.java index 070f5c530dcc..7ff46a358765 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineProperties.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineProperties.java @@ -5,7 +5,6 @@ package com.azure.resourcemanager.sqlvirtualmachine.fluent.models; import com.azure.core.annotation.Fluent; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.models.AssessmentSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.AutoBackupSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.AutoPatchingSettings; @@ -16,14 +15,11 @@ import com.azure.resourcemanager.sqlvirtualmachine.models.SqlServerLicenseType; import com.azure.resourcemanager.sqlvirtualmachine.models.StorageConfigurationSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.WsfcDomainCredentials; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** The SQL virtual machine properties. */ @Fluent public final class SqlVirtualMachineProperties { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineProperties.class); - /* * ARM Resource id of underlying virtual machine created from SQL * marketplace image. diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenerImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenerImpl.java index d531bd7e371e..65b60a6fdc52 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenerImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenerImpl.java @@ -64,6 +64,10 @@ public AgConfiguration availabilityGroupConfiguration() { return this.innerModel().availabilityGroupConfiguration(); } + public String resourceGroupName() { + return resourceGroupName; + } + public AvailabilityGroupListenerInner innerModel() { return this.innerObject; } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenersClientImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenersClientImpl.java index e6e36ddc54f5..67b47220a511 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenersClientImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenersClientImpl.java @@ -29,7 +29,6 @@ import com.azure.core.management.polling.PollResult; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.polling.PollerFlux; import com.azure.core.util.polling.SyncPoller; import com.azure.resourcemanager.sqlvirtualmachine.fluent.AvailabilityGroupListenersClient; @@ -41,8 +40,6 @@ /** An instance of this class provides access to all the operations defined in AvailabilityGroupListenersClient. */ public final class AvailabilityGroupListenersClientImpl implements AvailabilityGroupListenersClient { - private final ClientLogger logger = new ClientLogger(AvailabilityGroupListenersClientImpl.class); - /** The proxy service used to perform REST calls. */ private final AvailabilityGroupListenersService service; @@ -297,14 +294,7 @@ private Mono getAsync( String expand) { return getWithResponseAsync( resourceGroupName, sqlVirtualMachineGroupName, availabilityGroupListenerName, expand) - .flatMap( - (Response res) -> { - if (res.getValue() != null) { - return Mono.just(res.getValue()); - } else { - return Mono.empty(); - } - }); + .flatMap(res -> Mono.justOrEmpty(res.getValue())); } /** @@ -325,14 +315,7 @@ private Mono getAsync( final String expand = null; return getWithResponseAsync( resourceGroupName, sqlVirtualMachineGroupName, availabilityGroupListenerName, expand) - .flatMap( - (Response res) -> { - if (res.getValue() != null) { - return Mono.just(res.getValue()); - } else { - return Mono.empty(); - } - }); + .flatMap(res -> Mono.justOrEmpty(res.getValue())); } /** diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenersImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenersImpl.java index e5e356e32b5b..348217a3a979 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenersImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/AvailabilityGroupListenersImpl.java @@ -13,10 +13,9 @@ import com.azure.resourcemanager.sqlvirtualmachine.fluent.models.AvailabilityGroupListenerInner; import com.azure.resourcemanager.sqlvirtualmachine.models.AvailabilityGroupListener; import com.azure.resourcemanager.sqlvirtualmachine.models.AvailabilityGroupListeners; -import com.fasterxml.jackson.annotation.JsonIgnore; public final class AvailabilityGroupListenersImpl implements AvailabilityGroupListeners { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AvailabilityGroupListenersImpl.class); + private static final ClientLogger LOGGER = new ClientLogger(AvailabilityGroupListenersImpl.class); private final AvailabilityGroupListenersClient innerClient; @@ -94,7 +93,7 @@ public PagedIterable listByGroup( public AvailabilityGroupListener getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -102,7 +101,7 @@ public AvailabilityGroupListener getById(String id) { } String sqlVirtualMachineGroupName = Utils.getValueFromIdByName(id, "sqlVirtualMachineGroups"); if (sqlVirtualMachineGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -112,7 +111,7 @@ public AvailabilityGroupListener getById(String id) { } String availabilityGroupListenerName = Utils.getValueFromIdByName(id, "availabilityGroupListeners"); if (availabilityGroupListenerName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -130,7 +129,7 @@ public AvailabilityGroupListener getById(String id) { public Response getByIdWithResponse(String id, String expand, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -138,7 +137,7 @@ public Response getByIdWithResponse(String id, String } String sqlVirtualMachineGroupName = Utils.getValueFromIdByName(id, "sqlVirtualMachineGroups"); if (sqlVirtualMachineGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -148,7 +147,7 @@ public Response getByIdWithResponse(String id, String } String availabilityGroupListenerName = Utils.getValueFromIdByName(id, "availabilityGroupListeners"); if (availabilityGroupListenerName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -164,7 +163,7 @@ public Response getByIdWithResponse(String id, String public void deleteById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -172,7 +171,7 @@ public void deleteById(String id) { } String sqlVirtualMachineGroupName = Utils.getValueFromIdByName(id, "sqlVirtualMachineGroups"); if (sqlVirtualMachineGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -182,7 +181,7 @@ public void deleteById(String id) { } String availabilityGroupListenerName = Utils.getValueFromIdByName(id, "availabilityGroupListeners"); if (availabilityGroupListenerName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -196,7 +195,7 @@ public void deleteById(String id) { public void deleteByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -204,7 +203,7 @@ public void deleteByIdWithResponse(String id, Context context) { } String sqlVirtualMachineGroupName = Utils.getValueFromIdByName(id, "sqlVirtualMachineGroups"); if (sqlVirtualMachineGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -214,7 +213,7 @@ public void deleteByIdWithResponse(String id, Context context) { } String availabilityGroupListenerName = Utils.getValueFromIdByName(id, "availabilityGroupListeners"); if (availabilityGroupListenerName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/OperationsClientImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/OperationsClientImpl.java index c1ca667f2fab..6c1fe43e52b5 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/OperationsClientImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/OperationsClientImpl.java @@ -25,7 +25,6 @@ import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.fluent.OperationsClient; import com.azure.resourcemanager.sqlvirtualmachine.fluent.models.OperationInner; import com.azure.resourcemanager.sqlvirtualmachine.models.OperationListResult; @@ -33,8 +32,6 @@ /** An instance of this class provides access to all the operations defined in OperationsClient. */ public final class OperationsClientImpl implements OperationsClient { - private final ClientLogger logger = new ClientLogger(OperationsClientImpl.class); - /** The proxy service used to perform REST calls. */ private final OperationsService service; diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/OperationsImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/OperationsImpl.java index ced421e7130e..56f4eece132d 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/OperationsImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/OperationsImpl.java @@ -11,10 +11,9 @@ import com.azure.resourcemanager.sqlvirtualmachine.fluent.models.OperationInner; import com.azure.resourcemanager.sqlvirtualmachine.models.Operation; import com.azure.resourcemanager.sqlvirtualmachine.models.Operations; -import com.fasterxml.jackson.annotation.JsonIgnore; public final class OperationsImpl implements Operations { - @JsonIgnore private final ClientLogger logger = new ClientLogger(OperationsImpl.class); + private static final ClientLogger LOGGER = new ClientLogger(OperationsImpl.class); private final OperationsClient innerClient; diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupImpl.java index 3ac75bfb76ea..2bbf72f5253d 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupImpl.java @@ -89,6 +89,10 @@ public String regionName() { return this.location(); } + public String resourceGroupName() { + return resourceGroupName; + } + public SqlVirtualMachineGroupInner innerModel() { return this.innerObject; } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupsClientImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupsClientImpl.java index cee813883adc..3a2129dcf6e8 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupsClientImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupsClientImpl.java @@ -30,7 +30,6 @@ import com.azure.core.management.polling.PollResult; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.polling.PollerFlux; import com.azure.core.util.polling.SyncPoller; import com.azure.resourcemanager.sqlvirtualmachine.fluent.SqlVirtualMachineGroupsClient; @@ -43,8 +42,6 @@ /** An instance of this class provides access to all the operations defined in SqlVirtualMachineGroupsClient. */ public final class SqlVirtualMachineGroupsClientImpl implements SqlVirtualMachineGroupsClient { - private final ClientLogger logger = new ClientLogger(SqlVirtualMachineGroupsClientImpl.class); - /** The proxy service used to perform REST calls. */ private final SqlVirtualMachineGroupsService service; @@ -294,14 +291,7 @@ private Mono> getByResourceGroupWithRespon private Mono getByResourceGroupAsync( String resourceGroupName, String sqlVirtualMachineGroupName) { return getByResourceGroupWithResponseAsync(resourceGroupName, sqlVirtualMachineGroupName) - .flatMap( - (Response res) -> { - if (res.getValue() != null) { - return Mono.just(res.getValue()); - } else { - return Mono.empty(); - } - }); + .flatMap(res -> Mono.justOrEmpty(res.getValue())); } /** diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupsImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupsImpl.java index a8fe079458c6..8710adb16f0d 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupsImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineGroupsImpl.java @@ -13,10 +13,9 @@ import com.azure.resourcemanager.sqlvirtualmachine.fluent.models.SqlVirtualMachineGroupInner; import com.azure.resourcemanager.sqlvirtualmachine.models.SqlVirtualMachineGroup; import com.azure.resourcemanager.sqlvirtualmachine.models.SqlVirtualMachineGroups; -import com.fasterxml.jackson.annotation.JsonIgnore; public final class SqlVirtualMachineGroupsImpl implements SqlVirtualMachineGroups { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineGroupsImpl.class); + private static final ClientLogger LOGGER = new ClientLogger(SqlVirtualMachineGroupsImpl.class); private final SqlVirtualMachineGroupsClient innerClient; @@ -86,7 +85,7 @@ public PagedIterable list(Context context) { public SqlVirtualMachineGroup getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -94,7 +93,7 @@ public SqlVirtualMachineGroup getById(String id) { } String sqlVirtualMachineGroupName = Utils.getValueFromIdByName(id, "sqlVirtualMachineGroups"); if (sqlVirtualMachineGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -110,7 +109,7 @@ public SqlVirtualMachineGroup getById(String id) { public Response getByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -118,7 +117,7 @@ public Response getByIdWithResponse(String id, Context c } String sqlVirtualMachineGroupName = Utils.getValueFromIdByName(id, "sqlVirtualMachineGroups"); if (sqlVirtualMachineGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -132,7 +131,7 @@ public Response getByIdWithResponse(String id, Context c public void deleteById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -140,7 +139,7 @@ public void deleteById(String id) { } String sqlVirtualMachineGroupName = Utils.getValueFromIdByName(id, "sqlVirtualMachineGroups"); if (sqlVirtualMachineGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -154,7 +153,7 @@ public void deleteById(String id) { public void deleteByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -162,7 +161,7 @@ public void deleteByIdWithResponse(String id, Context context) { } String sqlVirtualMachineGroupName = Utils.getValueFromIdByName(id, "sqlVirtualMachineGroups"); if (sqlVirtualMachineGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineImpl.java index cf033a8ba051..8d82128ee495 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineImpl.java @@ -127,6 +127,10 @@ public String regionName() { return this.location(); } + public String resourceGroupName() { + return resourceGroupName; + } + public SqlVirtualMachineInner innerModel() { return this.innerObject; } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineManagementClientBuilder.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineManagementClientBuilder.java index ce28dcb23162..4e5bbcb1f96a 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineManagementClientBuilder.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineManagementClientBuilder.java @@ -7,7 +7,6 @@ import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.policy.CookiePolicy; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; import com.azure.core.management.AzureEnvironment; @@ -67,34 +66,34 @@ public SqlVirtualMachineManagementClientBuilder environment(AzureEnvironment env } /* - * The default poll interval for long-running operation + * The HTTP pipeline to send requests through */ - private Duration defaultPollInterval; + private HttpPipeline pipeline; /** - * Sets The default poll interval for long-running operation. + * Sets The HTTP pipeline to send requests through. * - * @param defaultPollInterval the defaultPollInterval value. + * @param pipeline the pipeline value. * @return the SqlVirtualMachineManagementClientBuilder. */ - public SqlVirtualMachineManagementClientBuilder defaultPollInterval(Duration defaultPollInterval) { - this.defaultPollInterval = defaultPollInterval; + public SqlVirtualMachineManagementClientBuilder pipeline(HttpPipeline pipeline) { + this.pipeline = pipeline; return this; } /* - * The HTTP pipeline to send requests through + * The default poll interval for long-running operation */ - private HttpPipeline pipeline; + private Duration defaultPollInterval; /** - * Sets The HTTP pipeline to send requests through. + * Sets The default poll interval for long-running operation. * - * @param pipeline the pipeline value. + * @param defaultPollInterval the defaultPollInterval value. * @return the SqlVirtualMachineManagementClientBuilder. */ - public SqlVirtualMachineManagementClientBuilder pipeline(HttpPipeline pipeline) { - this.pipeline = pipeline; + public SqlVirtualMachineManagementClientBuilder defaultPollInterval(Duration defaultPollInterval) { + this.defaultPollInterval = defaultPollInterval; return this; } @@ -126,15 +125,12 @@ public SqlVirtualMachineManagementClientImpl buildClient() { if (environment == null) { this.environment = AzureEnvironment.AZURE; } + if (pipeline == null) { + this.pipeline = new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(); + } if (defaultPollInterval == null) { this.defaultPollInterval = Duration.ofSeconds(30); } - if (pipeline == null) { - this.pipeline = - new HttpPipelineBuilder() - .policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy()) - .build(); - } if (serializerAdapter == null) { this.serializerAdapter = SerializerFactory.createDefaultManagementSerializerAdapter(); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineManagementClientImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineManagementClientImpl.java index b8333e94a48b..dd2128bfbec8 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineManagementClientImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachineManagementClientImpl.java @@ -15,6 +15,7 @@ import com.azure.core.management.polling.PollResult; import com.azure.core.management.polling.PollerFactory; import com.azure.core.util.Context; +import com.azure.core.util.CoreUtils; import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.polling.AsyncPollResponse; import com.azure.core.util.polling.LongRunningOperationStatus; @@ -32,15 +33,12 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.Map; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; /** Initializes a new instance of the SqlVirtualMachineManagementClientImpl type. */ @ServiceClient(builder = SqlVirtualMachineManagementClientBuilder.class) public final class SqlVirtualMachineManagementClientImpl implements SqlVirtualMachineManagementClient { - private final ClientLogger logger = new ClientLogger(SqlVirtualMachineManagementClientImpl.class); - /** Subscription ID that identifies an Azure subscription. */ private final String subscriptionId; @@ -206,10 +204,7 @@ public Context getContext() { * @return the merged context. */ public Context mergeContext(Context context) { - for (Map.Entry entry : this.getContext().getValues().entrySet()) { - context = context.addData(entry.getKey(), entry.getValue()); - } - return context; + return CoreUtils.mergeContexts(this.getContext(), context); } /** @@ -273,7 +268,7 @@ public Mono getLroFinalResultOrError(AsyncPollResponse, managementError = null; } } catch (IOException | RuntimeException ioe) { - logger.logThrowableAsWarning(ioe); + LOGGER.logThrowableAsWarning(ioe); } } } else { @@ -332,4 +327,6 @@ public Mono getBodyAsString(Charset charset) { return Mono.just(new String(responseBody, charset)); } } + + private static final ClientLogger LOGGER = new ClientLogger(SqlVirtualMachineManagementClientImpl.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachinesClientImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachinesClientImpl.java index c415ca57398a..5886c7e45b46 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachinesClientImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachinesClientImpl.java @@ -31,7 +31,6 @@ import com.azure.core.management.polling.PollResult; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.polling.PollerFlux; import com.azure.core.util.polling.SyncPoller; import com.azure.resourcemanager.sqlvirtualmachine.fluent.SqlVirtualMachinesClient; @@ -44,8 +43,6 @@ /** An instance of this class provides access to all the operations defined in SqlVirtualMachinesClient. */ public final class SqlVirtualMachinesClientImpl implements SqlVirtualMachinesClient { - private final ClientLogger logger = new ClientLogger(SqlVirtualMachinesClientImpl.class); - /** The proxy service used to perform REST calls. */ private final SqlVirtualMachinesService service; @@ -931,14 +928,7 @@ private Mono> getByResourceGroupWithResponseAsy private Mono getByResourceGroupAsync( String resourceGroupName, String sqlVirtualMachineName, String expand) { return getByResourceGroupWithResponseAsync(resourceGroupName, sqlVirtualMachineName, expand) - .flatMap( - (Response res) -> { - if (res.getValue() != null) { - return Mono.just(res.getValue()); - } else { - return Mono.empty(); - } - }); + .flatMap(res -> Mono.justOrEmpty(res.getValue())); } /** @@ -957,14 +947,7 @@ private Mono getByResourceGroupAsync( String resourceGroupName, String sqlVirtualMachineName) { final String expand = null; return getByResourceGroupWithResponseAsync(resourceGroupName, sqlVirtualMachineName, expand) - .flatMap( - (Response res) -> { - if (res.getValue() != null) { - return Mono.just(res.getValue()); - } else { - return Mono.empty(); - } - }); + .flatMap(res -> Mono.justOrEmpty(res.getValue())); } /** diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachinesImpl.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachinesImpl.java index 5125e2a7e525..0d2740a0d491 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachinesImpl.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/implementation/SqlVirtualMachinesImpl.java @@ -13,10 +13,9 @@ import com.azure.resourcemanager.sqlvirtualmachine.fluent.models.SqlVirtualMachineInner; import com.azure.resourcemanager.sqlvirtualmachine.models.SqlVirtualMachine; import com.azure.resourcemanager.sqlvirtualmachine.models.SqlVirtualMachines; -import com.fasterxml.jackson.annotation.JsonIgnore; public final class SqlVirtualMachinesImpl implements SqlVirtualMachines { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachinesImpl.class); + private static final ClientLogger LOGGER = new ClientLogger(SqlVirtualMachinesImpl.class); private final SqlVirtualMachinesClient innerClient; @@ -118,7 +117,7 @@ public void startAssessment(String resourceGroupName, String sqlVirtualMachineNa public SqlVirtualMachine getById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -126,7 +125,7 @@ public SqlVirtualMachine getById(String id) { } String sqlVirtualMachineName = Utils.getValueFromIdByName(id, "sqlVirtualMachines"); if (sqlVirtualMachineName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -142,7 +141,7 @@ public SqlVirtualMachine getById(String id) { public Response getByIdWithResponse(String id, String expand, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -150,7 +149,7 @@ public Response getByIdWithResponse(String id, String expand, } String sqlVirtualMachineName = Utils.getValueFromIdByName(id, "sqlVirtualMachines"); if (sqlVirtualMachineName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -163,7 +162,7 @@ public Response getByIdWithResponse(String id, String expand, public void deleteById(String id) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -171,7 +170,7 @@ public void deleteById(String id) { } String sqlVirtualMachineName = Utils.getValueFromIdByName(id, "sqlVirtualMachines"); if (sqlVirtualMachineName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -184,7 +183,7 @@ public void deleteById(String id) { public void deleteByIdWithResponse(String id, Context context) { String resourceGroupName = Utils.getValueFromIdByName(id, "resourceGroups"); if (resourceGroupName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String @@ -192,7 +191,7 @@ public void deleteByIdWithResponse(String id, Context context) { } String sqlVirtualMachineName = Utils.getValueFromIdByName(id, "sqlVirtualMachines"); if (sqlVirtualMachineName == null) { - throw logger + throw LOGGER .logExceptionAsError( new IllegalArgumentException( String diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AdditionalFeaturesServerConfigurations.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AdditionalFeaturesServerConfigurations.java index ea807f2cd127..ec3937d99f89 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AdditionalFeaturesServerConfigurations.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AdditionalFeaturesServerConfigurations.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Additional SQL Server feature settings. */ @Fluent public final class AdditionalFeaturesServerConfigurations { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AdditionalFeaturesServerConfigurations.class); - /* * Enable or disable R services (SQL 2016 onwards). */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AgConfiguration.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AgConfiguration.java index 2457a21efe5f..0f9ee713e78b 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AgConfiguration.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AgConfiguration.java @@ -5,16 +5,12 @@ package com.azure.resourcemanager.sqlvirtualmachine.models; import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** Availability group configuration. */ @Immutable public final class AgConfiguration { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AgConfiguration.class); - /* * Replica configurations. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AgReplica.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AgReplica.java index 8a82a3fd634a..d9f193eedb37 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AgReplica.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AgReplica.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Availability group replica configuration. */ @Fluent public final class AgReplica { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AgReplica.class); - /* * Sql VirtualMachine Instance Id. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AssessmentDayOfWeek.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AssessmentDayOfWeek.java new file mode 100644 index 000000000000..da7332f5e55d --- /dev/null +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AssessmentDayOfWeek.java @@ -0,0 +1,62 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.sqlvirtualmachine.models; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** Defines values for AssessmentDayOfWeek. */ +public enum AssessmentDayOfWeek { + /** Enum value Monday. */ + MONDAY("Monday"), + + /** Enum value Tuesday. */ + TUESDAY("Tuesday"), + + /** Enum value Wednesday. */ + WEDNESDAY("Wednesday"), + + /** Enum value Thursday. */ + THURSDAY("Thursday"), + + /** Enum value Friday. */ + FRIDAY("Friday"), + + /** Enum value Saturday. */ + SATURDAY("Saturday"), + + /** Enum value Sunday. */ + SUNDAY("Sunday"); + + /** The actual serialized value for a AssessmentDayOfWeek instance. */ + private final String value; + + AssessmentDayOfWeek(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a AssessmentDayOfWeek instance. + * + * @param value the serialized value to parse. + * @return the parsed AssessmentDayOfWeek object, or null if unable to parse. + */ + @JsonCreator + public static AssessmentDayOfWeek fromString(String value) { + AssessmentDayOfWeek[] items = AssessmentDayOfWeek.values(); + for (AssessmentDayOfWeek item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + @JsonValue + @Override + public String toString() { + return this.value; + } +} diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AssessmentSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AssessmentSettings.java index ea25d5753c3b..b35222327edf 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AssessmentSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AssessmentSettings.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Configure assessment for databases in your SQL virtual machine. */ @Fluent public final class AssessmentSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AssessmentSettings.class); - /* * Enable or disable assessment feature on SQL virtual machine. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoBackupDaysOfWeek.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoBackupDaysOfWeek.java new file mode 100644 index 000000000000..f851760972ea --- /dev/null +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoBackupDaysOfWeek.java @@ -0,0 +1,53 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.sqlvirtualmachine.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for AutoBackupDaysOfWeek. */ +public final class AutoBackupDaysOfWeek extends ExpandableStringEnum { + /** Static value Monday for AutoBackupDaysOfWeek. */ + public static final AutoBackupDaysOfWeek MONDAY = fromString("Monday"); + + /** Static value Tuesday for AutoBackupDaysOfWeek. */ + public static final AutoBackupDaysOfWeek TUESDAY = fromString("Tuesday"); + + /** Static value Wednesday for AutoBackupDaysOfWeek. */ + public static final AutoBackupDaysOfWeek WEDNESDAY = fromString("Wednesday"); + + /** Static value Thursday for AutoBackupDaysOfWeek. */ + public static final AutoBackupDaysOfWeek THURSDAY = fromString("Thursday"); + + /** Static value Friday for AutoBackupDaysOfWeek. */ + public static final AutoBackupDaysOfWeek FRIDAY = fromString("Friday"); + + /** Static value Saturday for AutoBackupDaysOfWeek. */ + public static final AutoBackupDaysOfWeek SATURDAY = fromString("Saturday"); + + /** Static value Sunday for AutoBackupDaysOfWeek. */ + public static final AutoBackupDaysOfWeek SUNDAY = fromString("Sunday"); + + /** + * Creates or finds a AutoBackupDaysOfWeek from its string representation. + * + * @param name a name to look for. + * @return the corresponding AutoBackupDaysOfWeek. + */ + @JsonCreator + public static AutoBackupDaysOfWeek fromString(String name) { + return fromString(name, AutoBackupDaysOfWeek.class); + } + + /** + * Gets known AutoBackupDaysOfWeek values. + * + * @return known AutoBackupDaysOfWeek values. + */ + public static Collection values() { + return values(AutoBackupDaysOfWeek.class); + } +} diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoBackupSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoBackupSettings.java index 4f3341d6938e..4430e3153d2e 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoBackupSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoBackupSettings.java @@ -5,16 +5,12 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Configure backups for databases in your SQL virtual machine. */ @Fluent public final class AutoBackupSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AutoBackupSettings.class); - /* * Enable or disable autobackup on SQL virtual machine. */ @@ -81,7 +77,7 @@ public final class AutoBackupSettings { * Weekly. */ @JsonProperty(value = "daysOfWeek") - private List daysOfWeek; + private List daysOfWeek; /* * Start time of a given day during which full backups can take place. 0-23 @@ -310,7 +306,7 @@ public AutoBackupSettings withFullBackupFrequency(FullBackupFrequencyType fullBa * * @return the daysOfWeek value. */ - public List daysOfWeek() { + public List daysOfWeek() { return this.daysOfWeek; } @@ -320,7 +316,7 @@ public List daysOfWeek() { * @param daysOfWeek the daysOfWeek value to set. * @return the AutoBackupSettings object itself. */ - public AutoBackupSettings withDaysOfWeek(List daysOfWeek) { + public AutoBackupSettings withDaysOfWeek(List daysOfWeek) { this.daysOfWeek = daysOfWeek; return this; } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoPatchingSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoPatchingSettings.java index ff7c6ac1a2af..cbd0099c2985 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoPatchingSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AutoPatchingSettings.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Set a patching window during which Windows and SQL patches will be applied. */ @Fluent public final class AutoPatchingSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AutoPatchingSettings.class); - /* * Enable or disable autopatching on SQL virtual machine. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AvailabilityGroupListener.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AvailabilityGroupListener.java index d49cf34a4c31..0a75af96ba98 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AvailabilityGroupListener.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AvailabilityGroupListener.java @@ -83,6 +83,13 @@ public interface AvailabilityGroupListener { */ AgConfiguration availabilityGroupConfiguration(); + /** + * Gets the name of the resource group. + * + * @return the name of the resource group. + */ + String resourceGroupName(); + /** * Gets the inner com.azure.resourcemanager.sqlvirtualmachine.fluent.models.AvailabilityGroupListenerInner object. * diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AvailabilityGroupListenerListResult.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AvailabilityGroupListenerListResult.java index 95192ddfdc41..cd5f98be150f 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AvailabilityGroupListenerListResult.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/AvailabilityGroupListenerListResult.java @@ -5,17 +5,13 @@ package com.azure.resourcemanager.sqlvirtualmachine.models; import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.fluent.models.AvailabilityGroupListenerInner; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** A list of availability group listeners. */ @Immutable public final class AvailabilityGroupListenerListResult { - @JsonIgnore private final ClientLogger logger = new ClientLogger(AvailabilityGroupListenerListResult.class); - /* * Array of results. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/BackupScheduleType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/BackupScheduleType.java index 89e078d05b50..0056ec8b285d 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/BackupScheduleType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/BackupScheduleType.java @@ -27,7 +27,11 @@ public static BackupScheduleType fromString(String name) { return fromString(name, BackupScheduleType.class); } - /** @return known BackupScheduleType values. */ + /** + * Gets known BackupScheduleType values. + * + * @return known BackupScheduleType values. + */ public static Collection values() { return values(BackupScheduleType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ClusterConfiguration.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ClusterConfiguration.java index bee2cf37b97f..97318c7924a2 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ClusterConfiguration.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ClusterConfiguration.java @@ -24,7 +24,11 @@ public static ClusterConfiguration fromString(String name) { return fromString(name, ClusterConfiguration.class); } - /** @return known ClusterConfiguration values. */ + /** + * Gets known ClusterConfiguration values. + * + * @return known ClusterConfiguration values. + */ public static Collection values() { return values(ClusterConfiguration.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ClusterManagerType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ClusterManagerType.java index a0a175faa775..c9530ed9fbe9 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ClusterManagerType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ClusterManagerType.java @@ -24,7 +24,11 @@ public static ClusterManagerType fromString(String name) { return fromString(name, ClusterManagerType.class); } - /** @return known ClusterManagerType values. */ + /** + * Gets known ClusterManagerType values. + * + * @return known ClusterManagerType values. + */ public static Collection values() { return values(ClusterManagerType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Commit.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Commit.java index a71c7c303bce..99cb95e83aa5 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Commit.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Commit.java @@ -27,7 +27,11 @@ public static Commit fromString(String name) { return fromString(name, Commit.class); } - /** @return known Commit values. */ + /** + * Gets known Commit values. + * + * @return known Commit values. + */ public static Collection values() { return values(Commit.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ConnectivityType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ConnectivityType.java index 37cb81a8397e..f576670139e1 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ConnectivityType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ConnectivityType.java @@ -30,7 +30,11 @@ public static ConnectivityType fromString(String name) { return fromString(name, ConnectivityType.class); } - /** @return known ConnectivityType values. */ + /** + * Gets known ConnectivityType values. + * + * @return known ConnectivityType values. + */ public static Collection values() { return values(ConnectivityType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DayOfWeek.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DayOfWeek.java index 20f68bc2632f..3b363b75a7ea 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DayOfWeek.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DayOfWeek.java @@ -9,6 +9,9 @@ /** Defines values for DayOfWeek. */ public enum DayOfWeek { + /** Enum value Everyday. */ + EVERYDAY("Everyday"), + /** Enum value Monday. */ MONDAY("Monday"), diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DaysOfWeek.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DaysOfWeek.java deleted file mode 100644 index 6332ebd40578..000000000000 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DaysOfWeek.java +++ /dev/null @@ -1,49 +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.sqlvirtualmachine.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for DaysOfWeek. */ -public final class DaysOfWeek extends ExpandableStringEnum { - /** Static value Monday for DaysOfWeek. */ - public static final DaysOfWeek MONDAY = fromString("Monday"); - - /** Static value Tuesday for DaysOfWeek. */ - public static final DaysOfWeek TUESDAY = fromString("Tuesday"); - - /** Static value Wednesday for DaysOfWeek. */ - public static final DaysOfWeek WEDNESDAY = fromString("Wednesday"); - - /** Static value Thursday for DaysOfWeek. */ - public static final DaysOfWeek THURSDAY = fromString("Thursday"); - - /** Static value Friday for DaysOfWeek. */ - public static final DaysOfWeek FRIDAY = fromString("Friday"); - - /** Static value Saturday for DaysOfWeek. */ - public static final DaysOfWeek SATURDAY = fromString("Saturday"); - - /** Static value Sunday for DaysOfWeek. */ - public static final DaysOfWeek SUNDAY = fromString("Sunday"); - - /** - * Creates or finds a DaysOfWeek from its string representation. - * - * @param name a name to look for. - * @return the corresponding DaysOfWeek. - */ - @JsonCreator - public static DaysOfWeek fromString(String name) { - return fromString(name, DaysOfWeek.class); - } - - /** @return known DaysOfWeek values. */ - public static Collection values() { - return values(DaysOfWeek.class); - } -} diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DiskConfigurationType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DiskConfigurationType.java index 5a6d54993911..524ab1bde79a 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DiskConfigurationType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/DiskConfigurationType.java @@ -30,7 +30,11 @@ public static DiskConfigurationType fromString(String name) { return fromString(name, DiskConfigurationType.class); } - /** @return known DiskConfigurationType values. */ + /** + * Gets known DiskConfigurationType values. + * + * @return known DiskConfigurationType values. + */ public static Collection values() { return values(DiskConfigurationType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Failover.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Failover.java index 634c1314693f..558426ad4c35 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Failover.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Failover.java @@ -27,7 +27,11 @@ public static Failover fromString(String name) { return fromString(name, Failover.class); } - /** @return known Failover values. */ + /** + * Gets known Failover values. + * + * @return known Failover values. + */ public static Collection values() { return values(Failover.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/FullBackupFrequencyType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/FullBackupFrequencyType.java index fa898d61e85f..ff78a472a1f3 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/FullBackupFrequencyType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/FullBackupFrequencyType.java @@ -27,7 +27,11 @@ public static FullBackupFrequencyType fromString(String name) { return fromString(name, FullBackupFrequencyType.class); } - /** @return known FullBackupFrequencyType values. */ + /** + * Gets known FullBackupFrequencyType values. + * + * @return known FullBackupFrequencyType values. + */ public static Collection values() { return values(FullBackupFrequencyType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/IdentityType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/IdentityType.java index 900b7dc9a6df..26c249a59c50 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/IdentityType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/IdentityType.java @@ -27,7 +27,11 @@ public static IdentityType fromString(String name) { return fromString(name, IdentityType.class); } - /** @return known IdentityType values. */ + /** + * Gets known IdentityType values. + * + * @return known IdentityType values. + */ public static Collection values() { return values(IdentityType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/KeyVaultCredentialSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/KeyVaultCredentialSettings.java index d912658efee0..43d6330b2949 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/KeyVaultCredentialSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/KeyVaultCredentialSettings.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Configure your SQL virtual machine to be able to connect to the Azure Key Vault service. */ @Fluent public final class KeyVaultCredentialSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(KeyVaultCredentialSettings.class); - /* * Enable or disable key vault credential setting. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/LoadBalancerConfiguration.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/LoadBalancerConfiguration.java index b78b9f74fcef..805faa2f98ec 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/LoadBalancerConfiguration.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/LoadBalancerConfiguration.java @@ -5,16 +5,12 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** A load balancer configuration for an availability group listener. */ @Fluent public final class LoadBalancerConfiguration { - @JsonIgnore private final ClientLogger logger = new ClientLogger(LoadBalancerConfiguration.class); - /* * Private IP address. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationDisplay.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationDisplay.java index 95e4d44818ae..2a9dd97a98b0 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationDisplay.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationDisplay.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.models; import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** Display metadata associated with the operation. */ @Immutable public final class OperationDisplay { - @JsonIgnore private final ClientLogger logger = new ClientLogger(OperationDisplay.class); - /* * The localized friendly form of the resource provider name. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationListResult.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationListResult.java index 9e5768135235..9f1be4ed49cb 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationListResult.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationListResult.java @@ -5,17 +5,13 @@ package com.azure.resourcemanager.sqlvirtualmachine.models; import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.fluent.models.OperationInner; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** Result of the request to list SQL operations. */ @Immutable public final class OperationListResult { - @JsonIgnore private final ClientLogger logger = new ClientLogger(OperationListResult.class); - /* * Array of results. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationOrigin.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationOrigin.java index d45b4d1d13fa..353902b73fb1 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationOrigin.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/OperationOrigin.java @@ -27,7 +27,11 @@ public static OperationOrigin fromString(String name) { return fromString(name, OperationOrigin.class); } - /** @return known OperationOrigin values. */ + /** + * Gets known OperationOrigin values. + * + * @return known OperationOrigin values. + */ public static Collection values() { return values(OperationOrigin.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/PrivateIpAddress.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/PrivateIpAddress.java index 0e7a115b1a6f..fda692625b20 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/PrivateIpAddress.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/PrivateIpAddress.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** A private IP address bound to the availability group listener. */ @Fluent public final class PrivateIpAddress { - @JsonIgnore private final ClientLogger logger = new ClientLogger(PrivateIpAddress.class); - /* * Private IP address bound to the availability group listener. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ReadableSecondary.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ReadableSecondary.java index 852c255639a5..ff6eda359fb3 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ReadableSecondary.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ReadableSecondary.java @@ -30,7 +30,11 @@ public static ReadableSecondary fromString(String name) { return fromString(name, ReadableSecondary.class); } - /** @return known ReadableSecondary values. */ + /** + * Gets known ReadableSecondary values. + * + * @return known ReadableSecondary values. + */ public static Collection values() { return values(ReadableSecondary.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ResourceIdentity.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ResourceIdentity.java index 0ede322d4411..cdee065c8807 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ResourceIdentity.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ResourceIdentity.java @@ -5,16 +5,12 @@ package com.azure.resourcemanager.sqlvirtualmachine.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.UUID; /** Azure Active Directory identity configuration for a resource. */ @Fluent public class ResourceIdentity { - @JsonIgnore private final ClientLogger logger = new ClientLogger(ResourceIdentity.class); - /* * The Azure Active Directory principal id. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Role.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Role.java index 2dced7199d7c..3d9c796aa426 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Role.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Role.java @@ -27,7 +27,11 @@ public static Role fromString(String name) { return fromString(name, Role.class); } - /** @return known Role values. */ + /** + * Gets known Role values. + * + * @return known Role values. + */ public static Collection values() { return values(Role.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ScaleType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ScaleType.java index 2b9eacd7de4f..d848dacc742a 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ScaleType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ScaleType.java @@ -24,7 +24,11 @@ public static ScaleType fromString(String name) { return fromString(name, ScaleType.class); } - /** @return known ScaleType values. */ + /** + * Gets known ScaleType values. + * + * @return known ScaleType values. + */ public static Collection values() { return values(ScaleType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Schedule.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Schedule.java index 752dcb8914d0..4cf9f8ad0622 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Schedule.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/Schedule.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** The Schedule model. */ @Fluent public final class Schedule { - @JsonIgnore private final ClientLogger logger = new ClientLogger(Schedule.class); - /* * Enable or disable assessment schedule on SQL virtual machine. */ @@ -38,7 +34,7 @@ public final class Schedule { * Day of the week to run assessment. */ @JsonProperty(value = "dayOfWeek") - private DayOfWeek dayOfWeek; + private AssessmentDayOfWeek dayOfWeek; /* * Time of the day in HH:mm format. Eg. 17:30 @@ -113,7 +109,7 @@ public Schedule withMonthlyOccurrence(Integer monthlyOccurrence) { * * @return the dayOfWeek value. */ - public DayOfWeek dayOfWeek() { + public AssessmentDayOfWeek dayOfWeek() { return this.dayOfWeek; } @@ -123,7 +119,7 @@ public DayOfWeek dayOfWeek() { * @param dayOfWeek the dayOfWeek value to set. * @return the Schedule object itself. */ - public Schedule withDayOfWeek(DayOfWeek dayOfWeek) { + public Schedule withDayOfWeek(AssessmentDayOfWeek dayOfWeek) { this.dayOfWeek = dayOfWeek; return this; } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ServerConfigurationsManagementSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ServerConfigurationsManagementSettings.java index 9f99425aa4be..a360bae91647 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ServerConfigurationsManagementSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/ServerConfigurationsManagementSettings.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Set the connectivity, storage and workload settings. */ @Fluent public final class ServerConfigurationsManagementSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(ServerConfigurationsManagementSettings.class); - /* * SQL connectivity type settings. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlConnectivityUpdateSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlConnectivityUpdateSettings.java index 0ea9515472e4..bf59c84bfb18 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlConnectivityUpdateSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlConnectivityUpdateSettings.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Set the access level and network port settings for SQL Server. */ @Fluent public final class SqlConnectivityUpdateSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlConnectivityUpdateSettings.class); - /* * SQL Server connectivity option. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlImageSku.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlImageSku.java index 4d4315636693..e6e619641e76 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlImageSku.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlImageSku.java @@ -36,7 +36,11 @@ public static SqlImageSku fromString(String name) { return fromString(name, SqlImageSku.class); } - /** @return known SqlImageSku values. */ + /** + * Gets known SqlImageSku values. + * + * @return known SqlImageSku values. + */ public static Collection values() { return values(SqlImageSku.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlInstanceSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlInstanceSettings.java index f315be86eb10..0eafb7da359a 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlInstanceSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlInstanceSettings.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Set the server/instance-level settings for SQL Server. */ @Fluent public final class SqlInstanceSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlInstanceSettings.class); - /* * SQL Server Collation. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlManagementMode.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlManagementMode.java index 9cc19ad08525..d3bb293781fa 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlManagementMode.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlManagementMode.java @@ -30,7 +30,11 @@ public static SqlManagementMode fromString(String name) { return fromString(name, SqlManagementMode.class); } - /** @return known SqlManagementMode values. */ + /** + * Gets known SqlManagementMode values. + * + * @return known SqlManagementMode values. + */ public static Collection values() { return values(SqlManagementMode.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlServerLicenseType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlServerLicenseType.java index ca0c3f96581e..2eafe9dc1eb0 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlServerLicenseType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlServerLicenseType.java @@ -30,7 +30,11 @@ public static SqlServerLicenseType fromString(String name) { return fromString(name, SqlServerLicenseType.class); } - /** @return known SqlServerLicenseType values. */ + /** + * Gets known SqlServerLicenseType values. + * + * @return known SqlServerLicenseType values. + */ public static Collection values() { return values(SqlServerLicenseType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlStorageSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlStorageSettings.java index c2c6ac5a7e0c..88b6fc573a65 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlStorageSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlStorageSettings.java @@ -5,16 +5,12 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Set disk storage settings for SQL Server. */ @Fluent public final class SqlStorageSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlStorageSettings.class); - /* * Logical Unit Numbers for the disks. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlStorageUpdateSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlStorageUpdateSettings.java index ae33fb980199..d640f42f175e 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlStorageUpdateSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlStorageUpdateSettings.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Set disk storage settings for SQL Server. */ @Fluent public final class SqlStorageUpdateSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlStorageUpdateSettings.class); - /* * Virtual machine disk count. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlTempDbSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlTempDbSettings.java index 34c50c839abf..13cb8d04f562 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlTempDbSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlTempDbSettings.java @@ -5,16 +5,12 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** The SqlTempDbSettings model. */ @Fluent public final class SqlTempDbSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlTempDbSettings.class); - /* * SQL Server default file size */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachine.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachine.java index f9ae74c3c7bb..794f986fd0da 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachine.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachine.java @@ -177,6 +177,13 @@ public interface SqlVirtualMachine { */ String regionName(); + /** + * Gets the name of the resource group. + * + * @return the name of the resource group. + */ + String resourceGroupName(); + /** * Gets the inner com.azure.resourcemanager.sqlvirtualmachine.fluent.models.SqlVirtualMachineInner object. * diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroup.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroup.java index c96d2605649f..2f95780818de 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroup.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroup.java @@ -118,6 +118,13 @@ public interface SqlVirtualMachineGroup { */ String regionName(); + /** + * Gets the name of the resource group. + * + * @return the name of the resource group. + */ + String resourceGroupName(); + /** * Gets the inner com.azure.resourcemanager.sqlvirtualmachine.fluent.models.SqlVirtualMachineGroupInner object. * diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroupListResult.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroupListResult.java index 8bac0821f8f4..2686d4977d44 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroupListResult.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroupListResult.java @@ -5,17 +5,13 @@ package com.azure.resourcemanager.sqlvirtualmachine.models; import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.fluent.models.SqlVirtualMachineGroupInner; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** A list of SQL virtual machine groups. */ @Immutable public final class SqlVirtualMachineGroupListResult { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineGroupListResult.class); - /* * Array of results. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroupUpdate.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroupUpdate.java index 47019f3567cb..d70272aea2aa 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroupUpdate.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineGroupUpdate.java @@ -5,8 +5,6 @@ package com.azure.resourcemanager.sqlvirtualmachine.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.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; @@ -14,8 +12,6 @@ /** An update to a SQL virtual machine group. */ @Fluent public final class SqlVirtualMachineGroupUpdate { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineGroupUpdate.class); - /* * Resource tags. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineListResult.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineListResult.java index ec58693068da..80862b85fa5c 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineListResult.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineListResult.java @@ -5,17 +5,13 @@ package com.azure.resourcemanager.sqlvirtualmachine.models; import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; import com.azure.resourcemanager.sqlvirtualmachine.fluent.models.SqlVirtualMachineInner; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; /** A list of SQL virtual machines. */ @Immutable public final class SqlVirtualMachineListResult { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineListResult.class); - /* * Array of results. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineUpdate.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineUpdate.java index 232ee4674c3f..067fbd5bd3f1 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineUpdate.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVirtualMachineUpdate.java @@ -5,8 +5,6 @@ package com.azure.resourcemanager.sqlvirtualmachine.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.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; @@ -14,8 +12,6 @@ /** An update to a SQL virtual machine. */ @Fluent public final class SqlVirtualMachineUpdate { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineUpdate.class); - /* * Resource tags. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVmGroupImageSku.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVmGroupImageSku.java index 4acd11294c11..e3dc8eefffcc 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVmGroupImageSku.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlVmGroupImageSku.java @@ -27,7 +27,11 @@ public static SqlVmGroupImageSku fromString(String name) { return fromString(name, SqlVmGroupImageSku.class); } - /** @return known SqlVmGroupImageSku values. */ + /** + * Gets known SqlVmGroupImageSku values. + * + * @return known SqlVmGroupImageSku values. + */ public static Collection values() { return values(SqlVmGroupImageSku.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlWorkloadType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlWorkloadType.java index cb499a0692f5..8315990c4b7f 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlWorkloadType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlWorkloadType.java @@ -30,7 +30,11 @@ public static SqlWorkloadType fromString(String name) { return fromString(name, SqlWorkloadType.class); } - /** @return known SqlWorkloadType values. */ + /** + * Gets known SqlWorkloadType values. + * + * @return known SqlWorkloadType values. + */ public static Collection values() { return values(SqlWorkloadType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlWorkloadTypeUpdateSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlWorkloadTypeUpdateSettings.java index 4c9ed5c75db2..73b01523bdfa 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlWorkloadTypeUpdateSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/SqlWorkloadTypeUpdateSettings.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Set workload type to optimize storage for SQL Server. */ @Fluent public final class SqlWorkloadTypeUpdateSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(SqlWorkloadTypeUpdateSettings.class); - /* * SQL Server workload type. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/StorageConfigurationSettings.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/StorageConfigurationSettings.java index c49a1696e58b..d8d4ee023ee6 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/StorageConfigurationSettings.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/StorageConfigurationSettings.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Storage Configurations for SQL Data, Log and TempDb. */ @Fluent public final class StorageConfigurationSettings { - @JsonIgnore private final ClientLogger logger = new ClientLogger(StorageConfigurationSettings.class); - /* * SQL Server Data Storage Settings. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/StorageWorkloadType.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/StorageWorkloadType.java index f97af5175c68..dac4131e8a5d 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/StorageWorkloadType.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/StorageWorkloadType.java @@ -30,7 +30,11 @@ public static StorageWorkloadType fromString(String name) { return fromString(name, StorageWorkloadType.class); } - /** @return known StorageWorkloadType values. */ + /** + * Gets known StorageWorkloadType values. + * + * @return known StorageWorkloadType values. + */ public static Collection values() { return values(StorageWorkloadType.class); } diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/WsfcDomainCredentials.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/WsfcDomainCredentials.java index c93600bdd2a6..8ca5a74b7f06 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/WsfcDomainCredentials.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/WsfcDomainCredentials.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Domain credentials for setting up Windows Server Failover Cluster for SQL availability group. */ @Fluent public final class WsfcDomainCredentials { - @JsonIgnore private final ClientLogger logger = new ClientLogger(WsfcDomainCredentials.class); - /* * Cluster bootstrap account password. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/WsfcDomainProfile.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/WsfcDomainProfile.java index 6e96dcc5eaa2..a7d5219f625d 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/WsfcDomainProfile.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/models/WsfcDomainProfile.java @@ -5,15 +5,11 @@ package com.azure.resourcemanager.sqlvirtualmachine.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; /** Active Directory account details to operate Windows Server Failover Cluster. */ @Fluent public final class WsfcDomainProfile { - @JsonIgnore private final ClientLogger logger = new ClientLogger(WsfcDomainProfile.class); - /* * Fully qualified name of the domain. */ diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/samples/java/com/azure/resourcemanager/sqlvirtualmachine/generated/SqlVirtualMachinesCreateOrUpdateSamples.java b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/samples/java/com/azure/resourcemanager/sqlvirtualmachine/generated/SqlVirtualMachinesCreateOrUpdateSamples.java index a749546098b1..3e59a557f10f 100644 --- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/samples/java/com/azure/resourcemanager/sqlvirtualmachine/generated/SqlVirtualMachinesCreateOrUpdateSamples.java +++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/samples/java/com/azure/resourcemanager/sqlvirtualmachine/generated/SqlVirtualMachinesCreateOrUpdateSamples.java @@ -5,13 +5,14 @@ package com.azure.resourcemanager.sqlvirtualmachine.generated; import com.azure.resourcemanager.sqlvirtualmachine.models.AdditionalFeaturesServerConfigurations; +import com.azure.resourcemanager.sqlvirtualmachine.models.AssessmentDayOfWeek; import com.azure.resourcemanager.sqlvirtualmachine.models.AssessmentSettings; +import com.azure.resourcemanager.sqlvirtualmachine.models.AutoBackupDaysOfWeek; import com.azure.resourcemanager.sqlvirtualmachine.models.AutoBackupSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.AutoPatchingSettings; import com.azure.resourcemanager.sqlvirtualmachine.models.BackupScheduleType; import com.azure.resourcemanager.sqlvirtualmachine.models.ConnectivityType; import com.azure.resourcemanager.sqlvirtualmachine.models.DayOfWeek; -import com.azure.resourcemanager.sqlvirtualmachine.models.DaysOfWeek; import com.azure.resourcemanager.sqlvirtualmachine.models.DiskConfigurationType; import com.azure.resourcemanager.sqlvirtualmachine.models.FullBackupFrequencyType; import com.azure.resourcemanager.sqlvirtualmachine.models.KeyVaultCredentialSettings; @@ -125,7 +126,7 @@ public static void createsOrUpdatesASQLVirtualMachineAndJoinsItToASQLVirtualMach .withBackupSystemDbs(true) .withBackupScheduleType(BackupScheduleType.MANUAL) .withFullBackupFrequency(FullBackupFrequencyType.WEEKLY) - .withDaysOfWeek(Arrays.asList(DaysOfWeek.MONDAY, DaysOfWeek.FRIDAY)) + .withDaysOfWeek(Arrays.asList(AutoBackupDaysOfWeek.MONDAY, AutoBackupDaysOfWeek.FRIDAY)) .withFullBackupStartTime(6) .withFullBackupWindowHours(11) .withLogBackupFrequency(10)) @@ -263,7 +264,7 @@ public static void createsOrUpdatesASQLVirtualMachineWithMaxParameters( new Schedule() .withEnable(true) .withWeeklyInterval(1) - .withDayOfWeek(DayOfWeek.SUNDAY) + .withDayOfWeek(AssessmentDayOfWeek.SUNDAY) .withStartTime("23:17"))) .create(); }