Skip to content

Commit 1da07b2

Browse files
author
SDK Automation
committed
Generated from a2e0a0954d3ae77405888d92d6eb38950c28c089
1 parent 028cee8 commit 1da07b2

File tree

4 files changed

+25
-11
lines changed

4 files changed

+25
-11
lines changed

sdk/netapp/mgmt-v2017_08_15/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<parent>
1212
<groupId>com.microsoft.azure</groupId>
1313
<artifactId>azure-arm-parent</artifactId>
14-
<version>1.2.0</version>
15-
<relativePath>../../parents/azure-arm-parent</relativePath>
14+
<version>1.1.0</version>
15+
<relativePath>../../../pom.management.xml</relativePath>
1616
</parent>
1717
<artifactId>azure-mgmt-netapp</artifactId>
1818
<version>1.0.0-beta</version>
@@ -71,6 +71,8 @@
7171
<artifactId>azure-arm-client-runtime</artifactId>
7272
<type>test-jar</type>
7373
<scope>test</scope>
74+
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
75+
<version>1.6.5</version>
7476
</dependency>
7577
</dependencies>
7678
<build>

sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/PoolsImpl.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,14 @@ public CapacityPool call(CapacityPoolInner inner) {
6464
public Observable<CapacityPool> getAsync(String resourceGroupName, String accountName, String poolName) {
6565
PoolsInner client = this.inner();
6666
return client.getAsync(resourceGroupName, accountName, poolName)
67-
.map(new Func1<CapacityPoolInner, CapacityPool>() {
67+
.flatMap(new Func1<CapacityPoolInner, Observable<CapacityPool>>() {
6868
@Override
69-
public CapacityPool call(CapacityPoolInner inner) {
70-
return wrapModel(inner);
69+
public Observable<CapacityPool> call(CapacityPoolInner inner) {
70+
if (inner == null) {
71+
return Observable.empty();
72+
} else {
73+
return Observable.just((CapacityPool)wrapModel(inner));
74+
}
7175
}
7276
});
7377
}

sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/SnapshotsImpl.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,14 @@ public Snapshot call(SnapshotInner inner) {
6464
public Observable<Snapshot> getAsync(String resourceGroupName, String accountName, String poolName, String volumeName, String snapshotName) {
6565
SnapshotsInner client = this.inner();
6666
return client.getAsync(resourceGroupName, accountName, poolName, volumeName, snapshotName)
67-
.map(new Func1<SnapshotInner, Snapshot>() {
67+
.flatMap(new Func1<SnapshotInner, Observable<Snapshot>>() {
6868
@Override
69-
public Snapshot call(SnapshotInner inner) {
70-
return wrapModel(inner);
69+
public Observable<Snapshot> call(SnapshotInner inner) {
70+
if (inner == null) {
71+
return Observable.empty();
72+
} else {
73+
return Observable.just((Snapshot)wrapModel(inner));
74+
}
7175
}
7276
});
7377
}

sdk/netapp/mgmt-v2017_08_15/src/main/java/com/microsoft/azure/management/netapp/v2017_08_15/implementation/VolumesImpl.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,14 @@ public Volume call(VolumeInner inner) {
6464
public Observable<Volume> getAsync(String resourceGroupName, String accountName, String poolName, String volumeName) {
6565
VolumesInner client = this.inner();
6666
return client.getAsync(resourceGroupName, accountName, poolName, volumeName)
67-
.map(new Func1<VolumeInner, Volume>() {
67+
.flatMap(new Func1<VolumeInner, Observable<Volume>>() {
6868
@Override
69-
public Volume call(VolumeInner inner) {
70-
return wrapModel(inner);
69+
public Observable<Volume> call(VolumeInner inner) {
70+
if (inner == null) {
71+
return Observable.empty();
72+
} else {
73+
return Observable.just((Volume)wrapModel(inner));
74+
}
7175
}
7276
});
7377
}

0 commit comments

Comments
 (0)