Skip to content

Commit 97dfb45

Browse files
author
SDKAuto
committed
CodeGen from PR 18838 in Azure/azure-rest-api-specs
Merge 4913674bacd0320a4999e7f27f04819f9162f482 into d7216e49a7b0d5a7e15f77c4bab753208bf7870d
1 parent 8d5049c commit 97dfb45

File tree

79 files changed

+382
-346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+382
-346
lines changed

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Release History
22

3-
## 1.0.0-beta.3 (Unreleased)
3+
## 1.0.0-beta.1 (2022-05-24)
4+
5+
- 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).
46

57
### Features Added
68

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
3232
<dependency>
3333
<groupId>com.azure.resourcemanager</groupId>
3434
<artifactId>azure-resourcemanager-sqlvirtualmachine</artifactId>
35-
<version>1.0.0-beta.2</version>
35+
<version>1.0.0-beta.3</version>
3636
</dependency>
3737
```
3838
[//]: # ({x-version-update-end})

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/SAMPLE.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,14 @@ public final class SqlVirtualMachineGroupsUpdateSamples {
353353

354354
```java
355355
import com.azure.resourcemanager.sqlvirtualmachine.models.AdditionalFeaturesServerConfigurations;
356+
import com.azure.resourcemanager.sqlvirtualmachine.models.AssessmentDayOfWeek;
356357
import com.azure.resourcemanager.sqlvirtualmachine.models.AssessmentSettings;
358+
import com.azure.resourcemanager.sqlvirtualmachine.models.AutoBackupDaysOfWeek;
357359
import com.azure.resourcemanager.sqlvirtualmachine.models.AutoBackupSettings;
358360
import com.azure.resourcemanager.sqlvirtualmachine.models.AutoPatchingSettings;
359361
import com.azure.resourcemanager.sqlvirtualmachine.models.BackupScheduleType;
360362
import com.azure.resourcemanager.sqlvirtualmachine.models.ConnectivityType;
361363
import com.azure.resourcemanager.sqlvirtualmachine.models.DayOfWeek;
362-
import com.azure.resourcemanager.sqlvirtualmachine.models.DaysOfWeek;
363364
import com.azure.resourcemanager.sqlvirtualmachine.models.DiskConfigurationType;
364365
import com.azure.resourcemanager.sqlvirtualmachine.models.FullBackupFrequencyType;
365366
import com.azure.resourcemanager.sqlvirtualmachine.models.KeyVaultCredentialSettings;
@@ -473,7 +474,7 @@ public final class SqlVirtualMachinesCreateOrUpdateSamples {
473474
.withBackupSystemDbs(true)
474475
.withBackupScheduleType(BackupScheduleType.MANUAL)
475476
.withFullBackupFrequency(FullBackupFrequencyType.WEEKLY)
476-
.withDaysOfWeek(Arrays.asList(DaysOfWeek.MONDAY, DaysOfWeek.FRIDAY))
477+
.withDaysOfWeek(Arrays.asList(AutoBackupDaysOfWeek.MONDAY, AutoBackupDaysOfWeek.FRIDAY))
477478
.withFullBackupStartTime(6)
478479
.withFullBackupWindowHours(11)
479480
.withLogBackupFrequency(10))
@@ -611,7 +612,7 @@ public final class SqlVirtualMachinesCreateOrUpdateSamples {
611612
new Schedule()
612613
.withEnable(true)
613614
.withWeeklyInterval(1)
614-
.withDayOfWeek(DayOfWeek.SUNDAY)
615+
.withDayOfWeek(AssessmentDayOfWeek.SUNDAY)
615616
.withStartTime("23:17")))
616617
.create();
617618
}

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/SqlVirtualMachineManager.java

Lines changed: 61 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
import com.azure.core.http.HttpPipelineBuilder;
1111
import com.azure.core.http.HttpPipelinePosition;
1212
import com.azure.core.http.policy.AddDatePolicy;
13+
import com.azure.core.http.policy.AddHeadersFromContextPolicy;
1314
import com.azure.core.http.policy.HttpLogOptions;
1415
import com.azure.core.http.policy.HttpLoggingPolicy;
1516
import com.azure.core.http.policy.HttpPipelinePolicy;
1617
import com.azure.core.http.policy.HttpPolicyProviders;
1718
import com.azure.core.http.policy.RequestIdPolicy;
19+
import com.azure.core.http.policy.RetryOptions;
1820
import com.azure.core.http.policy.RetryPolicy;
1921
import com.azure.core.http.policy.UserAgentPolicy;
2022
import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
@@ -80,6 +82,19 @@ public static SqlVirtualMachineManager authenticate(TokenCredential credential,
8082
return configure().authenticate(credential, profile);
8183
}
8284

85+
/**
86+
* Creates an instance of SqlVirtualMachine service API entry point.
87+
*
88+
* @param httpPipeline the {@link HttpPipeline} configured with Azure authentication credential.
89+
* @param profile the Azure profile for client.
90+
* @return the SqlVirtualMachine service API instance.
91+
*/
92+
public static SqlVirtualMachineManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
93+
Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
94+
Objects.requireNonNull(profile, "'profile' cannot be null.");
95+
return new SqlVirtualMachineManager(httpPipeline, profile, null);
96+
}
97+
8398
/**
8499
* Gets a Configurable instance that can be used to create SqlVirtualMachineManager with optional configuration.
85100
*
@@ -91,13 +106,14 @@ public static Configurable configure() {
91106

92107
/** The Configurable allowing configurations to be set. */
93108
public static final class Configurable {
94-
private final ClientLogger logger = new ClientLogger(Configurable.class);
109+
private static final ClientLogger LOGGER = new ClientLogger(Configurable.class);
95110

96111
private HttpClient httpClient;
97112
private HttpLogOptions httpLogOptions;
98113
private final List<HttpPipelinePolicy> policies = new ArrayList<>();
99114
private final List<String> scopes = new ArrayList<>();
100115
private RetryPolicy retryPolicy;
116+
private RetryOptions retryOptions;
101117
private Duration defaultPollInterval;
102118

103119
private Configurable() {
@@ -158,16 +174,31 @@ public Configurable withRetryPolicy(RetryPolicy retryPolicy) {
158174
return this;
159175
}
160176

177+
/**
178+
* Sets the retry options for the HTTP pipeline retry policy.
179+
*
180+
* <p>This setting has no effect, if retry policy is set via {@link #withRetryPolicy(RetryPolicy)}.
181+
*
182+
* @param retryOptions the retry options for the HTTP pipeline retry policy.
183+
* @return the configurable object itself.
184+
*/
185+
public Configurable withRetryOptions(RetryOptions retryOptions) {
186+
this.retryOptions = Objects.requireNonNull(retryOptions, "'retryOptions' cannot be null.");
187+
return this;
188+
}
189+
161190
/**
162191
* Sets the default poll interval, used when service does not provide "Retry-After" header.
163192
*
164193
* @param defaultPollInterval the default poll interval.
165194
* @return the configurable object itself.
166195
*/
167196
public Configurable withDefaultPollInterval(Duration defaultPollInterval) {
168-
this.defaultPollInterval = Objects.requireNonNull(defaultPollInterval, "'retryPolicy' cannot be null.");
197+
this.defaultPollInterval =
198+
Objects.requireNonNull(defaultPollInterval, "'defaultPollInterval' cannot be null.");
169199
if (this.defaultPollInterval.isNegative()) {
170-
throw logger.logExceptionAsError(new IllegalArgumentException("'httpPipeline' cannot be negative"));
200+
throw LOGGER
201+
.logExceptionAsError(new IllegalArgumentException("'defaultPollInterval' cannot be negative"));
171202
}
172203
return this;
173204
}
@@ -189,7 +220,7 @@ public SqlVirtualMachineManager authenticate(TokenCredential credential, AzurePr
189220
.append("-")
190221
.append("com.azure.resourcemanager.sqlvirtualmachine")
191222
.append("/")
192-
.append("1.0.0-beta.2");
223+
.append("1.0.0-beta.1");
193224
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
194225
userAgentBuilder
195226
.append(" (")
@@ -207,10 +238,15 @@ public SqlVirtualMachineManager authenticate(TokenCredential credential, AzurePr
207238
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
208239
}
209240
if (retryPolicy == null) {
210-
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
241+
if (retryOptions != null) {
242+
retryPolicy = new RetryPolicy(retryOptions);
243+
} else {
244+
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
245+
}
211246
}
212247
List<HttpPipelinePolicy> policies = new ArrayList<>();
213248
policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
249+
policies.add(new AddHeadersFromContextPolicy());
214250
policies.add(new RequestIdPolicy());
215251
policies
216252
.addAll(
@@ -241,7 +277,11 @@ public SqlVirtualMachineManager authenticate(TokenCredential credential, AzurePr
241277
}
242278
}
243279

244-
/** @return Resource collection API of AvailabilityGroupListeners. */
280+
/**
281+
* Gets the resource collection API of AvailabilityGroupListeners. It manages AvailabilityGroupListener.
282+
*
283+
* @return Resource collection API of AvailabilityGroupListeners.
284+
*/
245285
public AvailabilityGroupListeners availabilityGroupListeners() {
246286
if (this.availabilityGroupListeners == null) {
247287
this.availabilityGroupListeners =
@@ -250,15 +290,23 @@ public AvailabilityGroupListeners availabilityGroupListeners() {
250290
return availabilityGroupListeners;
251291
}
252292

253-
/** @return Resource collection API of Operations. */
293+
/**
294+
* Gets the resource collection API of Operations.
295+
*
296+
* @return Resource collection API of Operations.
297+
*/
254298
public Operations operations() {
255299
if (this.operations == null) {
256300
this.operations = new OperationsImpl(clientObject.getOperations(), this);
257301
}
258302
return operations;
259303
}
260304

261-
/** @return Resource collection API of SqlVirtualMachineGroups. */
305+
/**
306+
* Gets the resource collection API of SqlVirtualMachineGroups. It manages SqlVirtualMachineGroup.
307+
*
308+
* @return Resource collection API of SqlVirtualMachineGroups.
309+
*/
262310
public SqlVirtualMachineGroups sqlVirtualMachineGroups() {
263311
if (this.sqlVirtualMachineGroups == null) {
264312
this.sqlVirtualMachineGroups =
@@ -267,7 +315,11 @@ public SqlVirtualMachineGroups sqlVirtualMachineGroups() {
267315
return sqlVirtualMachineGroups;
268316
}
269317

270-
/** @return Resource collection API of SqlVirtualMachines. */
318+
/**
319+
* Gets the resource collection API of SqlVirtualMachines. It manages SqlVirtualMachine.
320+
*
321+
* @return Resource collection API of SqlVirtualMachines.
322+
*/
271323
public SqlVirtualMachines sqlVirtualMachines() {
272324
if (this.sqlVirtualMachines == null) {
273325
this.sqlVirtualMachines = new SqlVirtualMachinesImpl(clientObject.getSqlVirtualMachines(), this);

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerInner.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,14 @@
77
import com.azure.core.annotation.Fluent;
88
import com.azure.core.management.ProxyResource;
99
import com.azure.core.management.SystemData;
10-
import com.azure.core.util.logging.ClientLogger;
1110
import com.azure.resourcemanager.sqlvirtualmachine.models.AgConfiguration;
1211
import com.azure.resourcemanager.sqlvirtualmachine.models.LoadBalancerConfiguration;
13-
import com.fasterxml.jackson.annotation.JsonIgnore;
1412
import com.fasterxml.jackson.annotation.JsonProperty;
1513
import java.util.List;
1614

1715
/** A SQL Server availability group listener. */
1816
@Fluent
1917
public final class AvailabilityGroupListenerInner extends ProxyResource {
20-
@JsonIgnore private final ClientLogger logger = new ClientLogger(AvailabilityGroupListenerInner.class);
21-
2218
/*
2319
* Resource properties.
2420
*/

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/AvailabilityGroupListenerProperties.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,14 @@
55
package com.azure.resourcemanager.sqlvirtualmachine.fluent.models;
66

77
import com.azure.core.annotation.Fluent;
8-
import com.azure.core.util.logging.ClientLogger;
98
import com.azure.resourcemanager.sqlvirtualmachine.models.AgConfiguration;
109
import com.azure.resourcemanager.sqlvirtualmachine.models.LoadBalancerConfiguration;
11-
import com.fasterxml.jackson.annotation.JsonIgnore;
1210
import com.fasterxml.jackson.annotation.JsonProperty;
1311
import java.util.List;
1412

1513
/** The properties of an availability group listener. */
1614
@Fluent
1715
public final class AvailabilityGroupListenerProperties {
18-
@JsonIgnore private final ClientLogger logger = new ClientLogger(AvailabilityGroupListenerProperties.class);
19-
2016
/*
2117
* Provisioning state to track the async operation status.
2218
*/

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/OperationInner.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,15 @@
55
package com.azure.resourcemanager.sqlvirtualmachine.fluent.models;
66

77
import com.azure.core.annotation.Immutable;
8-
import com.azure.core.util.logging.ClientLogger;
98
import com.azure.resourcemanager.sqlvirtualmachine.models.OperationDisplay;
109
import com.azure.resourcemanager.sqlvirtualmachine.models.OperationOrigin;
11-
import com.fasterxml.jackson.annotation.JsonIgnore;
1210
import com.fasterxml.jackson.annotation.JsonInclude;
1311
import com.fasterxml.jackson.annotation.JsonProperty;
1412
import java.util.Map;
1513

1614
/** SQL REST API operation definition. */
1715
@Immutable
1816
public final class OperationInner {
19-
@JsonIgnore private final ClientLogger logger = new ClientLogger(OperationInner.class);
20-
2117
/*
2218
* The name of the operation being performed on this particular object.
2319
*/

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupInner.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,17 @@
77
import com.azure.core.annotation.Fluent;
88
import com.azure.core.management.Resource;
99
import com.azure.core.management.SystemData;
10-
import com.azure.core.util.logging.ClientLogger;
1110
import com.azure.resourcemanager.sqlvirtualmachine.models.ClusterConfiguration;
1211
import com.azure.resourcemanager.sqlvirtualmachine.models.ClusterManagerType;
1312
import com.azure.resourcemanager.sqlvirtualmachine.models.ScaleType;
1413
import com.azure.resourcemanager.sqlvirtualmachine.models.SqlVmGroupImageSku;
1514
import com.azure.resourcemanager.sqlvirtualmachine.models.WsfcDomainProfile;
16-
import com.fasterxml.jackson.annotation.JsonIgnore;
1715
import com.fasterxml.jackson.annotation.JsonProperty;
1816
import java.util.Map;
1917

2018
/** A SQL virtual machine group. */
2119
@Fluent
2220
public final class SqlVirtualMachineGroupInner extends Resource {
23-
@JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineGroupInner.class);
24-
2521
/*
2622
* Resource properties.
2723
*/

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineGroupProperties.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,16 @@
55
package com.azure.resourcemanager.sqlvirtualmachine.fluent.models;
66

77
import com.azure.core.annotation.Fluent;
8-
import com.azure.core.util.logging.ClientLogger;
98
import com.azure.resourcemanager.sqlvirtualmachine.models.ClusterConfiguration;
109
import com.azure.resourcemanager.sqlvirtualmachine.models.ClusterManagerType;
1110
import com.azure.resourcemanager.sqlvirtualmachine.models.ScaleType;
1211
import com.azure.resourcemanager.sqlvirtualmachine.models.SqlVmGroupImageSku;
1312
import com.azure.resourcemanager.sqlvirtualmachine.models.WsfcDomainProfile;
14-
import com.fasterxml.jackson.annotation.JsonIgnore;
1513
import com.fasterxml.jackson.annotation.JsonProperty;
1614

1715
/** The properties of a SQL virtual machine group. */
1816
@Fluent
1917
public final class SqlVirtualMachineGroupProperties {
20-
@JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineGroupProperties.class);
21-
2218
/*
2319
* Provisioning state to track the async operation status.
2420
*/

sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/src/main/java/com/azure/resourcemanager/sqlvirtualmachine/fluent/models/SqlVirtualMachineInner.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.azure.core.annotation.Fluent;
88
import com.azure.core.management.Resource;
99
import com.azure.core.management.SystemData;
10-
import com.azure.core.util.logging.ClientLogger;
1110
import com.azure.resourcemanager.sqlvirtualmachine.models.AssessmentSettings;
1211
import com.azure.resourcemanager.sqlvirtualmachine.models.AutoBackupSettings;
1312
import com.azure.resourcemanager.sqlvirtualmachine.models.AutoPatchingSettings;
@@ -19,15 +18,12 @@
1918
import com.azure.resourcemanager.sqlvirtualmachine.models.SqlServerLicenseType;
2019
import com.azure.resourcemanager.sqlvirtualmachine.models.StorageConfigurationSettings;
2120
import com.azure.resourcemanager.sqlvirtualmachine.models.WsfcDomainCredentials;
22-
import com.fasterxml.jackson.annotation.JsonIgnore;
2321
import com.fasterxml.jackson.annotation.JsonProperty;
2422
import java.util.Map;
2523

2624
/** A SQL virtual machine. */
2725
@Fluent
2826
public final class SqlVirtualMachineInner extends Resource {
29-
@JsonIgnore private final ClientLogger logger = new ClientLogger(SqlVirtualMachineInner.class);
30-
3127
/*
3228
* Azure Active Directory identity of the server.
3329
*/

0 commit comments

Comments
 (0)