From d2dcfadc35e9919dc6cc479937ede9aa3e8352ee Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Mon, 29 Jun 2020 23:04:08 +0000 Subject: [PATCH 1/2] Update from master --- sdk/network/mgmt-v2020_04_01/pom.xml | 6 ++--- .../network/v2020_04_01/HubRouteTable.java | 5 ++-- .../LoadBalancerBackendAddress.java | 26 +++++-------------- .../network/v2020_04_01/Subnet.java | 2 -- .../implementation/HubRouteTableImpl.java | 5 ++-- .../implementation/HubRouteTableInner.java | 10 +++---- 6 files changed, 19 insertions(+), 35 deletions(-) diff --git a/sdk/network/mgmt-v2020_04_01/pom.xml b/sdk/network/mgmt-v2020_04_01/pom.xml index 2b4830250704..afe05c06ed58 100644 --- a/sdk/network/mgmt-v2020_04_01/pom.xml +++ b/sdk/network/mgmt-v2020_04_01/pom.xml @@ -11,11 +11,11 @@ com.microsoft.azure azure-arm-parent - 1.3.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-network - 1.0.0-beta-1 + 1.0.0-beta jar Microsoft Azure SDK for Network Management This package contains Microsoft Network Management SDK. diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java index 84c28b8f4b41..724830b05bdb 100644 --- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java +++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java @@ -18,7 +18,6 @@ import com.microsoft.azure.arm.resources.models.HasManager; import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager; import java.util.List; -import com.microsoft.azure.SubResource; /** * Type representing HubRouteTable. @@ -27,7 +26,7 @@ public interface HubRouteTable extends HasInner, Indexable, /** * @return the associatedConnections value. */ - List associatedConnections(); + List associatedConnections(); /** * @return the etag value. @@ -52,7 +51,7 @@ public interface HubRouteTable extends HasInner, Indexable, /** * @return the propagatingConnections value. */ - List propagatingConnections(); + List propagatingConnections(); /** * @return the provisioningState value. diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java index 6f7aa9e7a1b7..e0f0fcd35bc8 100644 --- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java +++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java @@ -8,8 +8,7 @@ package com.microsoft.azure.management.network.v2020_04_01; -import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkInner; -import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner; +import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -22,7 +21,7 @@ public class LoadBalancerBackendAddress { * Reference to an existing virtual network. */ @JsonProperty(value = "properties.virtualNetwork") - private VirtualNetworkInner virtualNetwork; + private SubResource virtualNetwork; /** * IP Address belonging to the referenced virtual network. @@ -33,8 +32,8 @@ public class LoadBalancerBackendAddress { /** * Reference to IP address defined in network interfaces. */ - @JsonProperty(value = "properties.networkInterfaceIPConfiguration") - private NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration; + @JsonProperty(value = "properties.networkInterfaceIPConfiguration", access = JsonProperty.Access.WRITE_ONLY) + private SubResource networkInterfaceIPConfiguration; /** * Name of the backend address. @@ -47,7 +46,7 @@ public class LoadBalancerBackendAddress { * * @return the virtualNetwork value */ - public VirtualNetworkInner virtualNetwork() { + public SubResource virtualNetwork() { return this.virtualNetwork; } @@ -57,7 +56,7 @@ public VirtualNetworkInner virtualNetwork() { * @param virtualNetwork the virtualNetwork value to set * @return the LoadBalancerBackendAddress object itself. */ - public LoadBalancerBackendAddress withVirtualNetwork(VirtualNetworkInner virtualNetwork) { + public LoadBalancerBackendAddress withVirtualNetwork(SubResource virtualNetwork) { this.virtualNetwork = virtualNetwork; return this; } @@ -87,21 +86,10 @@ public LoadBalancerBackendAddress withIpAddress(String ipAddress) { * * @return the networkInterfaceIPConfiguration value */ - public NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration() { + public SubResource networkInterfaceIPConfiguration() { return this.networkInterfaceIPConfiguration; } - /** - * Set reference to IP address defined in network interfaces. - * - * @param networkInterfaceIPConfiguration the networkInterfaceIPConfiguration value to set - * @return the LoadBalancerBackendAddress object itself. - */ - public LoadBalancerBackendAddress withNetworkInterfaceIPConfiguration(NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration) { - this.networkInterfaceIPConfiguration = networkInterfaceIPConfiguration; - return this; - } - /** * Get name of the backend address. * diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java index 92cb82eda4eb..acb080dca709 100644 --- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java +++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java @@ -9,8 +9,6 @@ package com.microsoft.azure.management.network.v2020_04_01; import com.microsoft.azure.arm.model.HasInner; -import com.microsoft.azure.management.network.v2020_04_01.implementation.ResourceNavigationLinkInner; -import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceAssociationLinkInner; import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetInner; import com.microsoft.azure.arm.model.Indexable; import com.microsoft.azure.arm.model.Refreshable; diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java index 8f5b23be7922..591c5f2c01ba 100644 --- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java +++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java @@ -13,7 +13,6 @@ import rx.Observable; import java.util.List; import com.microsoft.azure.management.network.v2020_04_01.HubRoute; -import com.microsoft.azure.SubResource; import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState; class HubRouteTableImpl extends CreatableUpdatableImpl implements HubRouteTable, HubRouteTable.Definition, HubRouteTable.Update { @@ -74,7 +73,7 @@ public boolean isInCreateMode() { @Override - public List associatedConnections() { + public List associatedConnections() { return this.inner().associatedConnections(); } @@ -99,7 +98,7 @@ public String name() { } @Override - public List propagatingConnections() { + public List propagatingConnections() { return this.inner().propagatingConnections(); } diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java index 1917dbc0e8b0..20f734ec8e8a 100644 --- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java +++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java @@ -10,10 +10,10 @@ import java.util.List; import com.microsoft.azure.management.network.v2020_04_01.HubRoute; -import com.microsoft.azure.SubResource; import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.SubResource; /** * RouteTable resource in a virtual hub. @@ -36,13 +36,13 @@ public class HubRouteTableInner extends SubResource { * List of all connections associated with this route table. */ @JsonProperty(value = "properties.associatedConnections", access = JsonProperty.Access.WRITE_ONLY) - private List associatedConnections; + private List associatedConnections; /** * List of all connections that advertise to this route table. */ @JsonProperty(value = "properties.propagatingConnections", access = JsonProperty.Access.WRITE_ONLY) - private List propagatingConnections; + private List propagatingConnections; /** * The provisioning state of the RouteTable resource. Possible values @@ -115,7 +115,7 @@ public HubRouteTableInner withLabels(List labels) { * * @return the associatedConnections value */ - public List associatedConnections() { + public List associatedConnections() { return this.associatedConnections; } @@ -124,7 +124,7 @@ public List associatedConnections() { * * @return the propagatingConnections value */ - public List propagatingConnections() { + public List propagatingConnections() { return this.propagatingConnections; } From 66f15c14e01f2843b754b2b9574f82f5fc7acf3d Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Tue, 30 Jun 2020 01:23:12 +0000 Subject: [PATCH 2/2] Generated from f623ead25fe62ba910864d808ca10c144d6ac036 Fixed prettier warning --- .../management/network/v2020_04_01/HubRouteTable.java | 5 +++-- .../v2020_04_01/implementation/HubRouteTableImpl.java | 5 +++-- .../v2020_04_01/implementation/HubRouteTableInner.java | 10 +++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java index 724830b05bdb..84c28b8f4b41 100644 --- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java +++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java @@ -18,6 +18,7 @@ import com.microsoft.azure.arm.resources.models.HasManager; import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager; import java.util.List; +import com.microsoft.azure.SubResource; /** * Type representing HubRouteTable. @@ -26,7 +27,7 @@ public interface HubRouteTable extends HasInner, Indexable, /** * @return the associatedConnections value. */ - List associatedConnections(); + List associatedConnections(); /** * @return the etag value. @@ -51,7 +52,7 @@ public interface HubRouteTable extends HasInner, Indexable, /** * @return the propagatingConnections value. */ - List propagatingConnections(); + List propagatingConnections(); /** * @return the provisioningState value. diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java index 591c5f2c01ba..8f5b23be7922 100644 --- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java +++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java @@ -13,6 +13,7 @@ import rx.Observable; import java.util.List; import com.microsoft.azure.management.network.v2020_04_01.HubRoute; +import com.microsoft.azure.SubResource; import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState; class HubRouteTableImpl extends CreatableUpdatableImpl implements HubRouteTable, HubRouteTable.Definition, HubRouteTable.Update { @@ -73,7 +74,7 @@ public boolean isInCreateMode() { @Override - public List associatedConnections() { + public List associatedConnections() { return this.inner().associatedConnections(); } @@ -98,7 +99,7 @@ public String name() { } @Override - public List propagatingConnections() { + public List propagatingConnections() { return this.inner().propagatingConnections(); } diff --git a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java index 20f734ec8e8a..1917dbc0e8b0 100644 --- a/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java +++ b/sdk/network/mgmt-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java @@ -10,10 +10,10 @@ import java.util.List; import com.microsoft.azure.management.network.v2020_04_01.HubRoute; +import com.microsoft.azure.SubResource; import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; -import com.microsoft.azure.SubResource; /** * RouteTable resource in a virtual hub. @@ -36,13 +36,13 @@ public class HubRouteTableInner extends SubResource { * List of all connections associated with this route table. */ @JsonProperty(value = "properties.associatedConnections", access = JsonProperty.Access.WRITE_ONLY) - private List associatedConnections; + private List associatedConnections; /** * List of all connections that advertise to this route table. */ @JsonProperty(value = "properties.propagatingConnections", access = JsonProperty.Access.WRITE_ONLY) - private List propagatingConnections; + private List propagatingConnections; /** * The provisioning state of the RouteTable resource. Possible values @@ -115,7 +115,7 @@ public HubRouteTableInner withLabels(List labels) { * * @return the associatedConnections value */ - public List associatedConnections() { + public List associatedConnections() { return this.associatedConnections; } @@ -124,7 +124,7 @@ public List associatedConnections() { * * @return the propagatingConnections value */ - public List propagatingConnections() { + public List propagatingConnections() { return this.propagatingConnections; }