Skip to content
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: 2 additions & 2 deletions sdk/notificationhubs/mgmt-v2016_03_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<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-notificationhubs</artifactId>
<version>1.0.0-beta</version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class ApnsCredential {
private String endpoint;

/**
* The Apns certificate Thumbprint.
* The APNS certificate Thumbprint.
*/
@JsonProperty(value = "properties.thumbprint")
private String thumbprint;
Expand Down Expand Up @@ -101,7 +101,7 @@ public ApnsCredential withEndpoint(String endpoint) {
}

/**
* Get the Apns certificate Thumbprint.
* Get the APNS certificate Thumbprint.
*
* @return the thumbprint value
*/
Expand All @@ -110,7 +110,7 @@ public String thumbprint() {
}

/**
* Set the Apns certificate Thumbprint.
* Set the APNS certificate Thumbprint.
*
* @param thumbprint the thumbprint value to set
* @return the ApnsCredential object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class MpnsCredential {
private String certificateKey;

/**
* The Mpns certificate Thumbprint.
* The MPNS certificate Thumbprint.
*/
@JsonProperty(value = "properties.thumbprint")
private String thumbprint;
Expand Down Expand Up @@ -75,7 +75,7 @@ public MpnsCredential withCertificateKey(String certificateKey) {
}

/**
* Get the Mpns certificate Thumbprint.
* Get the MPNS certificate Thumbprint.
*
* @return the thumbprint value
*/
Expand All @@ -84,7 +84,7 @@ public String thumbprint() {
}

/**
* Set the Mpns certificate Thumbprint.
* Set the MPNS certificate Thumbprint.
*
* @param thumbprint the thumbprint value to set
* @return the MpnsCredential object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ public class NamespaceCreateOrUpdateParameters extends Resource {

/**
* Specifies the targeted region in which the namespace should be created.
* It can be any of the following values: Australia EastAustralia
* SoutheastCentral USEast USEast US 2West USNorth Central USSouth Central
* USEast AsiaSoutheast AsiaBrazil SouthJapan EastJapan WestNorth
* EuropeWest Europe.
* It can be any of the following values: Australia East, Australia
* Southeast, Central US, East US, East US 2, West US, North Central US,
* South Central US, East Asia, Southeast Asia, Brazil South, Japan East,
* Japan West, North Europe, West Europe.
*/
@JsonProperty(value = "properties.region")
private String region;
Expand Down Expand Up @@ -137,7 +137,7 @@ public NamespaceCreateOrUpdateParameters withProvisioningState(String provisioni
}

/**
* Get specifies the targeted region in which the namespace should be created. It can be any of the following values: Australia EastAustralia SoutheastCentral USEast USEast US 2West USNorth Central USSouth Central USEast AsiaSoutheast AsiaBrazil SouthJapan EastJapan WestNorth EuropeWest Europe.
* Get specifies the targeted region in which the namespace should be created. It can be any of the following values: Australia East, Australia Southeast, Central US, East US, East US 2, West US, North Central US, South Central US, East Asia, Southeast Asia, Brazil South, Japan East, Japan West, North Europe, West Europe.
*
* @return the region value
*/
Expand All @@ -146,7 +146,7 @@ public String region() {
}

/**
* Set specifies the targeted region in which the namespace should be created. It can be any of the following values: Australia EastAustralia SoutheastCentral USEast USEast US 2West USNorth Central USSouth Central USEast AsiaSoutheast AsiaBrazil SouthJapan EastJapan WestNorth EuropeWest Europe.
* Set specifies the targeted region in which the namespace should be created. It can be any of the following values: Australia East, Australia Southeast, Central US, East US, East US 2, West US, North Central US, South Central US, East Asia, Southeast Asia, Brazil South, Japan East, Japan West, North Europe, West Europe.
*
* @param region the region value to set
* @return the NamespaceCreateOrUpdateParameters object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public interface NamespaceResource extends HasInner<NamespaceResourceInner>, Res
*/
String provisioningState();

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

/**
* @return the scaleUnit value.
*/
Expand Down Expand Up @@ -174,6 +179,18 @@ interface WithProvisioningState {
WithCreate withProvisioningState(String provisioningState);
}

/**
* The stage of the namespaceresource definition allowing to specify Region.
*/
interface WithRegion {
/**
* Specifies region.
* @param region Specifies the targeted region in which the namespace should be created. It can be any of the following values: Australia East, Australia Southeast, Central US, East US, East US 2, West US, North Central US, South Central US, East Asia, Southeast Asia, Brazil South, Japan East, Japan West, North Europe, West Europe
* @return the next definition stage
*/
WithCreate withRegion(String region);
}

/**
* The stage of the namespaceresource definition allowing to specify ScaleUnit.
*/
Expand Down Expand Up @@ -239,7 +256,7 @@ interface WithSubscriptionId {
* the resource to be created (via {@link WithCreate#create()}), but also allows
* for any other optional settings to be specified.
*/
interface WithCreate extends Creatable<NamespaceResource>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithCreatedAt, DefinitionStages.WithCritical, DefinitionStages.WithEnabled, DefinitionStages.WithNamespaceCreateOrUpdateParametersName, DefinitionStages.WithNamespaceType, DefinitionStages.WithProvisioningState, DefinitionStages.WithScaleUnit, DefinitionStages.WithServiceBusEndpoint, DefinitionStages.WithSku, DefinitionStages.WithStatus, DefinitionStages.WithSubscriptionId {
interface WithCreate extends Creatable<NamespaceResource>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithCreatedAt, DefinitionStages.WithCritical, DefinitionStages.WithEnabled, DefinitionStages.WithNamespaceCreateOrUpdateParametersName, DefinitionStages.WithNamespaceType, DefinitionStages.WithProvisioningState, DefinitionStages.WithRegion, DefinitionStages.WithScaleUnit, DefinitionStages.WithServiceBusEndpoint, DefinitionStages.WithSku, DefinitionStages.WithStatus, DefinitionStages.WithSubscriptionId {
}
}
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.microsoft.azure.Resource;

/**
* Description of a CheckAvailibility resource.
* Description of a CheckAvailability resource.
*/
public class CheckAvailabilityResultInner extends Resource {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ public String provisioningState() {
return this.inner().provisioningState();
}

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

@Override
public String scaleUnit() {
return this.inner().scaleUnit();
Expand Down Expand Up @@ -164,6 +169,12 @@ public NamespaceResourceImpl withProvisioningState(String provisioningState) {
return this;
}

@Override
public NamespaceResourceImpl withRegion(String region) {
this.createParameter.withRegion(region);
return this;
}

@Override
public NamespaceResourceImpl withScaleUnit(String scaleUnit) {
this.createParameter.withScaleUnit(scaleUnit);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ public class NamespaceResourceInner extends Resource {

/**
* Specifies the targeted region in which the namespace should be created.
* It can be any of the following values: Australia EastAustralia
* SoutheastCentral USEast USEast US 2West USNorth Central USSouth Central
* USEast AsiaSoutheast AsiaBrazil SouthJapan EastJapan WestNorth
* EuropeWest Europe.
* It can be any of the following values: Australia East, Australia
* Southeast, Central US, East US, East US 2, West US, North Central US,
* South Central US, East Asia, Southeast Asia, Brazil South, Japan East,
* Japan West, North Europe, West Europe.
*/
@JsonProperty(value = "properties.region")
private String region;
Expand Down Expand Up @@ -139,7 +139,7 @@ public NamespaceResourceInner withProvisioningState(String provisioningState) {
}

/**
* Get specifies the targeted region in which the namespace should be created. It can be any of the following values: Australia EastAustralia SoutheastCentral USEast USEast US 2West USNorth Central USSouth Central USEast AsiaSoutheast AsiaBrazil SouthJapan EastJapan WestNorth EuropeWest Europe.
* Get specifies the targeted region in which the namespace should be created. It can be any of the following values: Australia East, Australia Southeast, Central US, East US, East US 2, West US, North Central US, South Central US, East Asia, Southeast Asia, Brazil South, Japan East, Japan West, North Europe, West Europe.
*
* @return the region value
*/
Expand All @@ -148,7 +148,7 @@ public String region() {
}

/**
* Set specifies the targeted region in which the namespace should be created. It can be any of the following values: Australia EastAustralia SoutheastCentral USEast USEast US 2West USNorth Central USSouth Central USEast AsiaSoutheast AsiaBrazil SouthJapan EastJapan WestNorth EuropeWest Europe.
* Set specifies the targeted region in which the namespace should be created. It can be any of the following values: Australia East, Australia Southeast, Central US, East US, East US 2, West US, North Central US, South Central US, East Asia, Southeast Asia, Brazil South, Japan East, Japan West, North Europe, West Europe.
*
* @param region the region value to set
* @return the NamespaceResourceInner object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class NamespaceSharedAccessAuthorizationRuleResourceImpl extends CreatableUpdata
this.manager = manager;
// Set resource name
this.authorizationRuleName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
this.authorizationRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "AuthorizationRules");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,14 @@ private Observable<SharedAccessAuthorizationRuleResourceInner> getSharedAccessAu
public Observable<NamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
NamespacesInner client = this.inner();
return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName)
.map(new Func1<SharedAccessAuthorizationRuleResourceInner, NamespaceSharedAccessAuthorizationRuleResource>() {
.flatMap(new Func1<SharedAccessAuthorizationRuleResourceInner, Observable<NamespaceSharedAccessAuthorizationRuleResource>>() {
@Override
public NamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
return wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
public Observable<NamespaceSharedAccessAuthorizationRuleResource> call(SharedAccessAuthorizationRuleResourceInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((NamespaceSharedAccessAuthorizationRuleResource)wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner));
}
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ private ServiceResponse<NamespaceResourceInner> getByResourceGroupDelegate(Respo
*
* @param resourceGroupName The name of the resource group.
* @param namespaceName The namespace name.
* @param authorizationRuleName Aauthorization Rule Name.
* @param authorizationRuleName Authorization Rule Name.
* @param parameters The shared access authorization rule.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @throws CloudException thrown if the request is rejected by server
Expand All @@ -672,7 +672,7 @@ public SharedAccessAuthorizationRuleResourceInner createOrUpdateAuthorizationRul
*
* @param resourceGroupName The name of the resource group.
* @param namespaceName The namespace name.
* @param authorizationRuleName Aauthorization Rule Name.
* @param authorizationRuleName Authorization Rule Name.
* @param parameters The shared access authorization rule.
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @throws IllegalArgumentException thrown if parameters fail the validation
Expand All @@ -687,7 +687,7 @@ public ServiceFuture<SharedAccessAuthorizationRuleResourceInner> createOrUpdateA
*
* @param resourceGroupName The name of the resource group.
* @param namespaceName The namespace name.
* @param authorizationRuleName Aauthorization Rule Name.
* @param authorizationRuleName Authorization Rule Name.
* @param parameters The shared access authorization rule.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the SharedAccessAuthorizationRuleResourceInner object
Expand All @@ -706,7 +706,7 @@ public SharedAccessAuthorizationRuleResourceInner call(ServiceResponse<SharedAcc
*
* @param resourceGroupName The name of the resource group.
* @param namespaceName The namespace name.
* @param authorizationRuleName Aauthorization Rule Name.
* @param authorizationRuleName Authorization Rule Name.
* @param parameters The shared access authorization rule.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the SharedAccessAuthorizationRuleResourceInner object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class NotificationHubNamespaceSharedAccessAuthorizationRuleResourceImpl extends
this.manager = manager;
// Set resource name
this.authorizationRuleName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
this.notificationHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "notificationHubs");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class NotificationHubResourceImpl extends CreatableUpdatableImpl<NotificationHub
this.manager = manager;
// Set resource name
this.notificationHubName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.namespaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "namespaces");
this.notificationHubName = IdParsingUtils.getValueFromIdByName(inner.id(), "notificationHubs");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,14 @@ public NotificationHubResource call(NotificationHubResourceInner inner) {
public Observable<NotificationHubResource> getAsync(String resourceGroupName, String namespaceName, String notificationHubName) {
NotificationHubsInner client = this.inner();
return client.getAsync(resourceGroupName, namespaceName, notificationHubName)
.map(new Func1<NotificationHubResourceInner, NotificationHubResource>() {
.flatMap(new Func1<NotificationHubResourceInner, Observable<NotificationHubResource>>() {
@Override
public NotificationHubResource call(NotificationHubResourceInner inner) {
return wrapModel(inner);
public Observable<NotificationHubResource> call(NotificationHubResourceInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((NotificationHubResource)wrapModel(inner));
}
}
});
}
Expand Down Expand Up @@ -133,10 +137,14 @@ public CheckAvailabilityResult call(CheckAvailabilityResultInner inner) {
public Observable<NotificationHubNamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String notificationHubName, String authorizationRuleName) {
NotificationHubsInner client = this.inner();
return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, notificationHubName, authorizationRuleName)
.map(new Func1<SharedAccessAuthorizationRuleResourceInner, NotificationHubNamespaceSharedAccessAuthorizationRuleResource>() {
.flatMap(new Func1<SharedAccessAuthorizationRuleResourceInner, Observable<NotificationHubNamespaceSharedAccessAuthorizationRuleResource>>() {
@Override
public NotificationHubNamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
return wrapNotificationHubNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
public Observable<NotificationHubNamespaceSharedAccessAuthorizationRuleResource> call(SharedAccessAuthorizationRuleResourceInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((NotificationHubNamespaceSharedAccessAuthorizationRuleResource)wrapNotificationHubNamespaceSharedAccessAuthorizationRuleResourceModel(inner));
}
}
});
}
Expand Down