Skip to content

Commit ca92357

Browse files
author
SDKAuto
committed
CodeGen from PR 16989 in Azure/azure-rest-api-specs
Merge f8ed9c9124d302e0e7458645c79682165233f351 into 927500222855f07383d48b38596c2ca9835da71b
1 parent c4060a2 commit ca92357

File tree

97 files changed

+5956
-801
lines changed

Some content is hidden

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

97 files changed

+5956
-801
lines changed

‎sdk/databox/azure-resourcemanager-databox/CHANGELOG.md‎

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

3-
## 1.0.0-beta.2 (Unreleased)
3+
## 1.0.0-beta.1 (2022-03-04)
44

5+
- Azure Resource Manager DataBox client library for Java. This package contains Microsoft Azure SDK for DataBox Management SDK. Package tag package-2021-12. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
56

67
## 1.0.0-beta.1 (2021-04-14)
78

‎sdk/databox/azure-resourcemanager-databox/README.md‎

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

33
Azure Resource Manager DataBox client library for Java.
44

5-
This package contains Microsoft Azure SDK for DataBox Management SDK. Package tag package-2021-03. 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 DataBox Management SDK. Package tag package-2021-12. 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-databox</artifactId>
35-
<version>1.0.0-beta.1</version>
35+
<version>1.0.0-beta.2</version>
3636
</dependency>
3737
```
3838
[//]: # ({x-version-update-end})
@@ -74,6 +74,9 @@ See [API design][design] for general introduction on design and key concepts on
7474

7575
## Examples
7676

77+
[Code snippets and samples](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/databox/azure-resourcemanager-databox/SAMPLE.md)
78+
79+
7780
## Troubleshooting
7881

7982
## Next steps

‎sdk/databox/azure-resourcemanager-databox/SAMPLE.md‎

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

‎sdk/databox/azure-resourcemanager-databox/pom.xml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>com.azure</groupId>
5-
<artifactId>azure-client-sdk-parent</artifactId>
6-
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
7-
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
8-
</parent>
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>com.azure</groupId>
5+
<artifactId>azure-client-sdk-parent</artifactId>
6+
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
7+
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
8+
</parent>
99

10-
<groupId>com.azure.resourcemanager</groupId>
11-
<artifactId>azure-resourcemanager-databox</artifactId>
12-
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-databox;current} -->
13-
<packaging>jar</packaging>
10+
<groupId>com.azure.resourcemanager</groupId>
11+
<artifactId>azure-resourcemanager-databox</artifactId>
12+
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-databox;current} -->
13+
<packaging>jar</packaging>
1414

15-
<name>Microsoft Azure SDK for DataBox Management</name>
16-
<description>This package contains Microsoft Azure SDK for DataBox Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Package tag package-2021-03.</description>
17-
<url>https://github.com/Azure/azure-sdk-for-java</url>
15+
<name>Microsoft Azure SDK for DataBox Management</name>
16+
<description>This package contains Microsoft Azure SDK for DataBox Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Package tag package-2021-12.</description>
17+
<url>https://github.com/Azure/azure-sdk-for-java</url>
1818

19-
<licenses>
20-
<license>
21-
<name>The MIT License (MIT)</name>
22-
<url>http://opensource.org/licenses/MIT</url>
23-
<distribution>repo</distribution>
24-
</license>
25-
</licenses>
19+
<licenses>
20+
<license>
21+
<name>The MIT License (MIT)</name>
22+
<url>http://opensource.org/licenses/MIT</url>
23+
<distribution>repo</distribution>
24+
</license>
25+
</licenses>
2626

27-
<scm>
28-
<url>https://github.com/Azure/azure-sdk-for-java</url>
29-
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
30-
<developerConnection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</developerConnection>
31-
<tag>HEAD</tag>
32-
</scm>
33-
<developers>
34-
<developer>
35-
<id>microsoft</id>
36-
<name>Microsoft</name>
37-
</developer>
38-
</developers>
39-
<properties>
40-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<jacoco.skip>true</jacoco.skip>
42-
</properties>
43-
<dependencies>
44-
<dependency>
45-
<groupId>com.azure</groupId>
46-
<artifactId>azure-core</artifactId>
47-
<version>1.25.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
48-
</dependency>
49-
<dependency>
50-
<groupId>com.azure</groupId>
51-
<artifactId>azure-core-management</artifactId>
52-
<version>1.5.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
53-
</dependency>
54-
</dependencies>
27+
<scm>
28+
<url>https://github.com/Azure/azure-sdk-for-java</url>
29+
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
30+
<developerConnection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</developerConnection>
31+
<tag>HEAD</tag>
32+
</scm>
33+
<developers>
34+
<developer>
35+
<id>microsoft</id>
36+
<name>Microsoft</name>
37+
</developer>
38+
</developers>
39+
<properties>
40+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41+
<jacoco.skip>true</jacoco.skip>
42+
</properties>
43+
<dependencies>
44+
<dependency>
45+
<groupId>com.azure</groupId>
46+
<artifactId>azure-core</artifactId>
47+
<version>1.25.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
48+
</dependency>
49+
<dependency>
50+
<groupId>com.azure</groupId>
51+
<artifactId>azure-core-management</artifactId>
52+
<version>1.5.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
53+
</dependency>
54+
</dependencies>
5555
</project>

‎sdk/databox/azure-resourcemanager-databox/src/main/java/com/azure/resourcemanager/databox/DataBoxManager.java‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88
import com.azure.core.http.HttpClient;
99
import com.azure.core.http.HttpPipeline;
1010
import com.azure.core.http.HttpPipelineBuilder;
11+
import com.azure.core.http.HttpPipelinePosition;
1112
import com.azure.core.http.policy.AddDatePolicy;
12-
import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
1313
import com.azure.core.http.policy.HttpLogOptions;
1414
import com.azure.core.http.policy.HttpLoggingPolicy;
1515
import com.azure.core.http.policy.HttpPipelinePolicy;
1616
import com.azure.core.http.policy.HttpPolicyProviders;
1717
import com.azure.core.http.policy.RequestIdPolicy;
1818
import com.azure.core.http.policy.RetryPolicy;
1919
import com.azure.core.http.policy.UserAgentPolicy;
20+
import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
2021
import com.azure.core.management.profile.AzureProfile;
2122
import com.azure.core.util.Configuration;
2223
import com.azure.core.util.logging.ClientLogger;
@@ -35,6 +36,7 @@
3536
import java.util.ArrayList;
3637
import java.util.List;
3738
import java.util.Objects;
39+
import java.util.stream.Collectors;
3840

3941
/** Entry point to DataBoxManager. */
4042
public final class DataBoxManager {
@@ -89,6 +91,7 @@ public static final class Configurable {
8991
private HttpClient httpClient;
9092
private HttpLogOptions httpLogOptions;
9193
private final List<HttpPipelinePolicy> policies = new ArrayList<>();
94+
private final List<String> scopes = new ArrayList<>();
9295
private RetryPolicy retryPolicy;
9396
private Duration defaultPollInterval;
9497

@@ -128,6 +131,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) {
128131
return this;
129132
}
130133

134+
/**
135+
* Adds the scope to permission sets.
136+
*
137+
* @param scope the scope.
138+
* @return the configurable object itself.
139+
*/
140+
public Configurable withScope(String scope) {
141+
this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
142+
return this;
143+
}
144+
131145
/**
132146
* Sets the retry policy to the HTTP pipeline.
133147
*
@@ -184,20 +198,33 @@ public DataBoxManager authenticate(TokenCredential credential, AzureProfile prof
184198
userAgentBuilder.append(" (auto-generated)");
185199
}
186200

201+
if (scopes.isEmpty()) {
202+
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
203+
}
187204
if (retryPolicy == null) {
188205
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
189206
}
190207
List<HttpPipelinePolicy> policies = new ArrayList<>();
191208
policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
192209
policies.add(new RequestIdPolicy());
210+
policies
211+
.addAll(
212+
this
213+
.policies
214+
.stream()
215+
.filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
216+
.collect(Collectors.toList()));
193217
HttpPolicyProviders.addBeforeRetryPolicies(policies);
194218
policies.add(retryPolicy);
195219
policies.add(new AddDatePolicy());
220+
policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
196221
policies
197-
.add(
198-
new BearerTokenAuthenticationPolicy(
199-
credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
200-
policies.addAll(this.policies);
222+
.addAll(
223+
this
224+
.policies
225+
.stream()
226+
.filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
227+
.collect(Collectors.toList()));
201228
HttpPolicyProviders.addAfterRetryPolicies(policies);
202229
policies.add(new HttpLoggingPolicy(httpLogOptions));
203230
HttpPipeline httpPipeline =

0 commit comments

Comments
 (0)