[ReleasePR sdk/eventhubs/mgmt-v2017_04_01] EventHub: added optional keyVersion property in KeyVaultProperties

sdk/eventhubs/mgmt-v2017_04_01/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-eventhubs</artifactId>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>

sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/ErrorResponse.java

@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Error response indicates EventHub service is not able to process the
+ * Error response indicates Event Hub service is not able to process the
  * incoming request. The reason is provided in the error message.
  */
 public class ErrorResponse {

sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/MessagingRegionsProperties.java

@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * The MessagingRegionsProperties model.
+ * Properties of Messaging Region.
  */
 public class MessagingRegionsProperties {
     /**

sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/Namespaces.java

@@ -19,6 +19,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.eventhubs.v2017_04_01.NamespaceAuthorizationRule;
 import rx.Completable;
+import com.microsoft.azure.management.eventhubs.v2017_04_01.NetworkRuleSet;
 import com.microsoft.azure.management.eventhubs.v2017_04_01.implementation.NetworkRuleSetInner;
 
 /**
@@ -106,6 +107,16 @@ public interface Namespaces extends SupportsCreating<EHNamespace.DefinitionStage
      */
     Observable<AccessKeys> regenerateKeysAsync(String resourceGroupName, String namespaceName, String authorizationRuleName, RegenerateAccessKeyParameters parameters);
 
+    /**
+     * Gets list of NetworkRuleSet for a Namespace.
+     *
+     * @param resourceGroupName Name of the resource group within the azure subscription.
+     * @param namespaceName The Namespace name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkRuleSet> listNetworkRuleSetsAsync(final String resourceGroupName, final String namespaceName);
+
     /**
      * Create or update NetworkRuleSet for a Namespace.
      *

sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/NetworkRuleSet.java

@@ -9,9 +9,9 @@
 package com.microsoft.azure.management.eventhubs.v2017_04_01;
 
 import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.eventhubs.v2017_04_01.implementation.NetworkRuleSetInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.eventhubs.v2017_04_01.implementation.EventHubsManager;
-import com.microsoft.azure.management.eventhubs.v2017_04_01.implementation.NetworkRuleSetInner;
 import java.util.List;
 
 /**

sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/ConsumerGroupsImpl.java

@@ -64,10 +64,14 @@ public ConsumerGroup call(ConsumerGroupInner inner) {
     public Observable<ConsumerGroup> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
         ConsumerGroupsInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName)
-        .map(new Func1<ConsumerGroupInner, ConsumerGroup>() {
+        .flatMap(new Func1<ConsumerGroupInner, Observable<ConsumerGroup>>() {
             @Override
-            public ConsumerGroup call(ConsumerGroupInner inner) {
-                return wrapModel(inner);
+            public Observable<ConsumerGroup> call(ConsumerGroupInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ConsumerGroup)wrapModel(inner));
+                }
             }
        });
     }

sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/DisasterRecoveryConfigNamespaceAuthorizationRuleImpl.java

@@ -28,7 +28,7 @@ class DisasterRecoveryConfigNamespaceAuthorizationRuleImpl extends IndexableRefr
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
         this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
         this.alias = IdParsingUtils.getValueFromIdByName(inner.id(), "disasterRecoveryConfigs");
-        this.authorizationRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "AuthorizationRules");
+        this.authorizationRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "authorizationRules");
     }
 
     @Override

sdk/eventhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/eventhubs/v2017_04_01/implementation/DisasterRecoveryConfigsImpl.java

@@ -91,10 +91,14 @@ public ArmDisasterRecovery call(ArmDisasterRecoveryInner inner) {
     public Observable<ArmDisasterRecovery> getAsync(String resourceGroupName, String namespaceName, String alias) {
         DisasterRecoveryConfigsInner client = this.inner();
         return client.getAsync(resourceGroupName, namespaceName, alias)
-        .map(new Func1<ArmDisasterRecoveryInner, ArmDisasterRecovery>() {
+        .flatMap(new Func1<ArmDisasterRecoveryInner, Observable<ArmDisasterRecovery>>() {
             @Override
-            public ArmDisasterRecovery call(ArmDisasterRecoveryInner inner) {
-                return wrapModel(inner);
+            public Observable<ArmDisasterRecovery> call(ArmDisasterRecoveryInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ArmDisasterRecovery)wrapModel(inner));
+                }
             }
        });
     }
@@ -113,7 +117,7 @@ private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingDisaste
         String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
         String namespaceName = IdParsingUtils.getValueFromIdByName(id, "namespaces");
         String alias = IdParsingUtils.getValueFromIdByName(id, "disasterRecoveryConfigs");
-        String authorizationRuleName = IdParsingUtils.getValueFromIdByName(id, "AuthorizationRules");
+        String authorizationRuleName = IdParsingUtils.getValueFromIdByName(id, "authorizationRules");
         DisasterRecoveryConfigsInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, alias, authorizationRuleName);
     }
@@ -122,10 +126,14 @@ private Observable<AuthorizationRuleInner> getAuthorizationRuleInnerUsingDisaste
     public Observable<DisasterRecoveryConfigNamespaceAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
         DisasterRecoveryConfigsInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, alias, authorizationRuleName)
-        .map(new Func1<AuthorizationRuleInner, DisasterRecoveryConfigNamespaceAuthorizationRule>() {
+        .flatMap(new Func1<AuthorizationRuleInner, Observable<DisasterRecoveryConfigNamespaceAuthorizationRule>>() {
             @Override
-            public DisasterRecoveryConfigNamespaceAuthorizationRule call(AuthorizationRuleInner inner) {
-                return wrapDisasterRecoveryConfigNamespaceAuthorizationRuleModel(inner);
+            public Observable<DisasterRecoveryConfigNamespaceAuthorizationRule> call(AuthorizationRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((DisasterRecoveryConfigNamespaceAuthorizationRule)wrapDisasterRecoveryConfigNamespaceAuthorizationRuleModel(inner));
+                }
             }
        });
     }