From 0296c0577e642664c19fd59e9c04625964303a80 Mon Sep 17 00:00:00 2001 From: Yaohai Zheng Date: Sun, 28 Jul 2019 22:57:06 +0800 Subject: [PATCH] API management: 2019-01-01 update. (#4631) --- .../resource-manager/v2019_01_01/pom.xml | 4 ++- .../ApiManagementServiceBaseProperties.java | 36 +++++++++++++++---- .../ApiManagementServiceUpdateParameters.java | 36 +++++++++++++++---- .../implementation/ApiDiagnosticsImpl.java | 10 ++++-- .../ApiIssueAttachmentsImpl.java | 10 ++++-- .../implementation/ApiIssueCommentsImpl.java | 10 ++++-- .../implementation/ApiIssuesImpl.java | 10 ++++-- .../ApiManagementServiceResourceInner.java | 36 +++++++++++++++---- .../ApiOperationPolicysImpl.java | 10 ++++-- .../implementation/ApiOperationsImpl.java | 10 ++++-- .../implementation/ApiPolicysImpl.java | 10 ++++-- .../implementation/ApiReleasesImpl.java | 10 ++++-- .../implementation/ApiSchemasImpl.java | 10 ++++-- .../ApiTagDescriptionsImpl.java | 10 ++++-- .../implementation/ProductPolicysImpl.java | 10 ++++-- .../implementation/QuotaByPeriodKeysImpl.java | 10 ++++-- .../v2019_01_01/implementation/TagsImpl.java | 10 ++++-- 17 files changed, 184 insertions(+), 58 deletions(-) diff --git a/apimanagement/resource-manager/v2019_01_01/pom.xml b/apimanagement/resource-manager/v2019_01_01/pom.xml index 1ec4457f1668d..374a27beae107 100644 --- a/apimanagement/resource-manager/v2019_01_01/pom.xml +++ b/apimanagement/resource-manager/v2019_01_01/pom.xml @@ -15,7 +15,7 @@ ../../../pom.management.xml azure-mgmt-apimanagement - 1.0.0-beta + 1.0.0-beta-1 jar Microsoft Azure SDK for ApiManagement Management This package contains Microsoft ApiManagement Management SDK. @@ -71,6 +71,8 @@ azure-arm-client-runtime test-jar test + + 1.6.5 diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/ApiManagementServiceBaseProperties.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/ApiManagementServiceBaseProperties.java index 16e5910230083..68c85c8b28e99 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/ApiManagementServiceBaseProperties.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/ApiManagementServiceBaseProperties.java @@ -110,14 +110,38 @@ public class ApiManagementServiceBaseProperties { private List additionalLocations; /** - * Custom properties of the API Management service. Setting + * Custom properties of the API Management service.</br>Setting * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` * will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, - * 1.1 and 1.2). Setting + * 1.1 and 1.2).</br>Setting * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` - * can be used to disable just TLS 1.1 and setting + * can be used to disable just TLS 1.1.</br>Setting * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` - * can be used to disable TLS 1.0 on an API Management service. + * can be used to disable TLS 1.0 on an API Management + * service.</br>Setting + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` + * can be used to disable just TLS 1.1 for communications with + * backends.</br>Setting + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` + * can be used to disable TLS 1.0 for communications with + * backends.</br>Setting + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` + * can be used to enable HTTP2 protocol on an API Management + * service.</br>Not specifying any of these properties on PATCH + * operation will reset omitted properties' values to their defaults. For + * all the settings except Http2 the default value is `True` if the service + * was created on or before April 1st 2018 and `False` otherwise. Http2 + * setting's default value is `False`.</br></br>You can disable + * any of next ciphers by using settings + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: + * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, + * TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, + * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, + * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, + * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, + * TLS_RSA_WITH_AES_128_CBC_SHA. For example, + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. + * The default value is `true` for them. */ @JsonProperty(value = "customProperties") private Map customProperties; @@ -321,7 +345,7 @@ public ApiManagementServiceBaseProperties withAdditionalLocations(List customProperties() { } /** - * Set custom properties of the API Management service. Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1 and setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service. + * Set custom properties of the API Management service.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to disable just TLS 1.1 for communications with backends.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to disable TLS 1.0 for communications with backends.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on PATCH operation will reset omitted properties' values to their defaults. For all the settings except Http2 the default value is `True` if the service was created on or before April 1st 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable any of next ciphers by using settings `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA. For example, `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. The default value is `true` for them. * * @param customProperties the customProperties value to set * @return the ApiManagementServiceBaseProperties object itself. diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/ApiManagementServiceUpdateParameters.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/ApiManagementServiceUpdateParameters.java index e7e342d2943fc..cd19935cfa231 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/ApiManagementServiceUpdateParameters.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/ApiManagementServiceUpdateParameters.java @@ -112,14 +112,38 @@ public class ApiManagementServiceUpdateParameters extends ApimResource { private List additionalLocations; /** - * Custom properties of the API Management service. Setting + * Custom properties of the API Management service.</br>Setting * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` * will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, - * 1.1 and 1.2). Setting + * 1.1 and 1.2).</br>Setting * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` - * can be used to disable just TLS 1.1 and setting + * can be used to disable just TLS 1.1.</br>Setting * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` - * can be used to disable TLS 1.0 on an API Management service. + * can be used to disable TLS 1.0 on an API Management + * service.</br>Setting + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` + * can be used to disable just TLS 1.1 for communications with + * backends.</br>Setting + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` + * can be used to disable TLS 1.0 for communications with + * backends.</br>Setting + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` + * can be used to enable HTTP2 protocol on an API Management + * service.</br>Not specifying any of these properties on PATCH + * operation will reset omitted properties' values to their defaults. For + * all the settings except Http2 the default value is `True` if the service + * was created on or before April 1st 2018 and `False` otherwise. Http2 + * setting's default value is `False`.</br></br>You can disable + * any of next ciphers by using settings + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: + * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, + * TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, + * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, + * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, + * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, + * TLS_RSA_WITH_AES_128_CBC_SHA. For example, + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. + * The default value is `true` for them. */ @JsonProperty(value = "properties.customProperties") private Map customProperties; @@ -353,7 +377,7 @@ public ApiManagementServiceUpdateParameters withAdditionalLocations(List customProperties() { } /** - * Set custom properties of the API Management service. Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1 and setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service. + * Set custom properties of the API Management service.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to disable just TLS 1.1 for communications with backends.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to disable TLS 1.0 for communications with backends.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on PATCH operation will reset omitted properties' values to their defaults. For all the settings except Http2 the default value is `True` if the service was created on or before April 1st 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable any of next ciphers by using settings `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA. For example, `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. The default value is `true` for them. * * @param customProperties the customProperties value to set * @return the ApiManagementServiceUpdateParameters object itself. diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiDiagnosticsImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiDiagnosticsImpl.java index ae6104dd75844..1d13650559b2a 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiDiagnosticsImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiDiagnosticsImpl.java @@ -70,10 +70,14 @@ public ApiDiagnosticContract call(DiagnosticContractInner inner) { public Observable getAsync(String resourceGroupName, String serviceName, String apiId, String diagnosticId) { ApiDiagnosticsInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId, diagnosticId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public ApiDiagnosticContract call(DiagnosticContractInner inner) { - return wrapModel(inner); + public Observable call(DiagnosticContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((ApiDiagnosticContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssueAttachmentsImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssueAttachmentsImpl.java index 18da8471469c3..fb156814c5e37 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssueAttachmentsImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssueAttachmentsImpl.java @@ -70,10 +70,14 @@ public IssueAttachmentContract call(IssueAttachmentContractInner inner) { public Observable getAsync(String resourceGroupName, String serviceName, String apiId, String issueId, String attachmentId) { ApiIssueAttachmentsInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId, issueId, attachmentId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public IssueAttachmentContract call(IssueAttachmentContractInner inner) { - return wrapModel(inner); + public Observable call(IssueAttachmentContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((IssueAttachmentContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssueCommentsImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssueCommentsImpl.java index cdb74dd319731..fb62d496482d5 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssueCommentsImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssueCommentsImpl.java @@ -70,10 +70,14 @@ public IssueCommentContract call(IssueCommentContractInner inner) { public Observable getAsync(String resourceGroupName, String serviceName, String apiId, String issueId, String commentId) { ApiIssueCommentsInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId, issueId, commentId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public IssueCommentContract call(IssueCommentContractInner inner) { - return wrapModel(inner); + public Observable call(IssueCommentContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((IssueCommentContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssuesImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssuesImpl.java index 4fe12eb800da8..6871aedace1c9 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssuesImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiIssuesImpl.java @@ -70,10 +70,14 @@ public IssueContract call(IssueContractInner inner) { public Observable getAsync(String resourceGroupName, String serviceName, String apiId, String issueId) { ApiIssuesInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId, issueId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public IssueContract call(IssueContractInner inner) { - return wrapModel(inner); + public Observable call(IssueContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((IssueContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiManagementServiceResourceInner.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiManagementServiceResourceInner.java index 2b3c40fa28607..c67a8b86db4f6 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiManagementServiceResourceInner.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiManagementServiceResourceInner.java @@ -120,14 +120,38 @@ public class ApiManagementServiceResourceInner extends ApimResource { private List additionalLocations; /** - * Custom properties of the API Management service. Setting + * Custom properties of the API Management service.</br>Setting * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` * will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, - * 1.1 and 1.2). Setting + * 1.1 and 1.2).</br>Setting * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` - * can be used to disable just TLS 1.1 and setting + * can be used to disable just TLS 1.1.</br>Setting * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` - * can be used to disable TLS 1.0 on an API Management service. + * can be used to disable TLS 1.0 on an API Management + * service.</br>Setting + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` + * can be used to disable just TLS 1.1 for communications with + * backends.</br>Setting + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` + * can be used to disable TLS 1.0 for communications with + * backends.</br>Setting + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` + * can be used to enable HTTP2 protocol on an API Management + * service.</br>Not specifying any of these properties on PATCH + * operation will reset omitted properties' values to their defaults. For + * all the settings except Http2 the default value is `True` if the service + * was created on or before April 1st 2018 and `False` otherwise. Http2 + * setting's default value is `False`.</br></br>You can disable + * any of next ciphers by using settings + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: + * TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, + * TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, + * TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, + * TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, + * TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, + * TLS_RSA_WITH_AES_128_CBC_SHA. For example, + * `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. + * The default value is `true` for them. */ @JsonProperty(value = "properties.customProperties") private Map customProperties; @@ -367,7 +391,7 @@ public ApiManagementServiceResourceInner withAdditionalLocations(List customProperties() { } /** - * Set custom properties of the API Management service. Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2). Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1 and setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service. + * Set custom properties of the API Management service.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168` will disable the cipher TLS_RSA_WITH_3DES_EDE_CBC_SHA for all TLS(1.0, 1.1 and 1.2).</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11` can be used to disable just TLS 1.1.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10` can be used to disable TLS 1.0 on an API Management service.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11` can be used to disable just TLS 1.1 for communications with backends.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10` can be used to disable TLS 1.0 for communications with backends.</br>Setting `Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2` can be used to enable HTTP2 protocol on an API Management service.</br>Not specifying any of these properties on PATCH operation will reset omitted properties' values to their defaults. For all the settings except Http2 the default value is `True` if the service was created on or before April 1st 2018 and `False` otherwise. Http2 setting's default value is `False`.</br></br>You can disable any of next ciphers by using settings `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.[cipher_name]`: TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA256, TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA. For example, `Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256`:`false`. The default value is `true` for them. * * @param customProperties the customProperties value to set * @return the ApiManagementServiceResourceInner object itself. diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiOperationPolicysImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiOperationPolicysImpl.java index 9e15e93875a13..8867a6e8000df 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiOperationPolicysImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiOperationPolicysImpl.java @@ -64,10 +64,14 @@ public Completable getEntityTagAsync(String resourceGroupName, String serviceNam public Observable getAsync(String resourceGroupName, String serviceName, String apiId, String operationId) { ApiOperationPolicysInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId, operationId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public OperationApiPolicyContract call(PolicyContractInner inner) { - return wrapModel(inner); + public Observable call(PolicyContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((OperationApiPolicyContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiOperationsImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiOperationsImpl.java index e80c055cf70fe..aec7ed426f8d6 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiOperationsImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiOperationsImpl.java @@ -70,10 +70,14 @@ public OperationContract call(OperationContractInner inner) { public Observable getAsync(String resourceGroupName, String serviceName, String apiId, String operationId) { ApiOperationsInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId, operationId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public OperationContract call(OperationContractInner inner) { - return wrapModel(inner); + public Observable call(OperationContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((OperationContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiPolicysImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiPolicysImpl.java index 5721e28cb3502..fdcfc0c490f06 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiPolicysImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiPolicysImpl.java @@ -64,10 +64,14 @@ public Completable getEntityTagAsync(String resourceGroupName, String serviceNam public Observable getAsync(String resourceGroupName, String serviceName, String apiId) { ApiPolicysInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public ApiPolicyContract call(PolicyContractInner inner) { - return wrapModel(inner); + public Observable call(PolicyContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((ApiPolicyContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiReleasesImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiReleasesImpl.java index 882ee3a267a47..4cc8df13df094 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiReleasesImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiReleasesImpl.java @@ -70,10 +70,14 @@ public ApiReleaseContract call(ApiReleaseContractInner inner) { public Observable getAsync(String resourceGroupName, String serviceName, String apiId, String releaseId) { ApiReleasesInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId, releaseId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public ApiReleaseContract call(ApiReleaseContractInner inner) { - return wrapModel(inner); + public Observable call(ApiReleaseContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((ApiReleaseContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiSchemasImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiSchemasImpl.java index 07edc68850401..25c5317c2858e 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiSchemasImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiSchemasImpl.java @@ -70,10 +70,14 @@ public SchemaContract call(SchemaContractInner inner) { public Observable getAsync(String resourceGroupName, String serviceName, String apiId, String schemaId) { ApiSchemasInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId, schemaId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public SchemaContract call(SchemaContractInner inner) { - return wrapModel(inner); + public Observable call(SchemaContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((SchemaContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiTagDescriptionsImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiTagDescriptionsImpl.java index 54cd58293abbe..8868ef08ad144 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiTagDescriptionsImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ApiTagDescriptionsImpl.java @@ -70,10 +70,14 @@ public TagDescriptionContract call(TagDescriptionContractInner inner) { public Observable getAsync(String resourceGroupName, String serviceName, String apiId, String tagId) { ApiTagDescriptionsInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, apiId, tagId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public TagDescriptionContract call(TagDescriptionContractInner inner) { - return wrapModel(inner); + public Observable call(TagDescriptionContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((TagDescriptionContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ProductPolicysImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ProductPolicysImpl.java index 771a4164c5ec3..c40310da8b6ad 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ProductPolicysImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/ProductPolicysImpl.java @@ -64,10 +64,14 @@ public Completable getEntityTagAsync(String resourceGroupName, String serviceNam public Observable getAsync(String resourceGroupName, String serviceName, String productId) { ProductPolicysInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, productId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public ProductPolicyContract call(PolicyContractInner inner) { - return wrapModel(inner); + public Observable call(PolicyContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((ProductPolicyContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/QuotaByPeriodKeysImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/QuotaByPeriodKeysImpl.java index d0fcfa1419217..c76603173c8d7 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/QuotaByPeriodKeysImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/QuotaByPeriodKeysImpl.java @@ -43,10 +43,14 @@ public Completable updateAsync(String resourceGroupName, String serviceName, Str public Observable getAsync(String resourceGroupName, String serviceName, String quotaCounterKey, String quotaPeriodKey) { QuotaByPeriodKeysInner client = this.inner(); return client.getAsync(resourceGroupName, serviceName, quotaCounterKey, quotaPeriodKey) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public QuotaCounterContract call(QuotaCounterContractInner inner) { - return wrapModel(inner); + public Observable call(QuotaCounterContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((QuotaCounterContract)wrapModel(inner)); + } } }); } diff --git a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/TagsImpl.java b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/TagsImpl.java index 5ea6d43932a48..ca0ec2c4647e4 100644 --- a/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/TagsImpl.java +++ b/apimanagement/resource-manager/v2019_01_01/src/main/java/com/microsoft/azure/management/apimanagement/v2019_01_01/implementation/TagsImpl.java @@ -238,10 +238,14 @@ public TagContract call(TagContractInner inner) { public Observable getByOperationAsync(String resourceGroupName, String serviceName, String apiId, String operationId, String tagId) { TagsInner client = this.inner(); return client.getByOperationAsync(resourceGroupName, serviceName, apiId, operationId, tagId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public TagContract call(TagContractInner inner) { - return wrapModel(inner); + public Observable call(TagContractInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((TagContract)wrapModel(inner)); + } } }); }