From 27ab2320465cc669c5f31cd8af0b8950157c714d Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 2 Dec 2020 08:44:24 +0000 Subject: [PATCH] CodeGen from PR 11891 in Azure/azure-rest-api-specs Relay : Removed subscription and entities names from examples (#11891) * removed subscription and entities names from examples * example --- sdk/relay/mgmt-v2017_04_01/pom.xml | 4 ++-- .../implementation/HybridConnectionsImpl.java | 20 +++++++++++++------ .../implementation/NamespacesImpl.java | 10 +++++++--- .../implementation/WCFRelaysImpl.java | 20 +++++++++++++------ 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/sdk/relay/mgmt-v2017_04_01/pom.xml b/sdk/relay/mgmt-v2017_04_01/pom.xml index d2b442f30400..c0339025f1b5 100644 --- a/sdk/relay/mgmt-v2017_04_01/pom.xml +++ b/sdk/relay/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-relay 1.0.0-beta diff --git a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/HybridConnectionsImpl.java b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/HybridConnectionsImpl.java index 8ef35ae4901e..743a9a35c315 100644 --- a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/HybridConnectionsImpl.java +++ b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/HybridConnectionsImpl.java @@ -67,10 +67,14 @@ public HybridConnection call(HybridConnectionInner inner) { public Observable getAsync(String resourceGroupName, String namespaceName, String hybridConnectionName) { HybridConnectionsInner client = this.inner(); return client.getAsync(resourceGroupName, namespaceName, hybridConnectionName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public HybridConnection call(HybridConnectionInner inner) { - return wrapModel(inner); + public Observable call(HybridConnectionInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((HybridConnection)wrapModel(inner)); + } } }); } @@ -107,10 +111,14 @@ private Observable getAuthorizationRuleInnerUsingHybridC public Observable getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String hybridConnectionName, String authorizationRuleName) { HybridConnectionsInner client = this.inner(); return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, hybridConnectionName, authorizationRuleName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public HybridConnectionNamespaceAuthorizationRule call(AuthorizationRuleInner inner) { - return wrapHybridConnectionNamespaceAuthorizationRuleModel(inner); + public Observable call(AuthorizationRuleInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((HybridConnectionNamespaceAuthorizationRule)wrapHybridConnectionNamespaceAuthorizationRuleModel(inner)); + } } }); } diff --git a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/NamespacesImpl.java b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/NamespacesImpl.java index fc629fc39f96..719527723180 100644 --- a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/NamespacesImpl.java +++ b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/NamespacesImpl.java @@ -176,10 +176,14 @@ private Observable getAuthorizationRuleInnerUsingNamespa 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 NamespaceAuthorizationRule call(AuthorizationRuleInner inner) { - return wrapNamespaceAuthorizationRuleModel(inner); + public Observable call(AuthorizationRuleInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((NamespaceAuthorizationRule)wrapNamespaceAuthorizationRuleModel(inner)); + } } }); } diff --git a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/WCFRelaysImpl.java b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/WCFRelaysImpl.java index 228fc548a847..0ea0ea403f8f 100644 --- a/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/WCFRelaysImpl.java +++ b/sdk/relay/mgmt-v2017_04_01/src/main/java/com/microsoft/azure/management/relay/v2017_04_01/implementation/WCFRelaysImpl.java @@ -67,10 +67,14 @@ public WcfRelay call(WcfRelayInner inner) { public Observable getAsync(String resourceGroupName, String namespaceName, String relayName) { WCFRelaysInner client = this.inner(); return client.getAsync(resourceGroupName, namespaceName, relayName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public WcfRelay call(WcfRelayInner inner) { - return wrapModel(inner); + public Observable call(WcfRelayInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((WcfRelay)wrapModel(inner)); + } } }); } @@ -107,10 +111,14 @@ private Observable getAuthorizationRuleInnerUsingWCFRela public Observable getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String relayName, String authorizationRuleName) { WCFRelaysInner client = this.inner(); return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, relayName, authorizationRuleName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public WcfRelayNamespaceAuthorizationRule call(AuthorizationRuleInner inner) { - return wrapWcfRelayNamespaceAuthorizationRuleModel(inner); + public Observable call(AuthorizationRuleInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((WcfRelayNamespaceAuthorizationRule)wrapWcfRelayNamespaceAuthorizationRuleModel(inner)); + } } }); }