From 4e6f025130e9ef15213d847d6e9492f88c4945f6 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Tue, 14 Apr 2020 16:43:05 +0000 Subject: [PATCH] Generated from 8c85f5b2b682127a68c9fc1ba600050ac674cad4 fix model validation --- sdk/servicefabric/mgmt-v2018_02_01/pom.xml | 2 +- .../management/servicefabric/v2018_02_01/Cluster.java | 4 ++-- .../v2018_02_01/ClusterUpdateParameters.java | 6 +++--- .../servicefabric/v2018_02_01/NodeTypeDescription.java | 6 +++--- .../v2018_02_01/implementation/ClusterInner.java | 6 +++--- .../implementation/ClusterVersionsImpl.java | 10 +++++++--- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/sdk/servicefabric/mgmt-v2018_02_01/pom.xml b/sdk/servicefabric/mgmt-v2018_02_01/pom.xml index f34de14100dd..a8bbdaaca20e 100644 --- a/sdk/servicefabric/mgmt-v2018_02_01/pom.xml +++ b/sdk/servicefabric/mgmt-v2018_02_01/pom.xml @@ -11,7 +11,7 @@ com.microsoft.azure azure-arm-parent - 1.2.0 + 1.1.0 ../../../pom.management.xml azure-mgmt-servicefabric diff --git a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/Cluster.java b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/Cluster.java index 397296274b82..a8b953979491 100644 --- a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/Cluster.java +++ b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/Cluster.java @@ -295,7 +295,7 @@ interface WithFabricSettings { interface WithReliabilityLevel { /** * Specifies reliabilityLevel. - * @param reliabilityLevel The reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * @param reliabilityLevel The reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. @@ -490,7 +490,7 @@ interface WithNodeTypes { interface WithReliabilityLevel { /** * Specifies reliabilityLevel. - * @param reliabilityLevel The reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * @param reliabilityLevel The reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. diff --git a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/ClusterUpdateParameters.java b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/ClusterUpdateParameters.java index 2993ea8a8562..ffd59ea2bd42 100644 --- a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/ClusterUpdateParameters.java +++ b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/ClusterUpdateParameters.java @@ -80,7 +80,7 @@ public class ClusterUpdateParameters { /** * The reliability level sets the replica set size of system services. * Learn about - * [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * [ReliabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). * * - None - Run the System services with a target replica set count of 1. * This should only be used for test clusters. @@ -289,7 +289,7 @@ public ClusterUpdateParameters withNodeTypes(List nodeTypes } /** - * Get the reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * Get the reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. @@ -304,7 +304,7 @@ public String reliabilityLevel() { } /** - * Set the reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * Set the reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. diff --git a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/NodeTypeDescription.java b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/NodeTypeDescription.java index 8d3cabc81ab7..dcfcd534a589 100644 --- a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/NodeTypeDescription.java +++ b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/NodeTypeDescription.java @@ -51,7 +51,7 @@ public class NodeTypeDescription { /** * The durability level of the node type. Learn about - * [DurabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * [DurabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). * * - Bronze - No privileges. This is the default. * - Silver - The infrastructure jobs can be paused for a duration of 10 @@ -200,7 +200,7 @@ public NodeTypeDescription withHttpGatewayEndpointPort(int httpGatewayEndpointPo } /** - * Get the durability level of the node type. Learn about [DurabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * Get the durability level of the node type. Learn about [DurabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). - Bronze - No privileges. This is the default. - Silver - The infrastructure jobs can be paused for a duration of 10 minutes per UD. - Gold - The infrastructure jobs can be paused for a duration of 2 hours per UD. Gold durability can be enabled only on full node VM SKUs like D15_V2, G5 etc. @@ -213,7 +213,7 @@ public String durabilityLevel() { } /** - * Set the durability level of the node type. Learn about [DurabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * Set the durability level of the node type. Learn about [DurabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). - Bronze - No privileges. This is the default. - Silver - The infrastructure jobs can be paused for a duration of 10 minutes per UD. - Gold - The infrastructure jobs can be paused for a duration of 2 hours per UD. Gold durability can be enabled only on full node VM SKUs like D15_V2, G5 etc. diff --git a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/implementation/ClusterInner.java b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/implementation/ClusterInner.java index a87f30ad90ae..ac19f13e3535 100644 --- a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/implementation/ClusterInner.java +++ b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/implementation/ClusterInner.java @@ -171,7 +171,7 @@ public class ClusterInner extends Resource { /** * The reliability level sets the replica set size of system services. * Learn about - * [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * [ReliabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). * * - None - Run the System services with a target replica set count of 1. * This should only be used for test clusters. @@ -504,7 +504,7 @@ public ProvisioningState provisioningState() { } /** - * Get the reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * Get the reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. @@ -519,7 +519,7 @@ public String reliabilityLevel() { } /** - * Set the reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). + * Set the reliability level sets the replica set size of system services. Learn about [ReliabilityLevel](https://docs.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. diff --git a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/implementation/ClusterVersionsImpl.java b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/implementation/ClusterVersionsImpl.java index 5a4237eba858..ddb381af04aa 100644 --- a/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/implementation/ClusterVersionsImpl.java +++ b/sdk/servicefabric/mgmt-v2018_02_01/src/main/java/com/microsoft/azure/management/servicefabric/v2018_02_01/implementation/ClusterVersionsImpl.java @@ -71,10 +71,14 @@ public ClusterCodeVersionsListResult call(ClusterCodeVersionsListResultInner inn public Observable getAsync(String location, String clusterVersion) { ClusterVersionsInner client = this.inner(); return client.getAsync(location, clusterVersion) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public ClusterCodeVersionsListResult call(ClusterCodeVersionsListResultInner inner) { - return wrapModel(inner); + public Observable call(ClusterCodeVersionsListResultInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((ClusterCodeVersionsListResult)wrapModel(inner)); + } } }); }