From a2ac1d0c34f97f43b1fd496213415bebba41e578 Mon Sep 17 00:00:00 2001
From: SDK Automation <sdkautomation@microsoft.com>
Date: Fri, 24 Jan 2020 05:31:11 +0000
Subject: [PATCH] Generated from dbeec79a1c0750f94a0edf7ee4fe49b2cf75bf0b

Merge pull request #48 from leonardbf/ANF-567-add-API-2019-11-01

ANF-567 add new API 2019-11-01
---
 sdk/netapp/mgmt-v2017_08_15/pom.xml                    |  4 +++-
 .../netapp/v2017_08_15/implementation/PoolsImpl.java   | 10 +++++++---
 .../v2017_08_15/implementation/SnapshotsImpl.java      | 10 +++++++---
 .../netapp/v2017_08_15/implementation/VolumesImpl.java | 10 +++++++---
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/sdk/netapp/mgmt-v2017_08_15/pom.xml b/sdk/netapp/mgmt-v2017_08_15/pom.xml
index b538e48c7d93..83eede16c012 100644
--- a/sdk/netapp/mgmt-v2017_08_15/pom.xml
+++ b/sdk/netapp/mgmt-v2017_08_15/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-netapp</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>
diff --git a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/PoolsImpl.java b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/PoolsImpl.java
index afeedce0a2f8..7b9e4e1cd238 100644
--- a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/PoolsImpl.java
+++ b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/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/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/SnapshotsImpl.java b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/SnapshotsImpl.java
index ca1cdd2a9c28..8784d2d03079 100644
--- a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/SnapshotsImpl.java
+++ b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/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/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/VolumesImpl.java b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/VolumesImpl.java
index 0e5f313a05a5..e0cb921cbab2 100644
--- a/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/VolumesImpl.java
+++ b/sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/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));
+                }
             }
        });
     }