updated azure-arm-client-runtime test jar dependency (Azure#4219)

msmbaldwin · Jul 2, 2019 · 69f562b · 69f562b
1 parent 0e9a985
commit 69f562b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/netapp/resource-manager/v2019_06_01/pom.xml b/netapp/resource-manager/v2019_06_01/pom.xml
@@ -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>

diff --git a/...main/java/com/microsoft/azure/management/netapp/v2019_06_01/implementation/PoolsImpl.java b/...main/java/com/microsoft/azure/management/netapp/v2019_06_01/implementation/PoolsImpl.java
@@ -64,10 +64,14 @@ public CapacityPool call(CapacityPoolInner inner) {
     public Observable<CapacityPool> getAsync(String resourceGroupName, String accountName, String poolName) {
         PoolsInner client = this.inner();
         return client.getAsync(resourceGroupName, accountName, poolName)
-        .map(new Func1<CapacityPoolInner, CapacityPool>() {
+        .flatMap(new Func1<CapacityPoolInner, Observable<CapacityPool>>() {
             @Override
-            public CapacityPool call(CapacityPoolInner inner) {
-                return wrapModel(inner);
+            public Observable<CapacityPool> call(CapacityPoolInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((CapacityPool)wrapModel(inner));
+                }
             }
        });
     }

diff --git a/.../java/com/microsoft/azure/management/netapp/v2019_06_01/implementation/SnapshotsImpl.java b/.../java/com/microsoft/azure/management/netapp/v2019_06_01/implementation/SnapshotsImpl.java
@@ -64,10 +64,14 @@ public Snapshot call(SnapshotInner inner) {
     public Observable<Snapshot> getAsync(String resourceGroupName, String accountName, String poolName, String volumeName, String snapshotName) {
         SnapshotsInner client = this.inner();
         return client.getAsync(resourceGroupName, accountName, poolName, volumeName, snapshotName)
-        .map(new Func1<SnapshotInner, Snapshot>() {
+        .flatMap(new Func1<SnapshotInner, Observable<Snapshot>>() {
             @Override
-            public Snapshot call(SnapshotInner inner) {
-                return wrapModel(inner);
+            public Observable<Snapshot> call(SnapshotInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Snapshot)wrapModel(inner));
+                }
             }
        });
     }

diff --git a/...in/java/com/microsoft/azure/management/netapp/v2019_06_01/implementation/VolumesImpl.java b/...in/java/com/microsoft/azure/management/netapp/v2019_06_01/implementation/VolumesImpl.java
@@ -64,10 +64,14 @@ public Volume call(VolumeInner inner) {
     public Observable<Volume> getAsync(String resourceGroupName, String accountName, String poolName, String volumeName) {
         VolumesInner client = this.inner();
         return client.getAsync(resourceGroupName, accountName, poolName, volumeName)
-        .map(new Func1<VolumeInner, Volume>() {
+        .flatMap(new Func1<VolumeInner, Observable<Volume>>() {
             @Override
-            public Volume call(VolumeInner inner) {
-                return wrapModel(inner);
+            public Observable<Volume> call(VolumeInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Volume)wrapModel(inner));
+                }
             }
        });
     }