Skip to content

Commit 7a58c77

Browse files
author
SDKAuto
committed
CodeGen from PR 18996 in Azure/azure-rest-api-specs
Merge 2a781ad77e4b5072d3c6a1f5ba5462f9539fb989 into ac286e05bedd69d301e1dc94ec70f66e8536686b
1 parent f5adfe2 commit 7a58c77

File tree

84 files changed

+229
-312
lines changed

Some content is hidden

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

84 files changed

+229
-312
lines changed

sdk/appconfiguration/azure-resourcemanager-appconfiguration/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.6 (Unreleased)
3+
## 1.0.0-beta.1 (2022-05-11)
4+
5+
- Azure Resource Manager AppConfiguration client library for Java. This package contains Microsoft Azure SDK for AppConfiguration Management SDK. Package tag package-2022-05-01. 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/appconfiguration/azure-resourcemanager-appconfiguration/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Azure Resource Manager AppConfiguration client library for Java.
44

5-
This package contains Microsoft Azure SDK for AppConfiguration Management SDK. Package tag package-2021-10-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
5+
This package contains Microsoft Azure SDK for AppConfiguration Management SDK. Package tag package-2022-05-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
66

77
## We'd love to hear your feedback
88

@@ -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-appconfiguration</artifactId>
35-
<version>1.0.0-beta.5</version>
35+
<version>1.0.0-beta.6</version>
3636
</dependency>
3737
```
3838
[//]: # ({x-version-update-end})

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

Lines changed: 29 additions & 29 deletions
Large diffs are not rendered by default.

sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<packaging>jar</packaging>
1414

1515
<name>Microsoft Azure SDK for AppConfiguration Management</name>
16-
<description>This package contains Microsoft Azure SDK for AppConfiguration Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Package tag package-2021-10-01-preview.</description>
16+
<description>This package contains Microsoft Azure SDK for AppConfiguration Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Package tag package-2022-05-01.</description>
1717
<url>https://github.com/Azure/azure-sdk-for-java</url>
1818

1919
<licenses>

sdk/appconfiguration/azure-resourcemanager-appconfiguration/src/main/java/com/azure/resourcemanager/appconfiguration/AppConfigurationManager.java

Lines changed: 66 additions & 10 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;
@@ -79,6 +81,19 @@ public static AppConfigurationManager authenticate(TokenCredential credential, A
7981
return configure().authenticate(credential, profile);
8082
}
8183

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

91106
/** The Configurable allowing configurations to be set. */
92107
public static final class Configurable {
93-
private final ClientLogger logger = new ClientLogger(Configurable.class);
108+
private static final ClientLogger LOGGER = new ClientLogger(Configurable.class);
94109

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

102118
private Configurable() {
@@ -157,16 +173,31 @@ public Configurable withRetryPolicy(RetryPolicy retryPolicy) {
157173
return this;
158174
}
159175

176+
/**
177+
* Sets the retry options for the HTTP pipeline retry policy.
178+
*
179+
* <p>This setting has no effect, if retry policy is set via {@link #withRetryPolicy(RetryPolicy)}.
180+
*
181+
* @param retryOptions the retry options for the HTTP pipeline retry policy.
182+
* @return the configurable object itself.
183+
*/
184+
public Configurable withRetryOptions(RetryOptions retryOptions) {
185+
this.retryOptions = Objects.requireNonNull(retryOptions, "'retryOptions' cannot be null.");
186+
return this;
187+
}
188+
160189
/**
161190
* Sets the default poll interval, used when service does not provide "Retry-After" header.
162191
*
163192
* @param defaultPollInterval the default poll interval.
164193
* @return the configurable object itself.
165194
*/
166195
public Configurable withDefaultPollInterval(Duration defaultPollInterval) {
167-
this.defaultPollInterval = Objects.requireNonNull(defaultPollInterval, "'retryPolicy' cannot be null.");
196+
this.defaultPollInterval =
197+
Objects.requireNonNull(defaultPollInterval, "'defaultPollInterval' cannot be null.");
168198
if (this.defaultPollInterval.isNegative()) {
169-
throw logger.logExceptionAsError(new IllegalArgumentException("'httpPipeline' cannot be negative"));
199+
throw LOGGER
200+
.logExceptionAsError(new IllegalArgumentException("'defaultPollInterval' cannot be negative"));
170201
}
171202
return this;
172203
}
@@ -188,7 +219,7 @@ public AppConfigurationManager authenticate(TokenCredential credential, AzurePro
188219
.append("-")
189220
.append("com.azure.resourcemanager.appconfiguration")
190221
.append("/")
191-
.append("1.0.0-beta.5");
222+
.append("1.0.0-beta.1");
192223
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
193224
userAgentBuilder
194225
.append(" (")
@@ -206,10 +237,15 @@ public AppConfigurationManager authenticate(TokenCredential credential, AzurePro
206237
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
207238
}
208239
if (retryPolicy == null) {
209-
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
240+
if (retryOptions != null) {
241+
retryPolicy = new RetryPolicy(retryOptions);
242+
} else {
243+
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
244+
}
210245
}
211246
List<HttpPipelinePolicy> policies = new ArrayList<>();
212247
policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
248+
policies.add(new AddHeadersFromContextPolicy());
213249
policies.add(new RequestIdPolicy());
214250
policies
215251
.addAll(
@@ -240,23 +276,35 @@ public AppConfigurationManager authenticate(TokenCredential credential, AzurePro
240276
}
241277
}
242278

243-
/** @return Resource collection API of ConfigurationStores. */
279+
/**
280+
* Gets the resource collection API of ConfigurationStores.
281+
*
282+
* @return Resource collection API of ConfigurationStores.
283+
*/
244284
public ConfigurationStores configurationStores() {
245285
if (this.configurationStores == null) {
246286
this.configurationStores = new ConfigurationStoresImpl(clientObject.getConfigurationStores(), this);
247287
}
248288
return configurationStores;
249289
}
250290

251-
/** @return Resource collection API of Operations. */
291+
/**
292+
* Gets the resource collection API of Operations.
293+
*
294+
* @return Resource collection API of Operations.
295+
*/
252296
public Operations operations() {
253297
if (this.operations == null) {
254298
this.operations = new OperationsImpl(clientObject.getOperations(), this);
255299
}
256300
return operations;
257301
}
258302

259-
/** @return Resource collection API of PrivateEndpointConnections. */
303+
/**
304+
* Gets the resource collection API of PrivateEndpointConnections.
305+
*
306+
* @return Resource collection API of PrivateEndpointConnections.
307+
*/
260308
public PrivateEndpointConnections privateEndpointConnections() {
261309
if (this.privateEndpointConnections == null) {
262310
this.privateEndpointConnections =
@@ -265,15 +313,23 @@ public PrivateEndpointConnections privateEndpointConnections() {
265313
return privateEndpointConnections;
266314
}
267315

268-
/** @return Resource collection API of PrivateLinkResources. */
316+
/**
317+
* Gets the resource collection API of PrivateLinkResources.
318+
*
319+
* @return Resource collection API of PrivateLinkResources.
320+
*/
269321
public PrivateLinkResources privateLinkResources() {
270322
if (this.privateLinkResources == null) {
271323
this.privateLinkResources = new PrivateLinkResourcesImpl(clientObject.getPrivateLinkResources(), this);
272324
}
273325
return privateLinkResources;
274326
}
275327

276-
/** @return Resource collection API of KeyValues. */
328+
/**
329+
* Gets the resource collection API of KeyValues.
330+
*
331+
* @return Resource collection API of KeyValues.
332+
*/
277333
public KeyValues keyValues() {
278334
if (this.keyValues == null) {
279335
this.keyValues = new KeyValuesImpl(clientObject.getKeyValues(), this);

sdk/appconfiguration/azure-resourcemanager-appconfiguration/src/main/java/com/azure/resourcemanager/appconfiguration/fluent/models/ApiKeyInner.java

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

77
import com.azure.core.annotation.Immutable;
8-
import com.azure.core.util.logging.ClientLogger;
9-
import com.fasterxml.jackson.annotation.JsonIgnore;
108
import com.fasterxml.jackson.annotation.JsonProperty;
119
import java.time.OffsetDateTime;
1210

1311
/** An API key used for authenticating with a configuration store endpoint. */
1412
@Immutable
1513
public final class ApiKeyInner {
16-
@JsonIgnore private final ClientLogger logger = new ClientLogger(ApiKeyInner.class);
17-
1814
/*
1915
* The key ID.
2016
*/

sdk/appconfiguration/azure-resourcemanager-appconfiguration/src/main/java/com/azure/resourcemanager/appconfiguration/fluent/models/ConfigurationStoreInner.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.azure.resourcemanager.appconfiguration.models.PublicNetworkAccess;
1616
import com.azure.resourcemanager.appconfiguration.models.ResourceIdentity;
1717
import com.azure.resourcemanager.appconfiguration.models.Sku;
18-
import com.fasterxml.jackson.annotation.JsonIgnore;
1918
import com.fasterxml.jackson.annotation.JsonProperty;
2019
import java.time.OffsetDateTime;
2120
import java.util.List;
@@ -27,8 +26,6 @@
2726
*/
2827
@Fluent
2928
public final class ConfigurationStoreInner extends Resource {
30-
@JsonIgnore private final ClientLogger logger = new ClientLogger(ConfigurationStoreInner.class);
31-
3229
/*
3330
* The managed identity information, if configured.
3431
*/
@@ -319,11 +316,13 @@ public void validate() {
319316
innerProperties().validate();
320317
}
321318
if (sku() == null) {
322-
throw logger
319+
throw LOGGER
323320
.logExceptionAsError(
324321
new IllegalArgumentException("Missing required property sku in model ConfigurationStoreInner"));
325322
} else {
326323
sku().validate();
327324
}
328325
}
326+
327+
private static final ClientLogger LOGGER = new ClientLogger(ConfigurationStoreInner.class);
329328
}

sdk/appconfiguration/azure-resourcemanager-appconfiguration/src/main/java/com/azure/resourcemanager/appconfiguration/fluent/models/ConfigurationStoreProperties.java

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

77
import com.azure.core.annotation.Fluent;
8-
import com.azure.core.util.logging.ClientLogger;
98
import com.azure.resourcemanager.appconfiguration.models.CreateMode;
109
import com.azure.resourcemanager.appconfiguration.models.EncryptionProperties;
1110
import com.azure.resourcemanager.appconfiguration.models.PrivateEndpointConnectionReference;
1211
import com.azure.resourcemanager.appconfiguration.models.ProvisioningState;
1312
import com.azure.resourcemanager.appconfiguration.models.PublicNetworkAccess;
14-
import com.fasterxml.jackson.annotation.JsonIgnore;
1513
import com.fasterxml.jackson.annotation.JsonProperty;
1614
import java.time.OffsetDateTime;
1715
import java.util.List;
1816

1917
/** The properties of a configuration store. */
2018
@Fluent
2119
public final class ConfigurationStoreProperties {
22-
@JsonIgnore private final ClientLogger logger = new ClientLogger(ConfigurationStoreProperties.class);
23-
2420
/*
2521
* The provisioning state of the configuration store.
2622
*/

sdk/appconfiguration/azure-resourcemanager-appconfiguration/src/main/java/com/azure/resourcemanager/appconfiguration/fluent/models/ConfigurationStorePropertiesUpdateParameters.java

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

77
import com.azure.core.annotation.Fluent;
8-
import com.azure.core.util.logging.ClientLogger;
98
import com.azure.resourcemanager.appconfiguration.models.EncryptionProperties;
109
import com.azure.resourcemanager.appconfiguration.models.PublicNetworkAccess;
11-
import com.fasterxml.jackson.annotation.JsonIgnore;
1210
import com.fasterxml.jackson.annotation.JsonProperty;
1311

1412
/** The properties for updating a configuration store. */
1513
@Fluent
1614
public final class ConfigurationStorePropertiesUpdateParameters {
17-
@JsonIgnore
18-
private final ClientLogger logger = new ClientLogger(ConfigurationStorePropertiesUpdateParameters.class);
19-
2015
/*
2116
* The encryption settings of the configuration store.
2217
*/

sdk/appconfiguration/azure-resourcemanager-appconfiguration/src/main/java/com/azure/resourcemanager/appconfiguration/fluent/models/DeletedConfigurationStoreInner.java

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

77
import com.azure.core.annotation.Fluent;
8-
import com.azure.core.util.logging.ClientLogger;
9-
import com.fasterxml.jackson.annotation.JsonIgnore;
108
import com.fasterxml.jackson.annotation.JsonProperty;
119
import java.time.OffsetDateTime;
1210
import java.util.Map;
1311

1412
/** Deleted configuration store information with extended details. */
1513
@Fluent
1614
public final class DeletedConfigurationStoreInner {
17-
@JsonIgnore private final ClientLogger logger = new ClientLogger(DeletedConfigurationStoreInner.class);
18-
1915
/*
2016
* The resource ID for the deleted configuration store.
2117
*/

0 commit comments

Comments
 (0)