[AutoPR sdk/servicebus/mgmt-v2017_04_01] [DoNotMerge] Add track2 config to servicebus

sdk/servicebus/mgmt-v2017_04_01/pom.xml

@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-servicebus</artifactId>
     <version>1.0.0-beta</version>
@@ -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/servicebus/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/servicebus/v2017_04_01/ErrorAdditionalInfo.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.servicebus.v2017_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The resource management error additional info.
+ */
+public class ErrorAdditionalInfo {
+    /**
+     * The additional info type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * The additional info.
+     */
+    @JsonProperty(value = "info", access = JsonProperty.Access.WRITE_ONLY)
+    private Object info;
+
+    /**
+     * Get the additional info type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the additional info.
+     *
+     * @return the info value
+     */
+    public Object info() {
+        return this.info;
+    }
+
+}

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

@@ -11,59 +11,32 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Error response indicates ServiceBus service is not able to process the
- * incoming request. The reason is provided in the error message.
+ * The resource management error response.
  */
 public class ErrorResponse {
     /**
-     * Error code.
+     * The error object.
      */
-    @JsonProperty(value = "code")
-    private String code;
+    @JsonProperty(value = "error")
+    private ErrorResponseError error;
 
     /**
-     * Error message indicating why the operation failed.
-     */
-    @JsonProperty(value = "message")
-    private String message;
-
-    /**
-     * Get error code.
-     *
-     * @return the code value
-     */
-    public String code() {
-        return this.code;
-    }
-
-    /**
-     * Set error code.
-     *
-     * @param code the code value to set
-     * @return the ErrorResponse object itself.
-     */
-    public ErrorResponse withCode(String code) {
-        this.code = code;
-        return this;
-    }
-
-    /**
-     * Get error message indicating why the operation failed.
+     * Get the error object.
      *
-     * @return the message value
+     * @return the error value
      */
-    public String message() {
-        return this.message;
+    public ErrorResponseError error() {
+        return this.error;
     }
 
     /**
-     * Set error message indicating why the operation failed.
+     * Set the error object.
      *
-     * @param message the message value to set
+     * @param error the error value to set
      * @return the ErrorResponse object itself.
      */
-    public ErrorResponse withMessage(String message) {
-        this.message = message;
+    public ErrorResponse withError(ErrorResponseError error) {
+        this.error = error;
         return this;
     }
 

sdk/servicebus/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/servicebus/v2017_04_01/ErrorResponseError.java

@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.servicebus.v2017_04_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The error object.
+ */
+public class ErrorResponseError {
+    /**
+     * The error code.
+     */
+    @JsonProperty(value = "code", access = JsonProperty.Access.WRITE_ONLY)
+    private String code;
+
+    /**
+     * The error message.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * The error target.
+     */
+    @JsonProperty(value = "target", access = JsonProperty.Access.WRITE_ONLY)
+    private String target;
+
+    /**
+     * The error details.
+     */
+    @JsonProperty(value = "details", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ErrorResponse> details;
+
+    /**
+     * The error additional info.
+     */
+    @JsonProperty(value = "additionalInfo", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ErrorAdditionalInfo> additionalInfo;
+
+    /**
+     * Get the error code.
+     *
+     * @return the code value
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Get the error message.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Get the error target.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Get the error details.
+     *
+     * @return the details value
+     */
+    public List<ErrorResponse> details() {
+        return this.details;
+    }
+
+    /**
+     * Get the error additional info.
+     *
+     * @return the additionalInfo value
+     */
+    public List<ErrorAdditionalInfo> additionalInfo() {
+        return this.additionalInfo;
+    }
+
+}

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

@@ -19,6 +19,7 @@
 import com.microsoft.azure.management.servicebus.v2017_04_01.implementation.NamespacesInner;
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.servicebus.v2017_04_01.NamespaceSBAuthorizationRule;
+import com.microsoft.azure.management.servicebus.v2017_04_01.NetworkRuleSet;
 import com.microsoft.azure.management.servicebus.v2017_04_01.implementation.NetworkRuleSetInner;
 
 /**
@@ -107,6 +108,16 @@ public interface Namespaces extends SupportsCreating<SBNamespace.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/servicebus/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/servicebus/v2017_04_01/NetworkRuleSet.java

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

sdk/servicebus/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/servicebus/v2017_04_01/ResourceNamespacePatch.java

@@ -8,11 +8,64 @@
 
 package com.microsoft.azure.management.servicebus.v2017_04_01;
 
-import com.microsoft.azure.Resource;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.ProxyResource;
 
 /**
  * The Resource definition.
  */
-public class ResourceNamespacePatch extends Resource {
+public class ResourceNamespacePatch extends ProxyResource {
+    /**
+     * Resource location.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Resource tags.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Get resource location.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set resource location.
+     *
+     * @param location the location value to set
+     * @return the ResourceNamespacePatch object itself.
+     */
+    public ResourceNamespacePatch withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get resource tags.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set resource tags.
+     *
+     * @param tags the tags value to set
+     * @return the ResourceNamespacePatch object itself.
+     */
+    public ResourceNamespacePatch withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
 
 }

sdk/servicebus/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/servicebus/v2017_04_01/SqlFilter.java

@@ -25,7 +25,7 @@ public class SqlFilter {
      * This property is reserved for future use. An integer value showing the
      * compatibility level, currently hard-coded to 20.
      */
-    @JsonProperty(value = "compatibilityLevel", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "compatibilityLevel")
     private Integer compatibilityLevel;
 
     /**
@@ -63,6 +63,17 @@ public Integer compatibilityLevel() {
         return this.compatibilityLevel;
     }
 
+    /**
+     * Set this property is reserved for future use. An integer value showing the compatibility level, currently hard-coded to 20.
+     *
+     * @param compatibilityLevel the compatibilityLevel value to set
+     * @return the SqlFilter object itself.
+     */
+    public SqlFilter withCompatibilityLevel(Integer compatibilityLevel) {
+        this.compatibilityLevel = compatibilityLevel;
+        return this;
+    }
+
     /**
      * Get value that indicates whether the rule action requires preprocessing.
      *

sdk/servicebus/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/servicebus/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));
+                }
             }
        });
     }
@@ -122,10 +126,14 @@ private Observable<SBAuthorizationRuleInner> getSBAuthorizationRuleInnerUsingDis
     public Observable<DisasterRecoveryConfigNamespaceSBAuthorizationRule> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String alias, String authorizationRuleName) {
         DisasterRecoveryConfigsInner client = this.inner();
         return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, alias, authorizationRuleName)
-        .map(new Func1<SBAuthorizationRuleInner, DisasterRecoveryConfigNamespaceSBAuthorizationRule>() {
+        .flatMap(new Func1<SBAuthorizationRuleInner, Observable<DisasterRecoveryConfigNamespaceSBAuthorizationRule>>() {
             @Override
-            public DisasterRecoveryConfigNamespaceSBAuthorizationRule call(SBAuthorizationRuleInner inner) {
-                return wrapDisasterRecoveryConfigNamespaceSBAuthorizationRuleModel(inner);
+            public Observable<DisasterRecoveryConfigNamespaceSBAuthorizationRule> call(SBAuthorizationRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((DisasterRecoveryConfigNamespaceSBAuthorizationRule)wrapDisasterRecoveryConfigNamespaceSBAuthorizationRuleModel(inner));
+                }
             }
        });
     }