diff --git a/sdk/notificationhubs/mgmt-v2017_04_01/pom.xml b/sdk/notificationhubs/mgmt-v2017_04_01/pom.xml index 4a8d93a461f2..698e4b6b66eb 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/pom.xml +++ b/sdk/notificationhubs/mgmt-v2017_04_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 @@ -71,6 +71,8 @@ azure-arm-client-runtime test-jar test + + 1.6.5 diff --git a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/ApnsCredential.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/ApnsCredential.java index 5b7a2717f93c..d0c08dbb635b 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/ApnsCredential.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/ApnsCredential.java @@ -17,57 +17,68 @@ @JsonFlatten public class ApnsCredential { /** - * The APNS certificate. + * The APNS certificate. Specify if using Certificate Authentication Mode. */ @JsonProperty(value = "properties.apnsCertificate") private String apnsCertificate; /** - * The certificate key. + * The APNS certificate password if it exists. */ @JsonProperty(value = "properties.certificateKey") private String certificateKey; /** - * The endpoint of this credential. + * The APNS endpoint of this credential. If using Certificate + * Authentication Mode and Sandbox specify + * 'gateway.sandbox.push.apple.com'. If using Certificate Authentication + * Mode and Production specify 'gateway.push.apple.com'. If using Token + * Authentication Mode and Sandbox specify + * 'https://api.development.push.apple.com:443/3/device'. If using Token + * Authentication Mode and Production specify + * 'https://api.push.apple.com:443/3/device'. */ @JsonProperty(value = "properties.endpoint") private String endpoint; /** - * The Apns certificate Thumbprint. + * The APNS certificate thumbprint. Specify if using Certificate + * Authentication Mode. */ @JsonProperty(value = "properties.thumbprint") private String thumbprint; /** * A 10-character key identifier (kid) key, obtained from your developer - * account. + * account. Specify if using Token Authentication Mode. */ @JsonProperty(value = "properties.keyId") private String keyId; /** - * The name of the application. + * The name of the application or BundleId. Specify if using Token + * Authentication Mode. */ @JsonProperty(value = "properties.appName") private String appName; /** - * The issuer (iss) registered claim key, whose value is your 10-character - * Team ID, obtained from your developer account. + * The issuer (iss) registered claim key. The value is a 10-character + * TeamId, obtained from your developer account. Specify if using Token + * Authentication Mode. */ @JsonProperty(value = "properties.appId") private String appId; /** * Provider Authentication Token, obtained through your developer account. + * Specify if using Token Authentication Mode. */ @JsonProperty(value = "properties.token") private String token; /** - * Get the APNS certificate. + * Get the APNS certificate. Specify if using Certificate Authentication Mode. * * @return the apnsCertificate value */ @@ -76,7 +87,7 @@ public String apnsCertificate() { } /** - * Set the APNS certificate. + * Set the APNS certificate. Specify if using Certificate Authentication Mode. * * @param apnsCertificate the apnsCertificate value to set * @return the ApnsCredential object itself. @@ -87,7 +98,7 @@ public ApnsCredential withApnsCertificate(String apnsCertificate) { } /** - * Get the certificate key. + * Get the APNS certificate password if it exists. * * @return the certificateKey value */ @@ -96,7 +107,7 @@ public String certificateKey() { } /** - * Set the certificate key. + * Set the APNS certificate password if it exists. * * @param certificateKey the certificateKey value to set * @return the ApnsCredential object itself. @@ -107,7 +118,7 @@ public ApnsCredential withCertificateKey(String certificateKey) { } /** - * Get the endpoint of this credential. + * Get the APNS endpoint of this credential. If using Certificate Authentication Mode and Sandbox specify 'gateway.sandbox.push.apple.com'. If using Certificate Authentication Mode and Production specify 'gateway.push.apple.com'. If using Token Authentication Mode and Sandbox specify 'https://api.development.push.apple.com:443/3/device'. If using Token Authentication Mode and Production specify 'https://api.push.apple.com:443/3/device'. * * @return the endpoint value */ @@ -116,7 +127,7 @@ public String endpoint() { } /** - * Set the endpoint of this credential. + * Set the APNS endpoint of this credential. If using Certificate Authentication Mode and Sandbox specify 'gateway.sandbox.push.apple.com'. If using Certificate Authentication Mode and Production specify 'gateway.push.apple.com'. If using Token Authentication Mode and Sandbox specify 'https://api.development.push.apple.com:443/3/device'. If using Token Authentication Mode and Production specify 'https://api.push.apple.com:443/3/device'. * * @param endpoint the endpoint value to set * @return the ApnsCredential object itself. @@ -127,7 +138,7 @@ public ApnsCredential withEndpoint(String endpoint) { } /** - * Get the Apns certificate Thumbprint. + * Get the APNS certificate thumbprint. Specify if using Certificate Authentication Mode. * * @return the thumbprint value */ @@ -136,7 +147,7 @@ public String thumbprint() { } /** - * Set the Apns certificate Thumbprint. + * Set the APNS certificate thumbprint. Specify if using Certificate Authentication Mode. * * @param thumbprint the thumbprint value to set * @return the ApnsCredential object itself. @@ -147,7 +158,7 @@ public ApnsCredential withThumbprint(String thumbprint) { } /** - * Get a 10-character key identifier (kid) key, obtained from your developer account. + * Get a 10-character key identifier (kid) key, obtained from your developer account. Specify if using Token Authentication Mode. * * @return the keyId value */ @@ -156,7 +167,7 @@ public String keyId() { } /** - * Set a 10-character key identifier (kid) key, obtained from your developer account. + * Set a 10-character key identifier (kid) key, obtained from your developer account. Specify if using Token Authentication Mode. * * @param keyId the keyId value to set * @return the ApnsCredential object itself. @@ -167,7 +178,7 @@ public ApnsCredential withKeyId(String keyId) { } /** - * Get the name of the application. + * Get the name of the application or BundleId. Specify if using Token Authentication Mode. * * @return the appName value */ @@ -176,7 +187,7 @@ public String appName() { } /** - * Set the name of the application. + * Set the name of the application or BundleId. Specify if using Token Authentication Mode. * * @param appName the appName value to set * @return the ApnsCredential object itself. @@ -187,7 +198,7 @@ public ApnsCredential withAppName(String appName) { } /** - * Get the issuer (iss) registered claim key, whose value is your 10-character Team ID, obtained from your developer account. + * Get the issuer (iss) registered claim key. The value is a 10-character TeamId, obtained from your developer account. Specify if using Token Authentication Mode. * * @return the appId value */ @@ -196,7 +207,7 @@ public String appId() { } /** - * Set the issuer (iss) registered claim key, whose value is your 10-character Team ID, obtained from your developer account. + * Set the issuer (iss) registered claim key. The value is a 10-character TeamId, obtained from your developer account. Specify if using Token Authentication Mode. * * @param appId the appId value to set * @return the ApnsCredential object itself. @@ -207,7 +218,7 @@ public ApnsCredential withAppId(String appId) { } /** - * Get provider Authentication Token, obtained through your developer account. + * Get provider Authentication Token, obtained through your developer account. Specify if using Token Authentication Mode. * * @return the token value */ @@ -216,7 +227,7 @@ public String token() { } /** - * Set provider Authentication Token, obtained through your developer account. + * Set provider Authentication Token, obtained through your developer account. Specify if using Token Authentication Mode. * * @param token the token value to set * @return the ApnsCredential object itself. diff --git a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/ErrorResponse.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/ErrorResponse.java index bfc46084a8a5..f90f4663ff94 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/ErrorResponse.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/ErrorResponse.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** - * Error reponse indicates NotificationHubs service is not able to process the + * Error response indicates NotificationHubs service is not able to process the * incoming request. The reason is provided in the error message. */ public class ErrorResponse { diff --git a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/GcmCredential.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/GcmCredential.java index db1271e4f1af..dcb5a6c4dae5 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/GcmCredential.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/GcmCredential.java @@ -17,7 +17,8 @@ @JsonFlatten public class GcmCredential { /** - * The GCM endpoint. + * The FCM legacy endpoint. Default value is + * 'https://fcm.googleapis.com/fcm/send'. */ @JsonProperty(value = "properties.gcmEndpoint") private String gcmEndpoint; @@ -29,7 +30,7 @@ public class GcmCredential { private String googleApiKey; /** - * Get the GCM endpoint. + * Get the FCM legacy endpoint. Default value is 'https://fcm.googleapis.com/fcm/send'. * * @return the gcmEndpoint value */ @@ -38,7 +39,7 @@ public String gcmEndpoint() { } /** - * Set the GCM endpoint. + * Set the FCM legacy endpoint. Default value is 'https://fcm.googleapis.com/fcm/send'. * * @param gcmEndpoint the gcmEndpoint value to set * @return the GcmCredential object itself. diff --git a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/MpnsCredential.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/MpnsCredential.java index 4ecac2bceeb2..56a345859368 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/MpnsCredential.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_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-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/NamespaceCreateOrUpdateParameters.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/NamespaceCreateOrUpdateParameters.java index 4202c237c265..e7022b5951e6 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/NamespaceCreateOrUpdateParameters.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/NamespaceCreateOrUpdateParameters.java @@ -34,10 +34,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; @@ -157,7 +157,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 */ @@ -166,7 +166,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-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/NamespaceResource.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/NamespaceResource.java index a8c8db062487..cbcdc7575bfa 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/NamespaceResource.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/NamespaceResource.java @@ -65,6 +65,11 @@ public interface NamespaceResource extends HasInner, Res */ String provisioningState(); + /** + * @return the region value. + */ + String region(); + /** * @return the scaleUnit value. */ @@ -201,6 +206,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. */ @@ -278,7 +295,7 @@ interface WithUpdatedAt { * 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.WithDataCenter, DefinitionStages.WithEnabled, DefinitionStages.WithNamespaceCreateOrUpdateParametersName, DefinitionStages.WithNamespaceType, DefinitionStages.WithProvisioningState, DefinitionStages.WithScaleUnit, DefinitionStages.WithServiceBusEndpoint, DefinitionStages.WithSku, DefinitionStages.WithStatus, DefinitionStages.WithSubscriptionId, DefinitionStages.WithUpdatedAt { + interface WithCreate extends Creatable, Resource.DefinitionWithTags, DefinitionStages.WithCreatedAt, DefinitionStages.WithCritical, DefinitionStages.WithDataCenter, DefinitionStages.WithEnabled, DefinitionStages.WithNamespaceCreateOrUpdateParametersName, DefinitionStages.WithNamespaceType, DefinitionStages.WithProvisioningState, DefinitionStages.WithRegion, DefinitionStages.WithScaleUnit, DefinitionStages.WithServiceBusEndpoint, DefinitionStages.WithSku, DefinitionStages.WithStatus, DefinitionStages.WithSubscriptionId, DefinitionStages.WithUpdatedAt { } } /** diff --git a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/CheckAvailabilityResultInner.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/CheckAvailabilityResultInner.java index 1080a649ee40..218598b72205 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/CheckAvailabilityResultInner.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/CheckAvailabilityResultInner.java @@ -14,7 +14,7 @@ import com.microsoft.azure.Resource; /** - * Description of a CheckAvailibility resource. + * Description of a CheckAvailability resource. */ @SkipParentValidation public class CheckAvailabilityResultInner extends Resource { diff --git a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceResourceImpl.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceResourceImpl.java index 78651650e8c5..20ec2c790ab3 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceResourceImpl.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceResourceImpl.java @@ -113,6 +113,11 @@ public String provisioningState() { return this.inner().provisioningState(); } + @Override + public String region() { + return this.inner().region(); + } + @Override public String scaleUnit() { return this.inner().scaleUnit(); @@ -185,6 +190,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-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceResourceInner.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceResourceInner.java index a7e015a1611c..a7ef121e5a24 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceResourceInner.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceResourceInner.java @@ -36,10 +36,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; @@ -159,7 +159,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 */ @@ -168,7 +168,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-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java index 28d5772bca46..c48803b0f7ee 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespaceSharedAccessAuthorizationRuleResourceImpl.java @@ -41,7 +41,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-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespacesImpl.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespacesImpl.java index 08561e14e2fe..9efc45c3dc91 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespacesImpl.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespacesImpl.java @@ -177,10 +177,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-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespacesInner.java b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespacesInner.java index 19656b77575a..2fda14d3b9da 100644 --- a/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespacesInner.java +++ b/sdk/notificationhubs/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/notificationhubs/v2017_04_01/implementation/NamespacesInner.java @@ -657,7 +657,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 properties Properties of the Namespace AuthorizationRules. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server @@ -673,7 +673,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 properties Properties of the Namespace AuthorizationRules. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation @@ -688,7 +688,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 properties Properties of the Namespace AuthorizationRules. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the SharedAccessAuthorizationRuleResourceInner object @@ -707,7 +707,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)); + } } }); } @@ -146,10 +150,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)); + } } }); }