Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR sdk/privatedns/mgmt-v2018_09_01] s360 fixes for Azure DNS #5730

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions sdk/privatedns/mgmt-v2018_09_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<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-privatedns</artifactId>
<version>1.0.0-beta</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Private DNS Management</name>
<description>This package contains Microsoft Private DNS Management SDK.</description>
<name>Microsoft Azure SDK for Network Management</name>
<description>This package contains Microsoft Network Management SDK.</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<licenses>
<license>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,14 @@ public VirtualNetworkLink call(VirtualNetworkLinkInner inner) {
public Observable<VirtualNetworkLink> getAsync(String resourceGroupName, String privateZoneName, String virtualNetworkLinkName) {
VirtualNetworkLinksInner client = this.inner();
return client.getAsync(resourceGroupName, privateZoneName, virtualNetworkLinkName)
.map(new Func1<VirtualNetworkLinkInner, VirtualNetworkLink>() {
.flatMap(new Func1<VirtualNetworkLinkInner, Observable<VirtualNetworkLink>>() {
@Override
public VirtualNetworkLink call(VirtualNetworkLinkInner inner) {
return wrapModel(inner);
public Observable<VirtualNetworkLink> call(VirtualNetworkLinkInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((VirtualNetworkLink)wrapModel(inner));
}
}
});
}
Expand Down