Skip to content

Commit afbc6b2

Browse files
author
SDKAuto
committed
CodeGen from PR 15098 in Azure/azure-rest-api-specs
Merge d2c24279dfdb648a6f55cabde447621e4a9b98c4 into a59747e42da9d74654106f16c5410620b5941fe0
1 parent 7efc547 commit afbc6b2

File tree

37 files changed

+193
-132
lines changed

37 files changed

+193
-132
lines changed

‎sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/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 (2021-07-08)
44

5+
- Azure Resource Manager MachineLearningServices client library for Java. This package contains Microsoft Azure SDK for MachineLearningServices Management SDK. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2021-04-01. 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-16)
78

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

Lines changed: 3 additions & 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-machinelearningservices</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,8 @@ See [API design][design] for general introduction on design and key concepts on
7474

7575
## Examples
7676

77+
78+
7779
## Troubleshooting
7880

7981
## Next steps

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

Lines changed: 80 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,86 @@
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-machinelearningservices</artifactId>
12-
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-machinelearningservices;current} -->
13-
<packaging>jar</packaging>
10+
<groupId>com.azure.resourcemanager</groupId>
11+
<artifactId>azure-resourcemanager-machinelearningservices</artifactId>
12+
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-machinelearningservices;current} -->
13+
<packaging>jar</packaging>
1414

15-
<name>Microsoft Azure SDK for MachineLearningServices Management</name>
16-
<description>This package contains Microsoft Azure SDK for MachineLearningServices Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2021-04-01.</description>
17-
<url>https://github.com/Azure/azure-sdk-for-java</url>
15+
<name>Microsoft Azure SDK for MachineLearningServices Management</name>
16+
<description>This package contains Microsoft Azure SDK for MachineLearningServices Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. These APIs allow end users to operate on Azure Machine Learning Workspace resources. Package tag package-2021-04-01.</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:[email protected]:Azure/azure-sdk-for-java.git</connection>
30-
<developerConnection>scm:git:[email protected]: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-
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
42-
</properties>
43-
<dependencies>
44-
<dependency>
45-
<groupId>com.azure</groupId>
46-
<artifactId>azure-core</artifactId>
47-
<version>1.18.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.3.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
53-
</dependency>
54-
</dependencies>
55-
<build>
56-
<plugins>
57-
<plugin>
58-
<groupId>org.jacoco</groupId>
59-
<artifactId>jacoco-maven-plugin</artifactId>
60-
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
61-
<configuration>
62-
<skip>true</skip>
63-
</configuration>
64-
</plugin>
65-
</plugins>
66-
</build>
27+
<scm>
28+
<url>https://github.com/Azure/azure-sdk-for-java</url>
29+
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
30+
<developerConnection>scm:git:[email protected]: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+
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
42+
</properties>
43+
<dependencies>
44+
<dependency>
45+
<groupId>com.azure</groupId>
46+
<artifactId>azure-core</artifactId>
47+
<version>1.18.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.3.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
53+
</dependency>
54+
</dependencies>
55+
<build>
56+
<plugins>
57+
<plugin>
58+
<groupId>org.jacoco</groupId>
59+
<artifactId>jacoco-maven-plugin</artifactId>
60+
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
61+
<configuration>
62+
<skip>true</skip>
63+
</configuration>
64+
</plugin>
65+
<plugin>
66+
<groupId>org.revapi</groupId>
67+
<artifactId>revapi-maven-plugin</artifactId>
68+
<version>0.11.2</version> <!-- {x-version-update;org.revapi:revapi-maven-plugin;external_dependency} -->
69+
<configuration>
70+
<analysisConfiguration>
71+
<revapi.ignore>
72+
<item>
73+
<code>java.method.addedToInterface</code>
74+
</item>
75+
<item>
76+
<regex>true</regex>
77+
<code>.*</code>
78+
<package>com\.azure\.resourcemanager(\.[^.]+)+\.fluent(\.[^.]+)*</package>
79+
</item>
80+
</revapi.ignore>
81+
</analysisConfiguration>
82+
</configuration>
83+
</plugin>
84+
</plugins>
85+
</build>
6786
</project>

‎sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/src/main/java/com/azure/resourcemanager/machinelearningservices/MachineLearningServicesManager.java‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
import com.azure.core.http.HttpPipeline;
1010
import com.azure.core.http.HttpPipelineBuilder;
1111
import com.azure.core.http.policy.AddDatePolicy;
12-
import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
1312
import com.azure.core.http.policy.HttpLogOptions;
1413
import com.azure.core.http.policy.HttpLoggingPolicy;
1514
import com.azure.core.http.policy.HttpPipelinePolicy;
1615
import com.azure.core.http.policy.HttpPolicyProviders;
1716
import com.azure.core.http.policy.RequestIdPolicy;
1817
import com.azure.core.http.policy.RetryPolicy;
1918
import com.azure.core.http.policy.UserAgentPolicy;
19+
import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
2020
import com.azure.core.management.profile.AzureProfile;
2121
import com.azure.core.util.Configuration;
2222
import com.azure.core.util.logging.ClientLogger;
@@ -134,6 +134,7 @@ public static final class Configurable {
134134
private HttpClient httpClient;
135135
private HttpLogOptions httpLogOptions;
136136
private final List<HttpPipelinePolicy> policies = new ArrayList<>();
137+
private final List<String> scopes = new ArrayList<>();
137138
private RetryPolicy retryPolicy;
138139
private Duration defaultPollInterval;
139140

@@ -173,6 +174,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) {
173174
return this;
174175
}
175176

177+
/**
178+
* Adds the scope to permission sets.
179+
*
180+
* @param scope the scope.
181+
* @return the configurable object itself.
182+
*/
183+
public Configurable withScope(String scope) {
184+
this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
185+
return this;
186+
}
187+
176188
/**
177189
* Sets the retry policy to the HTTP pipeline.
178190
*
@@ -229,6 +241,9 @@ public MachineLearningServicesManager authenticate(TokenCredential credential, A
229241
userAgentBuilder.append(" (auto-generated)");
230242
}
231243

244+
if (scopes.isEmpty()) {
245+
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
246+
}
232247
if (retryPolicy == null) {
233248
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
234249
}
@@ -238,10 +253,7 @@ public MachineLearningServicesManager authenticate(TokenCredential credential, A
238253
HttpPolicyProviders.addBeforeRetryPolicies(policies);
239254
policies.add(retryPolicy);
240255
policies.add(new AddDatePolicy());
241-
policies
242-
.add(
243-
new BearerTokenAuthenticationPolicy(
244-
credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
256+
policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
245257
policies.addAll(this.policies);
246258
HttpPolicyProviders.addAfterRetryPolicies(policies);
247259
policies.add(new HttpLoggingPolicy(httpLogOptions));

‎sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/src/main/java/com/azure/resourcemanager/machinelearningservices/models/AciServiceCreateRequestDataCollection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
package com.azure.resourcemanager.machinelearningservices.models;
66

7-
import com.azure.core.annotation.Immutable;
7+
import com.azure.core.annotation.Fluent;
88
import com.azure.core.util.logging.ClientLogger;
99
import com.fasterxml.jackson.annotation.JsonIgnore;
1010

1111
/** Details of the data collection options specified. */
12-
@Immutable
12+
@Fluent
1313
public final class AciServiceCreateRequestDataCollection extends ModelDataCollection {
1414
@JsonIgnore private final ClientLogger logger = new ClientLogger(AciServiceCreateRequestDataCollection.class);
1515

‎sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/src/main/java/com/azure/resourcemanager/machinelearningservices/models/AciServiceCreateRequestEncryptionProperties.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
package com.azure.resourcemanager.machinelearningservices.models;
66

7-
import com.azure.core.annotation.Immutable;
7+
import com.azure.core.annotation.Fluent;
88
import com.azure.core.util.logging.ClientLogger;
99
import com.fasterxml.jackson.annotation.JsonIgnore;
1010

1111
/** The encryption properties. */
12-
@Immutable
12+
@Fluent
1313
public final class AciServiceCreateRequestEncryptionProperties extends EncryptionProperties {
1414
@JsonIgnore private final ClientLogger logger = new ClientLogger(AciServiceCreateRequestEncryptionProperties.class);
1515

‎sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/src/main/java/com/azure/resourcemanager/machinelearningservices/models/AciServiceCreateRequestVnetConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
package com.azure.resourcemanager.machinelearningservices.models;
66

7-
import com.azure.core.annotation.Immutable;
7+
import com.azure.core.annotation.Fluent;
88
import com.azure.core.util.logging.ClientLogger;
99
import com.fasterxml.jackson.annotation.JsonIgnore;
1010

1111
/** The virtual network configuration. */
12-
@Immutable
12+
@Fluent
1313
public final class AciServiceCreateRequestVnetConfiguration extends VnetConfiguration {
1414
@JsonIgnore private final ClientLogger logger = new ClientLogger(AciServiceCreateRequestVnetConfiguration.class);
1515

‎sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/src/main/java/com/azure/resourcemanager/machinelearningservices/models/AciServiceResponseDataCollection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
package com.azure.resourcemanager.machinelearningservices.models;
66

7-
import com.azure.core.annotation.Immutable;
7+
import com.azure.core.annotation.Fluent;
88
import com.azure.core.util.logging.ClientLogger;
99
import com.fasterxml.jackson.annotation.JsonIgnore;
1010

1111
/** Details of the data collection options specified. */
12-
@Immutable
12+
@Fluent
1313
public final class AciServiceResponseDataCollection extends ModelDataCollection {
1414
@JsonIgnore private final ClientLogger logger = new ClientLogger(AciServiceResponseDataCollection.class);
1515

‎sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/src/main/java/com/azure/resourcemanager/machinelearningservices/models/AciServiceResponseEncryptionProperties.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
package com.azure.resourcemanager.machinelearningservices.models;
66

7-
import com.azure.core.annotation.Immutable;
7+
import com.azure.core.annotation.Fluent;
88
import com.azure.core.util.logging.ClientLogger;
99
import com.fasterxml.jackson.annotation.JsonIgnore;
1010

1111
/** The encryption properties. */
12-
@Immutable
12+
@Fluent
1313
public final class AciServiceResponseEncryptionProperties extends EncryptionProperties {
1414
@JsonIgnore private final ClientLogger logger = new ClientLogger(AciServiceResponseEncryptionProperties.class);
1515

‎sdk/machinelearningservices/azure-resourcemanager-machinelearningservices/src/main/java/com/azure/resourcemanager/machinelearningservices/models/AciServiceResponseEnvironmentImageRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
package com.azure.resourcemanager.machinelearningservices.models;
66

7-
import com.azure.core.annotation.Immutable;
7+
import com.azure.core.annotation.Fluent;
88
import com.azure.core.util.logging.ClientLogger;
99
import com.fasterxml.jackson.annotation.JsonIgnore;
1010
import java.util.List;
1111

1212
/** The Environment, models and assets used for inferencing. */
13-
@Immutable
13+
@Fluent
1414
public final class AciServiceResponseEnvironmentImageRequest extends EnvironmentImageResponse {
1515
@JsonIgnore private final ClientLogger logger = new ClientLogger(AciServiceResponseEnvironmentImageRequest.class);
1616

0 commit comments

Comments
 (0)