From 120a5302b8d0be4bc69277c3ea46dc9cc5354833 Mon Sep 17 00:00:00 2001
From: SDK Automation <sdkautomation@microsoft.com>
Date: Thu, 1 Aug 2019 03:19:59 +0000
Subject: [PATCH] Generated from d7909e7e70af1018eb2227f1250bcecd6f5634fb

try #5.
---
 resources/resource-manager/v2019_05_01/pom.xml         |  8 +++-----
 .../resources/v2019_05_01/DeploymentExtended.java      |  8 ++++----
 .../implementation/DeploymentExtendedImpl.java         |  2 +-
 .../implementation/DeploymentOperationsImpl.java       | 10 +++-------
 .../v2019_05_01/implementation/ProvidersImpl.java      | 10 +++-------
 .../v2019_05_01/implementation/ResourceGroupsImpl.java | 10 +++-------
 6 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/resources/resource-manager/v2019_05_01/pom.xml b/resources/resource-manager/v2019_05_01/pom.xml
index 876f64e4c98e6..f45275bc895b5 100644
--- a/resources/resource-manager/v2019_05_01/pom.xml
+++ b/resources/resource-manager/v2019_05_01/pom.xml
@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-resources</artifactId>
-    <version>1.0.0-beta-1</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for Resources Management</name>
     <description>This package contains Microsoft Resources Management SDK.</description>
@@ -71,8 +71,6 @@
             <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>
diff --git a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/DeploymentExtended.java b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/DeploymentExtended.java
index 732f08c5e8754..abf1085c30e63 100644
--- a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/DeploymentExtended.java
+++ b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/DeploymentExtended.java
@@ -49,7 +49,7 @@ public interface DeploymentExtended extends HasInner<DeploymentExtendedInner>, I
     /**
      * The entirety of the DeploymentExtended definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithMicrosoftResource, DefinitionStages.WithProperties, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithMicrosoft.Resource, DefinitionStages.WithProperties, DefinitionStages.WithCreate {
     }
 
     /**
@@ -59,19 +59,19 @@ interface DefinitionStages {
         /**
          * The first stage of a DeploymentExtended definition.
          */
-        interface Blank extends WithMicrosoftResource {
+        interface Blank extends WithMicrosoft.Resource {
         }
 
         /**
          * The stage of the deploymentextended definition allowing to specify Microsoft.Resource.
          */
-        interface WithMicrosoftResource {
+        interface WithMicrosoft.Resource {
            /**
             * Specifies groupId.
             * @param groupId The management group ID
             * @return the next definition stage
             */
-            WithProperties withExistingMicrosoftResource(String groupId);
+            WithProperties withExistingMicrosoft.Resource(String groupId);
         }
 
         /**
diff --git a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/DeploymentExtendedImpl.java b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/DeploymentExtendedImpl.java
index ea34e06a1eb67..6d33270840600 100644
--- a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/DeploymentExtendedImpl.java
+++ b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/DeploymentExtendedImpl.java
@@ -116,7 +116,7 @@ public String type() {
     }
 
     @Override
-    public DeploymentExtendedImpl withExistingMicrosoftResource(String groupId) {
+    public DeploymentExtendedImpl withExistingMicrosoft.Resource(String groupId) {
         this.groupId = groupId;
         return this;
     }
diff --git a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/DeploymentOperationsImpl.java b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/DeploymentOperationsImpl.java
index feff2c66838c1..ee2ba19fa3d05 100644
--- a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/DeploymentOperationsImpl.java
+++ b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/DeploymentOperationsImpl.java
@@ -114,14 +114,10 @@ public DeploymentOperation call(DeploymentOperationInner inner) {
     public Observable<DeploymentOperation> getAtManagementGroupScopeAsync(String groupId, String deploymentName, String operationId) {
         DeploymentOperationsInner client = this.inner();
         return client.getAtManagementGroupScopeAsync(groupId, deploymentName, operationId)
-        .flatMap(new Func1<DeploymentOperationInner, Observable<DeploymentOperation>>() {
+        .map(new Func1<DeploymentOperationInner, DeploymentOperation>() {
             @Override
-            public Observable<DeploymentOperation> call(DeploymentOperationInner inner) {
-                if (inner == null) {
-                    return Observable.empty();
-                } else {
-                    return Observable.just((DeploymentOperation)wrapModel(inner));
-                }
+            public DeploymentOperation call(DeploymentOperationInner inner) {
+                return wrapModel(inner);
             }
        });
     }
diff --git a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/ProvidersImpl.java b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/ProvidersImpl.java
index 0d0e9d92facbb..60b5f189ceb4e 100644
--- a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/ProvidersImpl.java
+++ b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/ProvidersImpl.java
@@ -78,14 +78,10 @@ public Provider call(ProviderInner inner) {
     public Observable<Provider> getAsync(String resourceProviderNamespace) {
         ProvidersInner client = this.inner();
         return client.getAsync(resourceProviderNamespace)
-        .flatMap(new Func1<ProviderInner, Observable<Provider>>() {
+        .map(new Func1<ProviderInner, Provider>() {
             @Override
-            public Observable<Provider> call(ProviderInner inner) {
-                if (inner == null) {
-                    return Observable.empty();
-                } else {
-                    return Observable.just((Provider)wrapModel(inner));
-                }
+            public Provider call(ProviderInner inner) {
+                return wrapModel(inner);
             }
        });
     }
diff --git a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/ResourceGroupsImpl.java b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/ResourceGroupsImpl.java
index 440565aa7dd9f..b942e2864c31b 100644
--- a/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/ResourceGroupsImpl.java
+++ b/resources/resource-manager/v2019_05_01/src/main/java/com/microsoft/azure/management/resources/v2019_05_01/implementation/ResourceGroupsImpl.java
@@ -84,14 +84,10 @@ public ResourceGroup call(ResourceGroupInner inner) {
     public Observable<ResourceGroup> getAsync(String resourceGroupName) {
         ResourceGroupsInner client = this.inner();
         return client.getAsync(resourceGroupName)
-        .flatMap(new Func1<ResourceGroupInner, Observable<ResourceGroup>>() {
+        .map(new Func1<ResourceGroupInner, ResourceGroup>() {
             @Override
-            public Observable<ResourceGroup> call(ResourceGroupInner inner) {
-                if (inner == null) {
-                    return Observable.empty();
-                } else {
-                    return Observable.just((ResourceGroup)wrapModel(inner));
-                }
+            public ResourceGroup call(ResourceGroupInner inner) {
+                return wrapModel(inner);
             }
        });
     }