Skip to content

[AutoPR azure-resourcemanager-datalakeanalytics] Web ant94 2021 02 01 - resolve conflict in service branch #10268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[AutoPR azure-resourcemanager-datalakeanalytics] Web ant94 2021 02 01 - resolve conflict in service branch #10268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Release History

## 1.0.0-beta.2 (Unreleased)
## 1.0.0-beta.1 (2021-08-06)

- Azure Resource Manager DataLakeAnalytics client library for Java. This package contains Microsoft Azure SDK for DataLakeAnalytics Management SDK. Creates an Azure Data Lake Analytics account management client. Package tag package-2016-11. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

## 1.0.0-beta.1 (2021-04-22)

Expand Down
4 changes: 3 additions & 1 deletion sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Various documentation is available to help you get started
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-datalakeanalytics</artifactId>
<version>1.0.0-beta.1</version>
<version>1.0.0-beta.2</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down Expand Up @@ -74,6 +74,8 @@ See [API design][design] for general introduction on design and key concepts on

## Examples



## Troubleshooting

## Next steps
Expand Down
141 changes: 80 additions & 61 deletions sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,86 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
<relativePath>../../parents/azure-client-sdk-parent</relativePath>
</parent>

<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-datalakeanalytics</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-datalakeanalytics;current} -->
<packaging>jar</packaging>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-datalakeanalytics</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-datalakeanalytics;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure SDK for DataLakeAnalytics Management</name>
<description>This package contains Microsoft Azure SDK for DataLakeAnalytics Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Creates an Azure Data Lake Analytics account management client. Package tag package-2016-11.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<name>Microsoft Azure SDK for DataLakeAnalytics Management</name>
<description>This package contains Microsoft Azure SDK for DataLakeAnalytics Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Creates an Azure Data Lake Analytics account management client. Package tag package-2016-11.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>

<licenses>
<license>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
<licenses>
<license>
<name>The MIT License (MIT)</name>
<url>http://opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
<developerConnection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</developerConnection>
<tag>HEAD</tag>
</scm>
<developers>
<developer>
<id>microsoft</id>
<name>Microsoft</name>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
</properties>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.18.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.3.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<scm>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
<developerConnection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</developerConnection>
<tag>HEAD</tag>
</scm>
<developers>
<developer>
<id>microsoft</id>
<name>Microsoft</name>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
</properties>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.18.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.3.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
<version>0.11.2</version> <!-- {x-version-update;org.revapi:revapi-maven-plugin;external_dependency} -->
<configuration>
<analysisConfiguration>
<revapi.ignore>
<item>
<code>java.method.addedToInterface</code>
</item>
<item>
<regex>true</regex>
<code>.*</code>
<package>com\.azure\.resourcemanager(\.[^.]+)+\.fluent(\.[^.]+)*</package>
</item>
</revapi.ignore>
</analysisConfiguration>
</configuration>
</plugin>
</plugins>
</build>
</project>
22 changes: 17 additions & 5 deletions ...s/src/main/java/com/azure/resourcemanager/datalakeanalytics/DataLakeAnalyticsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import com.azure.core.http.HttpPipeline;
import com.azure.core.http.HttpPipelineBuilder;
import com.azure.core.http.policy.AddDatePolicy;
import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
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.RetryPolicy;
import com.azure.core.http.policy.UserAgentPolicy;
import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
import com.azure.core.management.profile.AzureProfile;
import com.azure.core.util.Configuration;
import com.azure.core.util.logging.ClientLogger;
Expand Down Expand Up @@ -101,6 +101,7 @@ public static final class Configurable {
private HttpClient httpClient;
private HttpLogOptions httpLogOptions;
private final List<HttpPipelinePolicy> policies = new ArrayList<>();
private final List<String> scopes = new ArrayList<>();
private RetryPolicy retryPolicy;
private Duration defaultPollInterval;

Expand Down Expand Up @@ -140,6 +141,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) {
return this;
}

/**
* Adds the scope to permission sets.
*
* @param scope the scope.
* @return the configurable object itself.
*/
public Configurable withScope(String scope) {
this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
return this;
}

/**
* Sets the retry policy to the HTTP pipeline.
*
Expand Down Expand Up @@ -196,6 +208,9 @@ public DataLakeAnalyticsManager authenticate(TokenCredential credential, AzurePr
userAgentBuilder.append(" (auto-generated)");
}

if (scopes.isEmpty()) {
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
}
if (retryPolicy == null) {
retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
}
Expand All @@ -205,10 +220,7 @@ public DataLakeAnalyticsManager authenticate(TokenCredential credential, AzurePr
HttpPolicyProviders.addBeforeRetryPolicies(policies);
policies.add(retryPolicy);
policies.add(new AddDatePolicy());
policies
.add(
new BearerTokenAuthenticationPolicy(
credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
policies.addAll(this.policies);
HttpPolicyProviders.addAfterRetryPolicies(policies);
policies.add(new HttpLoggingPolicy(httpLogOptions));
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/ComputePolicyInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package com.azure.resourcemanager.datalakeanalytics.fluent.models;

import com.azure.core.annotation.Immutable;
import com.azure.core.annotation.Fluent;
import com.azure.core.annotation.JsonFlatten;
import com.azure.core.management.SubResource;
import com.azure.core.util.logging.ClientLogger;
Expand All @@ -15,7 +15,7 @@

/** Data Lake Analytics compute policy information. */
@JsonFlatten
@Immutable
@Fluent
public class ComputePolicyInner extends SubResource {
@JsonIgnore private final ClientLogger logger = new ClientLogger(ComputePolicyInner.class);

Expand Down
4 changes: 2 additions & 2 deletions ...e/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountBasicInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package com.azure.resourcemanager.datalakeanalytics.fluent.models;

import com.azure.core.annotation.Immutable;
import com.azure.core.annotation.Fluent;
import com.azure.core.annotation.JsonFlatten;
import com.azure.core.management.Resource;
import com.azure.core.util.logging.ClientLogger;
Expand All @@ -21,7 +21,7 @@
* account.
*/
@JsonFlatten
@Immutable
@Fluent
public class DataLakeAnalyticsAccountBasicInner extends Resource {
@JsonIgnore private final ClientLogger logger = new ClientLogger(DataLakeAnalyticsAccountBasicInner.class);

Expand Down
79 changes: 79 additions & 0 deletions .../azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.azure.core.annotation.JsonFlatten;
import com.azure.core.management.Resource;
import com.azure.core.util.logging.ClientLogger;
import com.azure.resourcemanager.datalakeanalytics.models.DataLakeAnalyticsAccountPropertiesHierarchicalQueue;
import com.azure.resourcemanager.datalakeanalytics.models.DataLakeAnalyticsAccountState;
import com.azure.resourcemanager.datalakeanalytics.models.DataLakeAnalyticsAccountStatus;
import com.azure.resourcemanager.datalakeanalytics.models.DebugDataAccessLevel;
Expand Down Expand Up @@ -104,6 +105,18 @@ public class DataLakeAnalyticsAccountInner extends Resource {
@JsonProperty(value = "properties.hiveMetastores", access = JsonProperty.Access.WRITE_ONLY)
private List<HiveMetastore> hiveMetastores;

/*
* The hierarchical queue associated with this account.
*/
@JsonProperty(value = "properties.hierarchicalQueue", access = JsonProperty.Access.WRITE_ONLY)
private DataLakeAnalyticsAccountPropertiesHierarchicalQueue hierarchicalQueue;

/*
* The hierarchical queue state associated with this account.
*/
@JsonProperty(value = "properties.hierarchicalQueueState", access = JsonProperty.Access.WRITE_ONLY)
private String hierarchicalQueueState;

/*
* The list of virtualNetwork rules associated with this account.
*/
Expand Down Expand Up @@ -148,6 +161,24 @@ public class DataLakeAnalyticsAccountInner extends Resource {
@JsonProperty(value = "properties.maxJobCount")
private Integer maxJobCount;

/*
* The maximum supported active jobs under the account at the same time.
*/
@JsonProperty(value = "properties.maxActiveJobCountPerUser", access = JsonProperty.Access.WRITE_ONLY)
private Integer maxActiveJobCountPerUser;

/*
* The maximum supported jobs queued under the account at the same time.
*/
@JsonProperty(value = "properties.maxQueuedJobCountPerUser", access = JsonProperty.Access.WRITE_ONLY)
private Integer maxQueuedJobCountPerUser;

/*
* The maximum supported active jobs under the account at the same time.
*/
@JsonProperty(value = "properties.maxJobRunningTimeInMin", access = JsonProperty.Access.WRITE_ONLY)
private Integer maxJobRunningTimeInMin;

/*
* The system defined maximum supported jobs running under the account at
* the same time, which restricts the maximum number of running jobs the
Expand Down Expand Up @@ -314,6 +345,24 @@ public List<HiveMetastore> hiveMetastores() {
return this.hiveMetastores;
}

/**
* Get the hierarchicalQueue property: The hierarchical queue associated with this account.
*
* @return the hierarchicalQueue value.
*/
public DataLakeAnalyticsAccountPropertiesHierarchicalQueue hierarchicalQueue() {
return this.hierarchicalQueue;
}

/**
* Get the hierarchicalQueueState property: The hierarchical queue state associated with this account.
*
* @return the hierarchicalQueueState value.
*/
public String hierarchicalQueueState() {
return this.hierarchicalQueueState;
}

/**
* Get the virtualNetworkRules property: The list of virtualNetwork rules associated with this account.
*
Expand Down Expand Up @@ -423,6 +472,33 @@ public DataLakeAnalyticsAccountInner withMaxJobCount(Integer maxJobCount) {
return this;
}

/**
* Get the maxActiveJobCountPerUser property: The maximum supported active jobs under the account at the same time.
*
* @return the maxActiveJobCountPerUser value.
*/
public Integer maxActiveJobCountPerUser() {
return this.maxActiveJobCountPerUser;
}

/**
* Get the maxQueuedJobCountPerUser property: The maximum supported jobs queued under the account at the same time.
*
* @return the maxQueuedJobCountPerUser value.
*/
public Integer maxQueuedJobCountPerUser() {
return this.maxQueuedJobCountPerUser;
}

/**
* Get the maxJobRunningTimeInMin property: The maximum supported active jobs under the account at the same time.
*
* @return the maxJobRunningTimeInMin value.
*/
public Integer maxJobRunningTimeInMin() {
return this.maxJobRunningTimeInMin;
}

/**
* Get the systemMaxJobCount property: The system defined maximum supported jobs running under the account at the
* same time, which restricts the maximum number of running jobs the user can set for the account.
Expand Down Expand Up @@ -558,6 +634,9 @@ public void validate() {
if (hiveMetastores() != null) {
hiveMetastores().forEach(e -> e.validate());
}
if (hierarchicalQueue() != null) {
hierarchicalQueue().validate();
}
if (virtualNetworkRules() != null) {
virtualNetworkRules().forEach(e -> e.validate());
}
Expand Down
Loading