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

[ReleasePR sdk/resources/mgmt-v2019_07_01] Bug fixes for two known issues #10767

Closed
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
4 changes: 1 addition & 3 deletions sdk/resources/mgmt-v2019_07_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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-resources</artifactId>
Expand Down Expand Up @@ -46,12 +46,10 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-client-runtime</artifactId>
<version>1.6.14</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-client-runtime</artifactId>
<version>1.6.14</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
package com.microsoft.azure.management.resources.v2019_07_01;

import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.management.resources.v2019_07_01.implementation.GenericResourceInner;
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.resources.v2019_07_01.implementation.ResourcesManager;
import com.microsoft.azure.management.resources.v2019_07_01.implementation.GenericResourceInner;
import java.util.Map;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
*/

package com.microsoft.azure.management.resources.v2019_07_01;

import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.management.resources.v2019_07_01.implementation.GenericResourceExpandedInner;
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.resources.v2019_07_01.implementation.ResourcesManager;
import org.joda.time.DateTime;
import java.util.Map;

/**
* Type representing GenericResourceExpanded.
*/
public interface GenericResourceExpanded extends HasInner<GenericResourceExpandedInner>, HasManager<ResourcesManager> {
/**
* @return the changedTime value.
*/
DateTime changedTime();

/**
* @return the createdTime value.
*/
DateTime createdTime();

/**
* @return the id value.
*/
String id();

/**
* @return the identity value.
*/
Identity identity();

/**
* @return the kind value.
*/
String kind();

/**
* @return the location value.
*/
String location();

/**
* @return the managedBy value.
*/
String managedBy();

/**
* @return the name value.
*/
String name();

/**
* @return the plan value.
*/
Plan plan();

/**
* @return the properties value.
*/
Object properties();

/**
* @return the provisioningState value.
*/
String provisioningState();

/**
* @return the sku value.
*/
Sku sku();

/**
* @return the tags value.
*/
Map<String, String> tags();

/**
* @return the type value.
*/
String type();

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public interface Resources extends HasInner<ResourcesInner> {
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<GenericResource> listAsync();
Observable<GenericResourceExpanded> listAsync();

/**
* Checks by ID whether a resource exists.
Expand Down Expand Up @@ -85,7 +85,7 @@ public interface Resources extends HasInner<ResourcesInner> {
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<GenericResource> listByResourceGroupAsync(final String resourceGroupName);
Observable<GenericResourceExpanded> listByResourceGroupAsync(final String resourceGroupName);

/**
* Moves resources from one resource group to another resource group.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ public Observable<DeploymentExtended> getByResourceGroupAsync(String resourceGro
return this.getInnerAsync(resourceGroupName, name).flatMap(new Func1<DeploymentExtendedInner, Observable<DeploymentExtended>> () {
@Override
public Observable<DeploymentExtended> call(DeploymentExtendedInner innerT) {
if (innerT == null) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((DeploymentExtended)wrapModel(innerT));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
import rx.Observable;
import com.microsoft.azure.LongRunningFinalState;
import com.microsoft.azure.LongRunningOperationOptions;
import com.microsoft.azure.LongRunningFinalState;
import com.microsoft.azure.LongRunningOperationOptions;

/**
* An instance of this class provides access to all the operations defined
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
*/

package com.microsoft.azure.management.resources.v2019_07_01.implementation;

import com.microsoft.azure.management.resources.v2019_07_01.GenericResourceExpanded;
import com.microsoft.azure.arm.model.implementation.WrapperImpl;
import rx.Observable;
import org.joda.time.DateTime;
import com.microsoft.azure.management.resources.v2019_07_01.Identity;
import com.microsoft.azure.management.resources.v2019_07_01.Plan;
import com.microsoft.azure.management.resources.v2019_07_01.Sku;
import java.util.Map;

class GenericResourceExpandedImpl extends WrapperImpl<GenericResourceExpandedInner> implements GenericResourceExpanded {
private final ResourcesManager manager;

GenericResourceExpandedImpl(GenericResourceExpandedInner inner, ResourcesManager manager) {
super(inner);
this.manager = manager;
}

@Override
public ResourcesManager manager() {
return this.manager;
}



@Override
public DateTime changedTime() {
return this.inner().changedTime();
}

@Override
public DateTime createdTime() {
return this.inner().createdTime();
}

@Override
public String id() {
return this.inner().id();
}

@Override
public Identity identity() {
return this.inner().identity();
}

@Override
public String kind() {
return this.inner().kind();
}

@Override
public String location() {
return this.inner().location();
}

@Override
public String managedBy() {
return this.inner().managedBy();
}

@Override
public String name() {
return this.inner().name();
}

@Override
public Plan plan() {
return this.inner().plan();
}

@Override
public Object properties() {
return this.inner().properties();
}

@Override
public String provisioningState() {
return this.inner().provisioningState();
}

@Override
public Sku sku() {
return this.inner().sku();
}

@Override
public Map<String, String> tags() {
return this.inner().getTags();
}

@Override
public String type() {
return this.inner().type();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
*/

package com.microsoft.azure.management.resources.v2019_07_01.implementation;

import org.joda.time.DateTime;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Resource information.
*/
public class GenericResourceExpandedInner extends GenericResourceInner {
/**
* The created time of the resource. This is only present if requested via
* the $expand query parameter.
*/
@JsonProperty(value = "createdTime", access = JsonProperty.Access.WRITE_ONLY)
private DateTime createdTime;

/**
* The changed time of the resource. This is only present if requested via
* the $expand query parameter.
*/
@JsonProperty(value = "changedTime", access = JsonProperty.Access.WRITE_ONLY)
private DateTime changedTime;

/**
* The provisioning state of the resource. This is only present if
* requested via the $expand query parameter.
*/
@JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
private String provisioningState;

/**
* Get the created time of the resource. This is only present if requested via the $expand query parameter.
*
* @return the createdTime value
*/
public DateTime createdTime() {
return this.createdTime;
}

/**
* Get the changed time of the resource. This is only present if requested via the $expand query parameter.
*
* @return the changedTime value
*/
public DateTime changedTime() {
return this.changedTime;
}

/**
* Get the provisioning state of the resource. This is only present if requested via the $expand query parameter.
*
* @return the provisioningState value
*/
public String provisioningState() {
return this.provisioningState;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,14 @@

import com.microsoft.azure.management.resources.v2019_07_01.GenericResource;
import com.microsoft.azure.arm.model.implementation.WrapperImpl;
import rx.Observable;
import com.microsoft.azure.management.resources.v2019_07_01.Identity;
import com.microsoft.azure.management.resources.v2019_07_01.Plan;
import com.microsoft.azure.management.resources.v2019_07_01.Sku;
import java.util.Map;

class GenericResourceImpl extends WrapperImpl<GenericResourceInner> implements GenericResource {
private final ResourcesManager manager;

GenericResourceImpl(GenericResourceInner inner, ResourcesManager manager) {
GenericResourceImpl(GenericResourceInner inner, ResourcesManager manager) {
super(inner);
this.manager = manager;
}
Expand All @@ -29,8 +27,6 @@ public ResourcesManager manager() {
return this.manager;
}



@Override
public String id() {
return this.inner().id();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

import com.microsoft.azure.AzureClient;
import com.microsoft.azure.AzureServiceClient;
import com.microsoft.azure.LongRunningFinalState;
import com.microsoft.azure.LongRunningOperationOptions;
import com.microsoft.rest.credentials.ServiceClientCredentials;
import com.microsoft.rest.RestClient;

Expand Down
Loading