Azure · azure-sdk · May 7, 2021
diff --git a/sdk/iothub/azure-resourcemanager-iothub/CHANGELOG.md b/sdk/iothub/azure-resourcemanager-iothub/CHANGELOG.md
@@ -1,7 +1,20 @@
 # Release History
 
-## 1.0.0-beta.2 (Unreleased)
+## 1.0.0-beta.2 (2021-05-07)
 
+- Azure Resource Manager IotHub client library for Java. This package contains Microsoft Azure SDK for IotHub Management SDK. Use this API to manage the IoT hubs in your Azure subscription. Package tag package-2020-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+
+### Breaking Change
+
+#### `models.CertificateDescription$Update` was modified
+
+* `withIfMatch(java.lang.String)` was removed
+
+### New Feature
+
+#### `models.CertificateDescription$Update` was modified
+
+* `ifMatch(java.lang.String)` was added
 
 ## 1.0.0-beta.1 (2021-03-02)
 

diff --git a/sdk/iothub/azure-resourcemanager-iothub/README.md b/sdk/iothub/azure-resourcemanager-iothub/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-iothub</artifactId>
-    <version>1.0.0-beta.1</version>
+    <version>1.0.0-beta.2</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/iothub/azure-resourcemanager-iothub/pom.xml b/sdk/iothub/azure-resourcemanager-iothub/pom.xml
@@ -13,7 +13,7 @@
     <packaging>jar</packaging>
 
     <name>Microsoft Azure SDK for IotHub Management</name>
-    <description>This package contains Microsoft Azure SDK for IotHub Management SDK. Use this API to manage the IoT hubs in your Azure subscription. Package tag package-2020-03. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt</description>
+    <description>This package contains Microsoft Azure SDK for IotHub Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Use this API to manage the IoT hubs in your Azure subscription. Package tag package-2020-03.</description>
     <url>https://github.com/Azure/azure-sdk-for-java</url>
 
     <licenses>

diff --git a/...-resourcemanager-iothub/src/main/java/com/azure/resourcemanager/iothub/IotHubManager.java b/...-resourcemanager-iothub/src/main/java/com/azure/resourcemanager/iothub/IotHubManager.java
@@ -182,7 +182,7 @@ public IotHubManager authenticate(TokenCredential credential, AzureProfile profi
                 .append("-")
                 .append("com.azure.resourcemanager.iothub")
                 .append("/")
-                .append("1.0.0-beta.1");
+                .append("1.0.0-beta.2");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
@@ -209,6 +209,7 @@ public IotHubManager authenticate(TokenCredential credential, AzureProfile profi
                 .add(
                     new BearerTokenAuthenticationPolicy(
                         credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
+            policies.addAll(this.policies);
             HttpPolicyProviders.addAfterRetryPolicies(policies);
             policies.add(new HttpLoggingPolicy(httpLogOptions));
             HttpPipeline httpPipeline =

diff --git a/...r-iothub/src/main/java/com/azure/resourcemanager/iothub/fluent/IotHubResourcesClient.java b/...r-iothub/src/main/java/com/azure/resourcemanager/iothub/fluent/IotHubResourcesClient.java
@@ -64,7 +64,8 @@ Response<IotHubDescriptionInner> getByResourceGroupWithResponse(
     /**
      * Create or update the metadata of an Iot hub. The usual pattern to modify a property is to retrieve the IoT hub
      * metadata and security metadata, and then combine them with the modified values in a new body to update the IoT
-     * hub.
+     * hub. If certain properties are missing in the JSON, updating IoT Hub may cause these values to fallback to
+     * default, which may lead to unexpected behavior.
      *
      * @param resourceGroupName The name of the resource group that contains the IoT hub.
      * @param resourceName The name of the IoT hub.
@@ -84,7 +85,8 @@ SyncPoller<PollResult<IotHubDescriptionInner>, IotHubDescriptionInner> beginCrea
     /**
      * Create or update the metadata of an Iot hub. The usual pattern to modify a property is to retrieve the IoT hub
      * metadata and security metadata, and then combine them with the modified values in a new body to update the IoT
-     * hub.
+     * hub. If certain properties are missing in the JSON, updating IoT Hub may cause these values to fallback to
+     * default, which may lead to unexpected behavior.
      *
      * @param resourceGroupName The name of the resource group that contains the IoT hub.
      * @param resourceName The name of the IoT hub.
@@ -109,7 +111,8 @@ SyncPoller<PollResult<IotHubDescriptionInner>, IotHubDescriptionInner> beginCrea
     /**
      * Create or update the metadata of an Iot hub. The usual pattern to modify a property is to retrieve the IoT hub
      * metadata and security metadata, and then combine them with the modified values in a new body to update the IoT
-     * hub.
+     * hub. If certain properties are missing in the JSON, updating IoT Hub may cause these values to fallback to
+     * default, which may lead to unexpected behavior.
      *
      * @param resourceGroupName The name of the resource group that contains the IoT hub.
      * @param resourceName The name of the IoT hub.
@@ -129,7 +132,8 @@ IotHubDescriptionInner createOrUpdate(
     /**
      * Create or update the metadata of an Iot hub. The usual pattern to modify a property is to retrieve the IoT hub
      * metadata and security metadata, and then combine them with the modified values in a new body to update the IoT
-     * hub.
+     * hub. If certain properties are missing in the JSON, updating IoT Hub may cause these values to fallback to
+     * default, which may lead to unexpected behavior.
      *
      * @param resourceGroupName The name of the resource group that contains the IoT hub.
      * @param resourceName The name of the IoT hub.
@@ -147,7 +151,8 @@ IotHubDescriptionInner createOrUpdate(
     /**
      * Create or update the metadata of an Iot hub. The usual pattern to modify a property is to retrieve the IoT hub
      * metadata and security metadata, and then combine them with the modified values in a new body to update the IoT
-     * hub.
+     * hub. If certain properties are missing in the JSON, updating IoT Hub may cause these values to fallback to
+     * default, which may lead to unexpected behavior.
      *
      * @param resourceGroupName The name of the resource group that contains the IoT hub.
      * @param resourceName The name of the IoT hub.

diff --git a/...main/java/com/azure/resourcemanager/iothub/implementation/CertificateDescriptionImpl.java b/...main/java/com/azure/resourcemanager/iothub/implementation/CertificateDescriptionImpl.java
@@ -5,7 +5,6 @@
 package com.azure.resourcemanager.iothub.implementation;
 
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.iothub.IotHubManager;
 import com.azure.resourcemanager.iothub.fluent.models.CertificateDescriptionInner;
 import com.azure.resourcemanager.iothub.models.CertificateBodyDescription;
 import com.azure.resourcemanager.iothub.models.CertificateDescription;
@@ -15,7 +14,7 @@ public final class CertificateDescriptionImpl
     implements CertificateDescription, CertificateDescription.Definition, CertificateDescription.Update {
     private CertificateDescriptionInner innerObject;
 
-    private final IotHubManager serviceManager;
+    private final com.azure.resourcemanager.iothub.IotHubManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -41,7 +40,7 @@ public CertificateDescriptionInner innerModel() {
         return this.innerObject;
     }
 
-    private IotHubManager manager() {
+    private com.azure.resourcemanager.iothub.IotHubManager manager() {
         return this.serviceManager;
     }
 
@@ -97,7 +96,7 @@ public CertificateDescription create(Context context) {
         return this;
     }
 
-    CertificateDescriptionImpl(String name, IotHubManager serviceManager) {
+    CertificateDescriptionImpl(String name, com.azure.resourcemanager.iothub.IotHubManager serviceManager) {
         this.innerObject = new CertificateDescriptionInner();
         this.serviceManager = serviceManager;
         this.certificateName = name;
@@ -143,7 +142,8 @@ public CertificateDescription apply(Context context) {
         return this;
     }
 
-    CertificateDescriptionImpl(CertificateDescriptionInner innerObject, IotHubManager serviceManager) {
+    CertificateDescriptionImpl(
+        CertificateDescriptionInner innerObject, com.azure.resourcemanager.iothub.IotHubManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
@@ -182,13 +182,13 @@ public CertificateDescriptionImpl withCertificate(String certificate) {
     }
 
     public CertificateDescriptionImpl withIfMatch(String ifMatch) {
-        if (isInCreateMode()) {
-            this.createIfMatch = ifMatch;
-            return this;
-        } else {
-            this.updateIfMatch = ifMatch;
-            return this;
-        }
+        this.createIfMatch = ifMatch;
+        return this;
+    }
+
+    public CertificateDescriptionImpl ifMatch(String ifMatch) {
+        this.updateIfMatch = ifMatch;
+        return this;
     }
 
     private boolean isInCreateMode() {

diff --git a/.../java/com/azure/resourcemanager/iothub/implementation/CertificateListDescriptionImpl.java b/.../java/com/azure/resourcemanager/iothub/implementation/CertificateListDescriptionImpl.java
@@ -4,7 +4,6 @@
 
 package com.azure.resourcemanager.iothub.implementation;
 
-import com.azure.resourcemanager.iothub.IotHubManager;
 import com.azure.resourcemanager.iothub.fluent.models.CertificateDescriptionInner;
 import com.azure.resourcemanager.iothub.fluent.models.CertificateListDescriptionInner;
 import com.azure.resourcemanager.iothub.models.CertificateDescription;
@@ -16,9 +15,10 @@
 public final class CertificateListDescriptionImpl implements CertificateListDescription {
     private CertificateListDescriptionInner innerObject;
 
-    private final IotHubManager serviceManager;
+    private final com.azure.resourcemanager.iothub.IotHubManager serviceManager;
 
-    CertificateListDescriptionImpl(CertificateListDescriptionInner innerObject, IotHubManager serviceManager) {
+    CertificateListDescriptionImpl(
+        CertificateListDescriptionInner innerObject, com.azure.resourcemanager.iothub.IotHubManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -41,7 +41,7 @@ public CertificateListDescriptionInner innerModel() {
         return this.innerObject;
     }
 
-    private IotHubManager manager() {
+    private com.azure.resourcemanager.iothub.IotHubManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/.../com/azure/resourcemanager/iothub/implementation/CertificateWithNonceDescriptionImpl.java b/.../com/azure/resourcemanager/iothub/implementation/CertificateWithNonceDescriptionImpl.java
@@ -4,18 +4,18 @@
 
 package com.azure.resourcemanager.iothub.implementation;
 
-import com.azure.resourcemanager.iothub.IotHubManager;
 import com.azure.resourcemanager.iothub.fluent.models.CertificateWithNonceDescriptionInner;
 import com.azure.resourcemanager.iothub.models.CertificatePropertiesWithNonce;
 import com.azure.resourcemanager.iothub.models.CertificateWithNonceDescription;
 
 public final class CertificateWithNonceDescriptionImpl implements CertificateWithNonceDescription {
     private CertificateWithNonceDescriptionInner innerObject;
 
-    private final IotHubManager serviceManager;
+    private final com.azure.resourcemanager.iothub.IotHubManager serviceManager;
 
     CertificateWithNonceDescriptionImpl(
-        CertificateWithNonceDescriptionInner innerObject, IotHubManager serviceManager) {
+        CertificateWithNonceDescriptionInner innerObject,
+        com.azure.resourcemanager.iothub.IotHubManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -44,7 +44,7 @@ public CertificateWithNonceDescriptionInner innerModel() {
         return this.innerObject;
     }
 
-    private IotHubManager manager() {
+    private com.azure.resourcemanager.iothub.IotHubManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/...src/main/java/com/azure/resourcemanager/iothub/implementation/CertificatesClientImpl.java b/...src/main/java/com/azure/resourcemanager/iothub/implementation/CertificatesClientImpl.java
@@ -209,7 +209,7 @@ private Mono<Response<CertificateListDescriptionInner>> listByIotHubWithResponse
                             resourceName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -364,7 +364,7 @@ private Mono<Response<CertificateDescriptionInner>> getWithResponseAsync(
                             certificateName,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -545,7 +545,7 @@ private Mono<Response<CertificateDescriptionInner>> createOrUpdateWithResponseAs
                             certificateDescription,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -788,7 +788,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(
                             ifMatch,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -959,7 +959,7 @@ private Mono<Response<CertificateWithNonceDescriptionInner>> generateVerificatio
                             ifMatch,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -1159,7 +1159,7 @@ private Mono<Response<CertificateDescriptionInner>> verifyWithResponseAsync(
                             certificateVerificationBody,
                             accept,
                             context))
-            .subscriberContext(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext())));
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**

diff --git a/...othub/src/main/java/com/azure/resourcemanager/iothub/implementation/CertificatesImpl.java b/...othub/src/main/java/com/azure/resourcemanager/iothub/implementation/CertificatesImpl.java
@@ -8,7 +8,6 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.iothub.IotHubManager;
 import com.azure.resourcemanager.iothub.fluent.CertificatesClient;
 import com.azure.resourcemanager.iothub.fluent.models.CertificateDescriptionInner;
 import com.azure.resourcemanager.iothub.fluent.models.CertificateListDescriptionInner;
@@ -25,9 +24,10 @@ public final class CertificatesImpl implements Certificates {
 
     private final CertificatesClient innerClient;
 
-    private final IotHubManager serviceManager;
+    private final com.azure.resourcemanager.iothub.IotHubManager serviceManager;
 
-    public CertificatesImpl(CertificatesClient innerClient, IotHubManager serviceManager) {
+    public CertificatesImpl(
+        CertificatesClient innerClient, com.azure.resourcemanager.iothub.IotHubManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -271,7 +271,7 @@ private CertificatesClient serviceClient() {
         return this.innerClient;
     }
 
-    private IotHubManager manager() {
+    private com.azure.resourcemanager.iothub.IotHubManager manager() {
         return this.serviceManager;
     }
 

diff --git a/...src/main/java/com/azure/resourcemanager/iothub/implementation/EndpointHealthDataImpl.java b/...src/main/java/com/azure/resourcemanager/iothub/implementation/EndpointHealthDataImpl.java
@@ -4,17 +4,17 @@
 
 package com.azure.resourcemanager.iothub.implementation;
 
-import com.azure.resourcemanager.iothub.IotHubManager;
 import com.azure.resourcemanager.iothub.fluent.models.EndpointHealthDataInner;
 import com.azure.resourcemanager.iothub.models.EndpointHealthData;
 import com.azure.resourcemanager.iothub.models.EndpointHealthStatus;
 
 public final class EndpointHealthDataImpl implements EndpointHealthData {
     private EndpointHealthDataInner innerObject;
 
-    private final IotHubManager serviceManager;
+    private final com.azure.resourcemanager.iothub.IotHubManager serviceManager;
 
-    EndpointHealthDataImpl(EndpointHealthDataInner innerObject, IotHubManager serviceManager) {
+    EndpointHealthDataImpl(
+        EndpointHealthDataInner innerObject, com.azure.resourcemanager.iothub.IotHubManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -31,7 +31,7 @@ public EndpointHealthDataInner innerModel() {
         return this.innerObject;
     }
 
-    private IotHubManager manager() {
+    private com.azure.resourcemanager.iothub.IotHubManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/...n/java/com/azure/resourcemanager/iothub/implementation/EventHubConsumerGroupInfoImpl.java b/...n/java/com/azure/resourcemanager/iothub/implementation/EventHubConsumerGroupInfoImpl.java
@@ -4,7 +4,6 @@
 
 package com.azure.resourcemanager.iothub.implementation;
 
-import com.azure.resourcemanager.iothub.IotHubManager;
 import com.azure.resourcemanager.iothub.fluent.models.EventHubConsumerGroupInfoInner;
 import com.azure.resourcemanager.iothub.models.EventHubConsumerGroupInfo;
 import java.util.Collections;
@@ -13,9 +12,10 @@
 public final class EventHubConsumerGroupInfoImpl implements EventHubConsumerGroupInfo {
     private EventHubConsumerGroupInfoInner innerObject;
 
-    private final IotHubManager serviceManager;
+    private final com.azure.resourcemanager.iothub.IotHubManager serviceManager;
 
-    EventHubConsumerGroupInfoImpl(EventHubConsumerGroupInfoInner innerObject, IotHubManager serviceManager) {
+    EventHubConsumerGroupInfoImpl(
+        EventHubConsumerGroupInfoInner innerObject, com.azure.resourcemanager.iothub.IotHubManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -49,7 +49,7 @@ public EventHubConsumerGroupInfoInner innerModel() {
         return this.innerObject;
     }
 
-    private IotHubManager manager() {
+    private com.azure.resourcemanager.iothub.IotHubManager manager() {
         return this.serviceManager;
     }
 }