diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/pom.xml b/sdk/notificationhubs/mgmt-v2016_03_01/pom.xml index 9a0207d6011f..ff98ac0d32bc 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/pom.xml +++ b/sdk/notificationhubs/mgmt-v2016_03_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.2.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-notificationhubs 1.0.0-beta diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/ApnsCredential.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/ApnsCredential.java index e33eab99d352..bbd6ab535540 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/ApnsCredential.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/ApnsCredential.java @@ -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; @@ -101,7 +101,7 @@ public ApnsCredential withEndpoint(String endpoint) { } /** - * Get the Apns certificate Thumbprint. + * Get the APNS certificate Thumbprint. * * @return the thumbprint value */ @@ -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. diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/MpnsCredential.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/MpnsCredential.java index a8e911936376..446452ecce8f 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/MpnsCredential.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/MpnsCredential.java @@ -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; @@ -75,7 +75,7 @@ public MpnsCredential withCertificateKey(String certificateKey) { } /** - * Get the Mpns certificate Thumbprint. + * Get the MPNS certificate Thumbprint. * * @return the thumbprint value */ @@ -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. diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/NamespaceCreateOrUpdateParameters.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/NamespaceCreateOrUpdateParameters.java index fe6a1cbb5365..81bbd4453772 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/NamespaceCreateOrUpdateParameters.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/NamespaceCreateOrUpdateParameters.java @@ -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; @@ -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 */ @@ -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. diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/NamespaceResource.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/NamespaceResource.java index 20fa7154eb7a..f8501a311544 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/NamespaceResource.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/NamespaceResource.java @@ -55,6 +55,11 @@ public interface NamespaceResource extends HasInner, Res */ String provisioningState(); + /** + * @return the region value. + */ + String region(); + /** * @return the scaleUnit value. */ @@ -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. */ @@ -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, Resource.DefinitionWithTags, 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, Resource.DefinitionWithTags, DefinitionStages.WithCreatedAt, DefinitionStages.WithCritical, DefinitionStages.WithEnabled, DefinitionStages.WithNamespaceCreateOrUpdateParametersName, DefinitionStages.WithNamespaceType, DefinitionStages.WithProvisioningState, DefinitionStages.WithRegion, DefinitionStages.WithScaleUnit, DefinitionStages.WithServiceBusEndpoint, DefinitionStages.WithSku, DefinitionStages.WithStatus, DefinitionStages.WithSubscriptionId { } } /** diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/CheckAvailabilityResultInner.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/CheckAvailabilityResultInner.java index 979fed683288..744796ef643a 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/CheckAvailabilityResultInner.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/CheckAvailabilityResultInner.java @@ -13,7 +13,7 @@ import com.microsoft.azure.Resource; /** - * Description of a CheckAvailibility resource. + * Description of a CheckAvailability resource. */ public class CheckAvailabilityResultInner extends Resource { /** diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceResourceImpl.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceResourceImpl.java index 4a37d24faade..d44d322c790f 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceResourceImpl.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceResourceImpl.java @@ -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(); @@ -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); diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceResourceInner.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceResourceInner.java index 52aa12e268b5..3e184492a32d 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceResourceInner.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceResourceInner.java @@ -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; @@ -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 */ @@ -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. diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java index 59750521a20b..19f6467e25a5 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java @@ -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"); diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespacesImpl.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespacesImpl.java index 569fbfb3fad2..7d665e0d4625 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespacesImpl.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespacesImpl.java @@ -176,10 +176,14 @@ private Observable getSharedAccessAu public Observable getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) { NamespacesInner client = this.inner(); return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public NamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) { - return wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner); + public Observable call(SharedAccessAuthorizationRuleResourceInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((NamespaceSharedAccessAuthorizationRuleResource)wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner)); + } } }); } diff --git a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespacesInner.java b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespacesInner.java index c0e28aa7fe51..6d8216793d65 100644 --- a/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespacesInner.java +++ b/sdk/notificationhubs/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2016_03_01/implementation/NamespacesInner.java @@ -656,7 +656,7 @@ private ServiceResponse 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 @@ -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 @@ -687,7 +687,7 @@ public ServiceFuture 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 @@ -706,7 +706,7 @@ public SharedAccessAuthorizationRuleResourceInner call(ServiceResponse getAsync(String resourceGroupName, String namespaceName, String notificationHubName) { NotificationHubsInner client = this.inner(); return client.getAsync(resourceGroupName, namespaceName, notificationHubName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public NotificationHubResource call(NotificationHubResourceInner inner) { - return wrapModel(inner); + public Observable call(NotificationHubResourceInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((NotificationHubResource)wrapModel(inner)); + } } }); } @@ -133,10 +137,14 @@ public CheckAvailabilityResult call(CheckAvailabilityResultInner inner) { public Observable getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String notificationHubName, String authorizationRuleName) { NotificationHubsInner client = this.inner(); return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, notificationHubName, authorizationRuleName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public NotificationHubNamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) { - return wrapNotificationHubNamespaceSharedAccessAuthorizationRuleResourceModel(inner); + public Observable call(SharedAccessAuthorizationRuleResourceInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((NotificationHubNamespaceSharedAccessAuthorizationRuleResource)wrapNotificationHubNamespaceSharedAccessAuthorizationRuleResourceModel(inner)); + } } }); }