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.

Sign up for GitHub

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

Jump to bottom

[ReleasePR sdk/locks/mgmt-v2016_09_01] Fix Microsoft.Resources naming issue #13730

Closed
wants to merge 1 commit into from
Closed

[ReleasePR sdk/locks/mgmt-v2016_09_01] Fix Microsoft.Resources naming issue #13730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions sdk/locks/mgmt-v2016_09_01/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.3.0</version>
<relativePath>../../parents/azure-arm-parent</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-locks</artifactId>
<version>1.0.0-beta-3</version>
<version>1.0.0-beta</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Authorization Management</name>
<description>This package contains Microsoft Authorization Management SDK.</description>
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
10 changes: 7 additions & 3 deletions .../com/microsoft/azure/management/locks/v2016_09_01/implementation/ManagementLocksImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,14 @@ public ManagementLockObject getByResourceGroup(String resourceGroupName, String

@Override
public Observable<ManagementLockObject> getByResourceGroupAsync(String resourceGroupName, String name) {
return this.getInnerAsync(resourceGroupName, name).map(new Func1<ManagementLockObjectInner, ManagementLockObject> () {
return this.getInnerAsync(resourceGroupName, name).flatMap(new Func1<ManagementLockObjectInner, Observable<ManagementLockObject>> () {
@Override
public ManagementLockObject call(ManagementLockObjectInner innerT) {
return wrapModel(innerT);
public Observable<ManagementLockObject> call(ManagementLockObjectInner innerT) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((ManagementLockObject)wrapModel(innerT));
}
}
});
}
Expand Down