AzureSDKAutomation · openapi-sdkautomation · Sep 17, 2021
diff --git a/sdk/billing/azure-resourcemanager-billing/CHANGELOG.md b/sdk/billing/azure-resourcemanager-billing/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
-## 1.0.0-beta.2 (Unreleased)
+## 1.0.0-beta.1 (2021-09-17)
 
+- Azure Resource Manager Billing client library for Java. This package contains Microsoft Azure SDK for Billing Management SDK. Billing client provides access to billing resources for Azure subscriptions. Package tag package-2020-05. 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-13)
 

diff --git a/sdk/billing/azure-resourcemanager-billing/README.md b/sdk/billing/azure-resourcemanager-billing/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-billing</artifactId>
-    <version>1.0.0-beta.1</version>
+    <version>1.0.0-beta.2</version>
 </dependency>
 ```
 [//]: # ({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/billing/azure-resourcemanager-billing/pom.xml b/sdk/billing/azure-resourcemanager-billing/pom.xml
@@ -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-billing</artifactId>
-    <version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-billing;current} -->
-    <packaging>jar</packaging>
+  <groupId>com.azure.resourcemanager</groupId>
+  <artifactId>azure-resourcemanager-billing</artifactId>
+  <version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-billing;current} -->
+  <packaging>jar</packaging>
 
-    <name>Microsoft Azure SDK for Billing Management</name>
-    <description>This package contains Microsoft Azure SDK for Billing Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Billing client provides access to billing resources for Azure subscriptions. Package tag package-2020-05.</description>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
+  <name>Microsoft Azure SDK for Billing Management</name>
+  <description>This package contains Microsoft Azure SDK for Billing Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Billing client provides access to billing resources for Azure subscriptions. Package tag package-2020-05.</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.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-core-management</artifactId>
-            <version>1.4.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.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+    </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-core-management</artifactId>
+      <version>1.4.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>
diff --git a/...sourcemanager-billing/src/main/java/com/azure/resourcemanager/billing/BillingManager.java b/...sourcemanager-billing/src/main/java/com/azure/resourcemanager/billing/BillingManager.java
@@ -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;
@@ -157,6 +157,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;
 
@@ -196,6 +197,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.
          *
@@ -252,6 +264,9 @@ public BillingManager authenticate(TokenCredential credential, AzureProfile prof
                 userAgentBuilder.append(" (auto-generated)");
             }
 
+            if (scopes.isEmpty()) {
+                scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
+            }
             if (retryPolicy == null) {
                 retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
             }
@@ -261,10 +276,7 @@ public BillingManager authenticate(TokenCredential credential, AzureProfile prof
             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/...ng/src/main/java/com/azure/resourcemanager/billing/fluent/models/BillingProfileInner.java b/...ng/src/main/java/com/azure/resourcemanager/billing/fluent/models/BillingProfileInner.java
@@ -18,6 +18,7 @@
 import com.azure.resourcemanager.billing.models.StatusReasonCode;
 import com.azure.resourcemanager.billing.models.TargetCloud;
 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;
@@ -135,6 +136,7 @@ public class BillingProfileInner extends ProxyResource {
      * Tags of billing profiles.
      */
     @JsonProperty(value = "properties.tags")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, String> tags;
 
     /**

diff --git a/...c/main/java/com/azure/resourcemanager/billing/fluent/models/BillingSubscriptionInner.java b/...c/main/java/com/azure/resourcemanager/billing/fluent/models/BillingSubscriptionInner.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.billing.models.Reseller;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
 import java.util.UUID;
 
 /** A billing subscription. */
@@ -114,6 +115,13 @@ public class BillingSubscriptionInner extends ProxyResource {
     @JsonProperty(value = "properties.skuDescription", access = JsonProperty.Access.WRITE_ONLY)
     private String skuDescription;
 
+    /*
+     * The suspension reason for a subscription. Applies only to subscriptions
+     * in Microsoft Online Services Program billing accounts.
+     */
+    @JsonProperty(value = "properties.suspensionReasons", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> suspensionReasons;
+
     /**
      * Get the displayName property: The name of the subscription.
      *
@@ -285,6 +293,16 @@ public String skuDescription() {
         return this.skuDescription;
     }
 
+    /**
+     * Get the suspensionReasons property: The suspension reason for a subscription. Applies only to subscriptions in
+     * Microsoft Online Services Program billing accounts.
+     *
+     * @return the suspensionReasons value.
+     */
+    public List<String> suspensionReasons() {
+        return this.suspensionReasons;
+    }
+
     /**
      * Validates the instance.
      *

diff --git a/...r-billing/src/main/java/com/azure/resourcemanager/billing/fluent/models/InvoiceInner.java b/...r-billing/src/main/java/com/azure/resourcemanager/billing/fluent/models/InvoiceInner.java
@@ -16,6 +16,7 @@
 import com.azure.resourcemanager.billing.models.PaymentProperties;
 import com.azure.resourcemanager.billing.models.RebillDetails;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.OffsetDateTime;
 import java.util.List;
@@ -163,6 +164,7 @@ public class InvoiceInner extends ProxyResource {
      * Rebill details for an invoice.
      */
     @JsonProperty(value = "properties.rebillDetails", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, RebillDetails> rebillDetails;
 
     /*

diff --git a/...ng/src/main/java/com/azure/resourcemanager/billing/fluent/models/InvoiceSectionInner.java b/...ng/src/main/java/com/azure/resourcemanager/billing/fluent/models/InvoiceSectionInner.java
@@ -11,6 +11,7 @@
 import com.azure.resourcemanager.billing.models.InvoiceSectionState;
 import com.azure.resourcemanager.billing.models.TargetCloud;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -30,6 +31,7 @@ public class InvoiceSectionInner extends ProxyResource {
      * Dictionary of metadata associated with the invoice section.
      */
     @JsonProperty(value = "properties.labels")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, String> labels;
 
     /*
@@ -44,6 +46,15 @@ public class InvoiceSectionInner extends ProxyResource {
     @JsonProperty(value = "properties.systemId", access = JsonProperty.Access.WRITE_ONLY)
     private String systemId;
 
+    /*
+     * Dictionary of metadata associated with the invoice section. Maximum
+     * key/value length supported of 256 characters. Keys/value should not
+     * empty value nor null. Keys can not contain < > % & \ ? /
+     */
+    @JsonProperty(value = "properties.tags")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
+    private Map<String, String> tags;
+
     /*
      * Identifies the cloud environments that are associated with an invoice
      * section. This is a system managed optional field and gets updated as the
@@ -110,6 +121,30 @@ public String systemId() {
         return this.systemId;
     }
 
+    /**
+     * Get the tags property: Dictionary of metadata associated with the invoice section. Maximum key/value length
+     * supported of 256 characters. Keys/value should not empty value nor null. Keys can not contain &lt; &gt; % &amp; \
+     * ? /.
+     *
+     * @return the tags value.
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the tags property: Dictionary of metadata associated with the invoice section. Maximum key/value length
+     * supported of 256 characters. Keys/value should not empty value nor null. Keys can not contain &lt; &gt; % &amp; \
+     * ? /.
+     *
+     * @param tags the tags value to set.
+     * @return the InvoiceSectionInner object itself.
+     */
+    public InvoiceSectionInner withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
     /**
      * Get the targetCloud property: Identifies the cloud environments that are associated with an invoice section. This
      * is a system managed optional field and gets updated as the invoice section gets associated with accounts in

diff --git a/...c/main/java/com/azure/resourcemanager/billing/implementation/BillingSubscriptionImpl.java b/...c/main/java/com/azure/resourcemanager/billing/implementation/BillingSubscriptionImpl.java
@@ -9,6 +9,8 @@
 import com.azure.resourcemanager.billing.models.BillingSubscription;
 import com.azure.resourcemanager.billing.models.BillingSubscriptionStatusType;
 import com.azure.resourcemanager.billing.models.Reseller;
+import java.util.Collections;
+import java.util.List;
 import java.util.UUID;
 
 public final class BillingSubscriptionImpl implements BillingSubscription {
@@ -94,6 +96,15 @@ public String skuDescription() {
         return this.innerModel().skuDescription();
     }
 
+    public List<String> suspensionReasons() {
+        List<String> inner = this.innerModel().suspensionReasons();
+        if (inner != null) {
+            return Collections.unmodifiableList(inner);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
     public BillingSubscriptionInner innerModel() {
         return this.innerObject;
     }