diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/CHANGELOG.md b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/CHANGELOG.md index c2c1cbf3924f..66b7e07588de 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/CHANGELOG.md +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/CHANGELOG.md @@ -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) diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/README.md b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/README.md index 69017d50e0cd..4d0591c4f0d5 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/README.md +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/README.md @@ -32,7 +32,7 @@ Various documentation is available to help you get started com.azure.resourcemanager azure-resourcemanager-datalakeanalytics - 1.0.0-beta.1 + 1.0.0-beta.2 ``` [//]: # ({x-version-update-end}) @@ -74,6 +74,8 @@ See [API design][design] for general introduction on design and key concepts on ## Examples + + ## Troubleshooting ## Next steps diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml index 9c8727a560bb..8aa826b608c9 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml @@ -1,67 +1,86 @@ - 4.0.0 - - com.azure - azure-client-sdk-parent - 1.7.0 - ../../parents/azure-client-sdk-parent - + 4.0.0 + + com.azure + azure-client-sdk-parent + 1.7.0 + ../../parents/azure-client-sdk-parent + - com.azure.resourcemanager - azure-resourcemanager-datalakeanalytics - 1.0.0-beta.2 - jar + com.azure.resourcemanager + azure-resourcemanager-datalakeanalytics + 1.0.0-beta.2 + jar - Microsoft Azure SDK for DataLakeAnalytics Management - 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. - https://github.com/Azure/azure-sdk-for-java + Microsoft Azure SDK for DataLakeAnalytics Management + 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. + https://github.com/Azure/azure-sdk-for-java - - - The MIT License (MIT) - http://opensource.org/licenses/MIT - repo - - + + + The MIT License (MIT) + http://opensource.org/licenses/MIT + repo + + - - https://github.com/Azure/azure-sdk-for-java - scm:git:git@github.com:Azure/azure-sdk-for-java.git - scm:git:git@github.com:Azure/azure-sdk-for-java.git - HEAD - - - - microsoft - Microsoft - - - - UTF-8 - - - - - com.azure - azure-core - 1.18.0 - - - com.azure - azure-core-management - 1.3.1 - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.5 - - true - - - - + + https://github.com/Azure/azure-sdk-for-java + scm:git:git@github.com:Azure/azure-sdk-for-java.git + scm:git:git@github.com:Azure/azure-sdk-for-java.git + HEAD + + + + microsoft + Microsoft + + + + UTF-8 + + + + + com.azure + azure-core + 1.18.0 + + + com.azure + azure-core-management + 1.3.1 + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.5 + + true + + + + org.revapi + revapi-maven-plugin + 0.11.2 + + + + + java.method.addedToInterface + + + true + .* + com\.azure\.resourcemanager(\.[^.]+)+\.fluent(\.[^.]+)* + + + + + + + diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/DataLakeAnalyticsManager.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/DataLakeAnalyticsManager.java index a1342ce293e4..c683b9c6d453 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/DataLakeAnalyticsManager.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/DataLakeAnalyticsManager.java @@ -9,7 +9,6 @@ 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; @@ -17,6 +16,7 @@ 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; @@ -101,6 +101,7 @@ public static final class Configurable { private HttpClient httpClient; private HttpLogOptions httpLogOptions; private final List policies = new ArrayList<>(); + private final List scopes = new ArrayList<>(); private RetryPolicy retryPolicy; private Duration defaultPollInterval; @@ -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. * @@ -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); } @@ -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)); diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/ComputePolicyInner.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/ComputePolicyInner.java index 7964d5f972b5..f9d8902155d1 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/ComputePolicyInner.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/ComputePolicyInner.java @@ -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; @@ -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); diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountBasicInner.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountBasicInner.java index 9d3b0ae18438..c02571a69c21 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountBasicInner.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountBasicInner.java @@ -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; @@ -21,7 +21,7 @@ * account. */ @JsonFlatten -@Immutable +@Fluent public class DataLakeAnalyticsAccountBasicInner extends Resource { @JsonIgnore private final ClientLogger logger = new ClientLogger(DataLakeAnalyticsAccountBasicInner.class); diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountInner.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountInner.java index 639eb629a068..914f65d5f949 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountInner.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeAnalyticsAccountInner.java @@ -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; @@ -104,6 +105,18 @@ public class DataLakeAnalyticsAccountInner extends Resource { @JsonProperty(value = "properties.hiveMetastores", access = JsonProperty.Access.WRITE_ONLY) private List 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. */ @@ -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 @@ -314,6 +345,24 @@ public List 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. * @@ -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. @@ -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()); } diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeStoreAccountInformationInner.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeStoreAccountInformationInner.java index 130f01f6bb9a..45f2e0ab3c1d 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeStoreAccountInformationInner.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/DataLakeStoreAccountInformationInner.java @@ -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; @@ -13,7 +13,7 @@ /** Data Lake Store account information. */ @JsonFlatten -@Immutable +@Fluent public class DataLakeStoreAccountInformationInner extends SubResource { @JsonIgnore private final ClientLogger logger = new ClientLogger(DataLakeStoreAccountInformationInner.class); diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/FirewallRuleInner.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/FirewallRuleInner.java index 128e8ddbcae3..784c55c15cc9 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/FirewallRuleInner.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/FirewallRuleInner.java @@ -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; @@ -13,7 +13,7 @@ /** Data Lake Analytics firewall rule information. */ @JsonFlatten -@Immutable +@Fluent public class FirewallRuleInner extends SubResource { @JsonIgnore private final ClientLogger logger = new ClientLogger(FirewallRuleInner.class); diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/StorageAccountInformationInner.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/StorageAccountInformationInner.java index c53ae5a034de..8fd283405043 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/StorageAccountInformationInner.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/StorageAccountInformationInner.java @@ -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; @@ -13,7 +13,7 @@ /** Azure Storage account information. */ @JsonFlatten -@Immutable +@Fluent public class StorageAccountInformationInner extends SubResource { @JsonIgnore private final ClientLogger logger = new ClientLogger(StorageAccountInformationInner.class); diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/StorageContainerInner.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/StorageContainerInner.java index 596ac1b6a4b1..9585c78c3464 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/StorageContainerInner.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/fluent/models/StorageContainerInner.java @@ -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; @@ -14,7 +14,7 @@ /** Azure Storage blob container information. */ @JsonFlatten -@Immutable +@Fluent public class StorageContainerInner extends SubResource { @JsonIgnore private final ClientLogger logger = new ClientLogger(StorageContainerInner.class); diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/implementation/DataLakeAnalyticsAccountImpl.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/implementation/DataLakeAnalyticsAccountImpl.java index 6a6a3d371102..3b5126751e2d 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/implementation/DataLakeAnalyticsAccountImpl.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/implementation/DataLakeAnalyticsAccountImpl.java @@ -18,6 +18,7 @@ import com.azure.resourcemanager.datalakeanalytics.models.CreateDataLakeAnalyticsAccountParameters; import com.azure.resourcemanager.datalakeanalytics.models.CreateFirewallRuleWithAccountParameters; import com.azure.resourcemanager.datalakeanalytics.models.DataLakeAnalyticsAccount; +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.DataLakeStoreAccountInformation; @@ -165,6 +166,14 @@ public List hiveMetastores() { } } + public DataLakeAnalyticsAccountPropertiesHierarchicalQueue hierarchicalQueue() { + return this.innerModel().hierarchicalQueue(); + } + + public String hierarchicalQueueState() { + return this.innerModel().hierarchicalQueueState(); + } + public List virtualNetworkRules() { List inner = this.innerModel().virtualNetworkRules(); if (inner != null) { @@ -208,6 +217,18 @@ public Integer maxJobCount() { return this.innerModel().maxJobCount(); } + public Integer maxActiveJobCountPerUser() { + return this.innerModel().maxActiveJobCountPerUser(); + } + + public Integer maxQueuedJobCountPerUser() { + return this.innerModel().maxQueuedJobCountPerUser(); + } + + public Integer maxJobRunningTimeInMin() { + return this.innerModel().maxJobRunningTimeInMin(); + } + public Integer systemMaxJobCount() { return this.innerModel().systemMaxJobCount(); } diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/CreateDataLakeAnalyticsAccountParameters.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/CreateDataLakeAnalyticsAccountParameters.java index 25baa2a72a8e..60ef4c45937a 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/CreateDataLakeAnalyticsAccountParameters.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/CreateDataLakeAnalyticsAccountParameters.java @@ -8,6 +8,7 @@ import com.azure.core.annotation.JsonFlatten; import com.azure.core.util.logging.ClientLogger; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; import java.util.Map; @@ -28,6 +29,7 @@ public class CreateDataLakeAnalyticsAccountParameters { * The resource tags. */ @JsonProperty(value = "tags") + @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) private Map tags; /* diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccount.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccount.java index 035992ac9f92..b2d33f14e846 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccount.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccount.java @@ -133,6 +133,20 @@ public interface DataLakeAnalyticsAccount { */ List hiveMetastores(); + /** + * Gets the hierarchicalQueue property: The hierarchical queue associated with this account. + * + * @return the hierarchicalQueue value. + */ + DataLakeAnalyticsAccountPropertiesHierarchicalQueue hierarchicalQueue(); + + /** + * Gets the hierarchicalQueueState property: The hierarchical queue state associated with this account. + * + * @return the hierarchicalQueueState value. + */ + String hierarchicalQueueState(); + /** * Gets the virtualNetworkRules property: The list of virtualNetwork rules associated with this account. * @@ -183,6 +197,27 @@ public interface DataLakeAnalyticsAccount { */ Integer maxJobCount(); + /** + * Gets the maxActiveJobCountPerUser property: The maximum supported active jobs under the account at the same time. + * + * @return the maxActiveJobCountPerUser value. + */ + Integer maxActiveJobCountPerUser(); + + /** + * Gets the maxQueuedJobCountPerUser property: The maximum supported jobs queued under the account at the same time. + * + * @return the maxQueuedJobCountPerUser value. + */ + Integer maxQueuedJobCountPerUser(); + + /** + * Gets the maxJobRunningTimeInMin property: The maximum supported active jobs under the account at the same time. + * + * @return the maxJobRunningTimeInMin value. + */ + Integer maxJobRunningTimeInMin(); + /** * Gets 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. diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccountProperties.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccountProperties.java index f490682a1ca5..64b952ee4c89 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccountProperties.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccountProperties.java @@ -58,6 +58,18 @@ public final class DataLakeAnalyticsAccountProperties extends DataLakeAnalyticsA @JsonProperty(value = "hiveMetastores", access = JsonProperty.Access.WRITE_ONLY) private List hiveMetastores; + /* + * The hierarchical queue associated with this account. + */ + @JsonProperty(value = "hierarchicalQueue", access = JsonProperty.Access.WRITE_ONLY) + private DataLakeAnalyticsAccountPropertiesHierarchicalQueue hierarchicalQueue; + + /* + * The hierarchical queue state associated with this account. + */ + @JsonProperty(value = "hierarchicalQueueState", access = JsonProperty.Access.WRITE_ONLY) + private String hierarchicalQueueState; + /* * The list of virtualNetwork rules associated with this account. */ @@ -102,6 +114,24 @@ public final class DataLakeAnalyticsAccountProperties extends DataLakeAnalyticsA @JsonProperty(value = "maxJobCount") private Integer maxJobCount; + /* + * The maximum supported active jobs under the account at the same time. + */ + @JsonProperty(value = "maxActiveJobCountPerUser", access = JsonProperty.Access.WRITE_ONLY) + private Integer maxActiveJobCountPerUser; + + /* + * The maximum supported jobs queued under the account at the same time. + */ + @JsonProperty(value = "maxQueuedJobCountPerUser", access = JsonProperty.Access.WRITE_ONLY) + private Integer maxQueuedJobCountPerUser; + + /* + * The maximum supported active jobs under the account at the same time. + */ + @JsonProperty(value = "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 @@ -214,6 +244,24 @@ public List 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. * @@ -324,6 +372,33 @@ public DataLakeAnalyticsAccountProperties 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. @@ -447,6 +522,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()); } diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccountPropertiesHierarchicalQueue.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccountPropertiesHierarchicalQueue.java new file mode 100644 index 000000000000..f1bcb3b43363 --- /dev/null +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/DataLakeAnalyticsAccountPropertiesHierarchicalQueue.java @@ -0,0 +1,51 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.resourcemanager.datalakeanalytics.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.util.logging.ClientLogger; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** The hierarchical queue associated with this account. */ +@Fluent +public final class DataLakeAnalyticsAccountPropertiesHierarchicalQueue { + @JsonIgnore + private final ClientLogger logger = new ClientLogger(DataLakeAnalyticsAccountPropertiesHierarchicalQueue.class); + + /* + * Any object + */ + @JsonProperty(value = "root") + private Object root; + + /** + * Get the root property: Any object. + * + * @return the root value. + */ + public Object root() { + return this.root; + } + + /** + * Set the root property: Any object. + * + * @param root the root value to set. + * @return the DataLakeAnalyticsAccountPropertiesHierarchicalQueue object itself. + */ + public DataLakeAnalyticsAccountPropertiesHierarchicalQueue withRoot(Object root) { + this.root = root; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + } +} diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/HiveMetastore.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/HiveMetastore.java index cb138091cb80..1caaf944f142 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/HiveMetastore.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/HiveMetastore.java @@ -4,7 +4,7 @@ package com.azure.resourcemanager.datalakeanalytics.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; @@ -13,7 +13,7 @@ /** The HiveMetastore model. */ @JsonFlatten -@Immutable +@Fluent public class HiveMetastore extends SubResource { @JsonIgnore private final ClientLogger logger = new ClientLogger(HiveMetastore.class); diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/UpdateDataLakeAnalyticsAccountParameters.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/UpdateDataLakeAnalyticsAccountParameters.java index 454c278f8518..b57ed3b78e68 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/UpdateDataLakeAnalyticsAccountParameters.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/UpdateDataLakeAnalyticsAccountParameters.java @@ -8,6 +8,7 @@ import com.azure.core.annotation.JsonFlatten; import com.azure.core.util.logging.ClientLogger; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; import java.util.Map; @@ -22,6 +23,7 @@ public class UpdateDataLakeAnalyticsAccountParameters { * The resource tags. */ @JsonProperty(value = "tags") + @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS) private Map tags; /* diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/VirtualNetworkRule.java b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/VirtualNetworkRule.java index e8a314d78737..8494a29a6867 100644 --- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/VirtualNetworkRule.java +++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/src/main/java/com/azure/resourcemanager/datalakeanalytics/models/VirtualNetworkRule.java @@ -4,7 +4,7 @@ package com.azure.resourcemanager.datalakeanalytics.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; @@ -13,7 +13,7 @@ /** Data Lake Analytics VirtualNetwork Rule information. */ @JsonFlatten -@Immutable +@Fluent public class VirtualNetworkRule extends SubResource { @JsonIgnore private final ClientLogger logger = new ClientLogger(VirtualNetworkRule.class);