diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkProfile.java index 96e2b61e00286..bc933d5a43bcc 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkProfile.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.compute; import java.util.List; +import com.microsoft.azure.management.compute.implementation.NetworkInterfaceReferenceInner; /** * Describes a network profile. @@ -17,14 +18,14 @@ public class NetworkProfile { /** * the network interfaces. */ - private List networkInterfaces; + private List networkInterfaces; /** * Get the networkInterfaces value. * * @return the networkInterfaces value */ - public List networkInterfaces() { + public List networkInterfaces() { return this.networkInterfaces; } @@ -34,7 +35,7 @@ public List networkInterfaces() { * @param networkInterfaces the networkInterfaces value to set * @return the NetworkProfile object itself. */ - public NetworkProfile withNetworkInterfaces(List networkInterfaces) { + public NetworkProfile withNetworkInterfaces(List networkInterfaces) { this.networkInterfaces = networkInterfaces; return this; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtensionProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtensionProfile.java index 215c152ce442b..199fbf03181fe 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtensionProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtensionProfile.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.compute; import java.util.List; +import com.microsoft.azure.management.compute.implementation.VirtualMachineScaleSetExtensionInner; /** * Describes a virtual machine scale set extension profile. @@ -17,14 +18,14 @@ public class VirtualMachineScaleSetExtensionProfile { /** * the virtual machine scale set child extension resources. */ - private List extensions; + private List extensions; /** * Get the extensions value. * * @return the extensions value */ - public List extensions() { + public List extensions() { return this.extensions; } @@ -34,7 +35,7 @@ public List extensions() { * @param extensions the extensions value to set * @return the VirtualMachineScaleSetExtensionProfile object itself. */ - public VirtualMachineScaleSetExtensionProfile withExtensions(List extensions) { + public VirtualMachineScaleSetExtensionProfile withExtensions(List extensions) { this.extensions = extensions; return this; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkProfile.java index c6adc67e890e3..792a1d20d962c 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkProfile.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.compute; import java.util.List; +import com.microsoft.azure.management.compute.implementation.VirtualMachineScaleSetNetworkConfigurationInner; /** * Describes a virtual machine scale set network profile. @@ -17,14 +18,14 @@ public class VirtualMachineScaleSetNetworkProfile { /** * the list of network configurations. */ - private List networkInterfaceConfigurations; + private List networkInterfaceConfigurations; /** * Get the networkInterfaceConfigurations value. * * @return the networkInterfaceConfigurations value */ - public List networkInterfaceConfigurations() { + public List networkInterfaceConfigurations() { return this.networkInterfaceConfigurations; } @@ -34,7 +35,7 @@ public List networkInterfaceConfigur * @param networkInterfaceConfigurations the networkInterfaceConfigurations value to set * @return the VirtualMachineScaleSetNetworkProfile object itself. */ - public VirtualMachineScaleSetNetworkProfile withNetworkInterfaceConfigurations(List networkInterfaceConfigurations) { + public VirtualMachineScaleSetNetworkProfile withNetworkInterfaceConfigurations(List networkInterfaceConfigurations) { this.networkInterfaceConfigurations = networkInterfaceConfigurations; return this; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkInterfaceReference.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/NetworkInterfaceReferenceInner.java similarity index 77% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkInterfaceReference.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/NetworkInterfaceReferenceInner.java index c9648eea6bc42..098b9fc84ad25 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/NetworkInterfaceReference.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/NetworkInterfaceReferenceInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute; +package com.microsoft.azure.management.compute.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -16,7 +16,7 @@ * Describes a network interface reference. */ @JsonFlatten -public class NetworkInterfaceReference extends SubResource { +public class NetworkInterfaceReferenceInner extends SubResource { /** * whether this is a primary NIC on a virtual machine. */ @@ -36,9 +36,9 @@ public Boolean primary() { * Set the primary value. * * @param primary the primary value to set - * @return the NetworkInterfaceReference object itself. + * @return the NetworkInterfaceReferenceInner object itself. */ - public NetworkInterfaceReference withPrimary(Boolean primary) { + public NetworkInterfaceReferenceInner withPrimary(Boolean primary) { this.primary = primary; return this; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java index 40c67d882ca0a..7f6191cba0fdc 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java @@ -35,7 +35,6 @@ import com.microsoft.azure.management.compute.WinRMConfiguration; import com.microsoft.azure.management.compute.SshConfiguration; import com.microsoft.azure.management.compute.SshPublicKey; -import com.microsoft.azure.management.compute.NetworkInterfaceReference; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.PublicIpAddress; @@ -677,7 +676,7 @@ public VirtualMachineImpl withoutSecondaryNetworkInterface(String name) { if (this.inner().networkProfile() != null && this.inner().networkProfile().networkInterfaces() != null) { int idx = -1; - for (NetworkInterfaceReference nicReference : this.inner().networkProfile().networkInterfaces()) { + for (NetworkInterfaceReferenceInner nicReference : this.inner().networkProfile().networkInterfaces()) { idx++; if (!nicReference.primary() && name.equalsIgnoreCase(ResourceUtils.nameFromResourceId(nicReference.id()))) { @@ -754,7 +753,7 @@ public PublicIpAddress primaryPublicIpAddress() throws CloudException, IOExcepti @Override public List networkInterfaceIds() { List nicIds = new ArrayList<>(); - for (NetworkInterfaceReference nicRef : inner().networkProfile().networkInterfaces()) { + for (NetworkInterfaceReferenceInner nicRef : inner().networkProfile().networkInterfaces()) { nicIds.add(nicRef.id()); } return nicIds; @@ -762,7 +761,7 @@ public List networkInterfaceIds() { @Override public String primaryNetworkInterfaceId() { - final List nicRefs = this.inner().networkProfile().networkInterfaces(); + final List nicRefs = this.inner().networkProfile().networkInterfaces(); String primaryNicRefId = null; if (nicRefs.size() == 1) { @@ -773,7 +772,7 @@ public String primaryNetworkInterfaceId() { primaryNicRefId = null; } else { // Find primary interface as flagged by Azure - for (NetworkInterfaceReference nicRef : inner().networkProfile().networkInterfaces()) { + for (NetworkInterfaceReferenceInner nicRef : inner().networkProfile().networkInterfaces()) { if (nicRef.primary() != null && nicRef.primary()) { primaryNicRefId = nicRef.id(); break; @@ -1077,7 +1076,7 @@ private void handleNetworkSettings() { } if (primaryNetworkInterface != null) { - NetworkInterfaceReference nicReference = new NetworkInterfaceReference(); + NetworkInterfaceReferenceInner nicReference = new NetworkInterfaceReferenceInner(); nicReference.withPrimary(true); nicReference.withId(primaryNetworkInterface.id()); this.inner().networkProfile().networkInterfaces().add(nicReference); @@ -1088,14 +1087,14 @@ private void handleNetworkSettings() { // for (String creatableSecondaryNetworkInterfaceKey : this.creatableSecondaryNetworkInterfaceKeys) { NetworkInterface secondaryNetworkInterface = (NetworkInterface) this.createdResource(creatableSecondaryNetworkInterfaceKey); - NetworkInterfaceReference nicReference = new NetworkInterfaceReference(); + NetworkInterfaceReferenceInner nicReference = new NetworkInterfaceReferenceInner(); nicReference.withPrimary(false); nicReference.withId(secondaryNetworkInterface.id()); this.inner().networkProfile().networkInterfaces().add(nicReference); } for (NetworkInterface secondaryNetworkInterface : this.existingSecondaryNetworkInterfacesToAssociate) { - NetworkInterfaceReference nicReference = new NetworkInterfaceReference(); + NetworkInterfaceReferenceInner nicReference = new NetworkInterfaceReferenceInner(); nicReference.withPrimary(false); nicReference.withId(secondaryNetworkInterface.id()); this.inner().networkProfile().networkInterfaces().add(nicReference); diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetExtensionInner.java similarity index 78% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetExtensionInner.java index 7c40207c7e9b6..700460e8c3605 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetExtensionInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute; +package com.microsoft.azure.management.compute.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -16,7 +16,7 @@ * Describes a Virtual Machine Scale Set Extension. */ @JsonFlatten -public class VirtualMachineScaleSetExtension extends SubResource { +public class VirtualMachineScaleSetExtensionInner extends SubResource { /** * the name of the extension. */ @@ -78,9 +78,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the VirtualMachineScaleSetExtension object itself. + * @return the VirtualMachineScaleSetExtensionInner object itself. */ - public VirtualMachineScaleSetExtension withName(String name) { + public VirtualMachineScaleSetExtensionInner withName(String name) { this.name = name; return this; } @@ -98,9 +98,9 @@ public String publisher() { * Set the publisher value. * * @param publisher the publisher value to set - * @return the VirtualMachineScaleSetExtension object itself. + * @return the VirtualMachineScaleSetExtensionInner object itself. */ - public VirtualMachineScaleSetExtension withPublisher(String publisher) { + public VirtualMachineScaleSetExtensionInner withPublisher(String publisher) { this.publisher = publisher; return this; } @@ -118,9 +118,9 @@ public String type() { * Set the type value. * * @param type the type value to set - * @return the VirtualMachineScaleSetExtension object itself. + * @return the VirtualMachineScaleSetExtensionInner object itself. */ - public VirtualMachineScaleSetExtension withType(String type) { + public VirtualMachineScaleSetExtensionInner withType(String type) { this.type = type; return this; } @@ -138,9 +138,9 @@ public String typeHandlerVersion() { * Set the typeHandlerVersion value. * * @param typeHandlerVersion the typeHandlerVersion value to set - * @return the VirtualMachineScaleSetExtension object itself. + * @return the VirtualMachineScaleSetExtensionInner object itself. */ - public VirtualMachineScaleSetExtension withTypeHandlerVersion(String typeHandlerVersion) { + public VirtualMachineScaleSetExtensionInner withTypeHandlerVersion(String typeHandlerVersion) { this.typeHandlerVersion = typeHandlerVersion; return this; } @@ -158,9 +158,9 @@ public Boolean autoUpgradeMinorVersion() { * Set the autoUpgradeMinorVersion value. * * @param autoUpgradeMinorVersion the autoUpgradeMinorVersion value to set - * @return the VirtualMachineScaleSetExtension object itself. + * @return the VirtualMachineScaleSetExtensionInner object itself. */ - public VirtualMachineScaleSetExtension withAutoUpgradeMinorVersion(Boolean autoUpgradeMinorVersion) { + public VirtualMachineScaleSetExtensionInner withAutoUpgradeMinorVersion(Boolean autoUpgradeMinorVersion) { this.autoUpgradeMinorVersion = autoUpgradeMinorVersion; return this; } @@ -178,9 +178,9 @@ public Object settings() { * Set the settings value. * * @param settings the settings value to set - * @return the VirtualMachineScaleSetExtension object itself. + * @return the VirtualMachineScaleSetExtensionInner object itself. */ - public VirtualMachineScaleSetExtension withSettings(Object settings) { + public VirtualMachineScaleSetExtensionInner withSettings(Object settings) { this.settings = settings; return this; } @@ -198,9 +198,9 @@ public Object protectedSettings() { * Set the protectedSettings value. * * @param protectedSettings the protectedSettings value to set - * @return the VirtualMachineScaleSetExtension object itself. + * @return the VirtualMachineScaleSetExtensionInner object itself. */ - public VirtualMachineScaleSetExtension withProtectedSettings(Object protectedSettings) { + public VirtualMachineScaleSetExtensionInner withProtectedSettings(Object protectedSettings) { this.protectedSettings = protectedSettings; return this; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetIPConfiguration.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetIPConfigurationInner.java similarity index 75% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetIPConfiguration.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetIPConfigurationInner.java index ffbfa2cbfbb67..2402dbc17156f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetIPConfiguration.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetIPConfigurationInner.java @@ -6,8 +6,9 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute; +package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.compute.ApiEntityReference; import java.util.List; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,7 +18,7 @@ * Describes a virtual machine scale set network profile's IP configuration. */ @JsonFlatten -public class VirtualMachineScaleSetIPConfiguration extends SubResource { +public class VirtualMachineScaleSetIPConfigurationInner extends SubResource { /** * the IP configuration name. */ @@ -61,9 +62,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the VirtualMachineScaleSetIPConfiguration object itself. + * @return the VirtualMachineScaleSetIPConfigurationInner object itself. */ - public VirtualMachineScaleSetIPConfiguration withName(String name) { + public VirtualMachineScaleSetIPConfigurationInner withName(String name) { this.name = name; return this; } @@ -81,9 +82,9 @@ public ApiEntityReference subnet() { * Set the subnet value. * * @param subnet the subnet value to set - * @return the VirtualMachineScaleSetIPConfiguration object itself. + * @return the VirtualMachineScaleSetIPConfigurationInner object itself. */ - public VirtualMachineScaleSetIPConfiguration withSubnet(ApiEntityReference subnet) { + public VirtualMachineScaleSetIPConfigurationInner withSubnet(ApiEntityReference subnet) { this.subnet = subnet; return this; } @@ -101,9 +102,9 @@ public List applicationGatewayBackendAddressPools() { * Set the applicationGatewayBackendAddressPools value. * * @param applicationGatewayBackendAddressPools the applicationGatewayBackendAddressPools value to set - * @return the VirtualMachineScaleSetIPConfiguration object itself. + * @return the VirtualMachineScaleSetIPConfigurationInner object itself. */ - public VirtualMachineScaleSetIPConfiguration withApplicationGatewayBackendAddressPools(List applicationGatewayBackendAddressPools) { + public VirtualMachineScaleSetIPConfigurationInner withApplicationGatewayBackendAddressPools(List applicationGatewayBackendAddressPools) { this.applicationGatewayBackendAddressPools = applicationGatewayBackendAddressPools; return this; } @@ -121,9 +122,9 @@ public List loadBalancerBackendAddressPools() { * Set the loadBalancerBackendAddressPools value. * * @param loadBalancerBackendAddressPools the loadBalancerBackendAddressPools value to set - * @return the VirtualMachineScaleSetIPConfiguration object itself. + * @return the VirtualMachineScaleSetIPConfigurationInner object itself. */ - public VirtualMachineScaleSetIPConfiguration withLoadBalancerBackendAddressPools(List loadBalancerBackendAddressPools) { + public VirtualMachineScaleSetIPConfigurationInner withLoadBalancerBackendAddressPools(List loadBalancerBackendAddressPools) { this.loadBalancerBackendAddressPools = loadBalancerBackendAddressPools; return this; } @@ -141,9 +142,9 @@ public List loadBalancerInboundNatPools() { * Set the loadBalancerInboundNatPools value. * * @param loadBalancerInboundNatPools the loadBalancerInboundNatPools value to set - * @return the VirtualMachineScaleSetIPConfiguration object itself. + * @return the VirtualMachineScaleSetIPConfigurationInner object itself. */ - public VirtualMachineScaleSetIPConfiguration withLoadBalancerInboundNatPools(List loadBalancerInboundNatPools) { + public VirtualMachineScaleSetIPConfigurationInner withLoadBalancerInboundNatPools(List loadBalancerInboundNatPools) { this.loadBalancerInboundNatPools = loadBalancerInboundNatPools; return this; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkConfiguration.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetNetworkConfigurationInner.java similarity index 68% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkConfiguration.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetNetworkConfigurationInner.java index 8b2c191a30f98..e4d61e3af6b23 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetNetworkConfiguration.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetNetworkConfigurationInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.compute; +package com.microsoft.azure.management.compute.implementation; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,7 +18,7 @@ * configurations. */ @JsonFlatten -public class VirtualMachineScaleSetNetworkConfiguration extends SubResource { +public class VirtualMachineScaleSetNetworkConfigurationInner extends SubResource { /** * the network configuration name. */ @@ -35,7 +35,7 @@ public class VirtualMachineScaleSetNetworkConfiguration extends SubResource { * the virtual machine scale set IP Configuration. */ @JsonProperty(value = "properties.ipConfigurations", required = true) - private List ipConfigurations; + private List ipConfigurations; /** * Get the name value. @@ -50,9 +50,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the VirtualMachineScaleSetNetworkConfiguration object itself. + * @return the VirtualMachineScaleSetNetworkConfigurationInner object itself. */ - public VirtualMachineScaleSetNetworkConfiguration withName(String name) { + public VirtualMachineScaleSetNetworkConfigurationInner withName(String name) { this.name = name; return this; } @@ -70,9 +70,9 @@ public Boolean primary() { * Set the primary value. * * @param primary the primary value to set - * @return the VirtualMachineScaleSetNetworkConfiguration object itself. + * @return the VirtualMachineScaleSetNetworkConfigurationInner object itself. */ - public VirtualMachineScaleSetNetworkConfiguration withPrimary(Boolean primary) { + public VirtualMachineScaleSetNetworkConfigurationInner withPrimary(Boolean primary) { this.primary = primary; return this; } @@ -82,7 +82,7 @@ public VirtualMachineScaleSetNetworkConfiguration withPrimary(Boolean primary) { * * @return the ipConfigurations value */ - public List ipConfigurations() { + public List ipConfigurations() { return this.ipConfigurations; } @@ -90,9 +90,9 @@ public List ipConfigurations() { * Set the ipConfigurations value. * * @param ipConfigurations the ipConfigurations value to set - * @return the VirtualMachineScaleSetNetworkConfiguration object itself. + * @return the VirtualMachineScaleSetNetworkConfigurationInner object itself. */ - public VirtualMachineScaleSetNetworkConfiguration withIpConfigurations(List ipConfigurations) { + public VirtualMachineScaleSetNetworkConfigurationInner withIpConfigurations(List ipConfigurations) { this.ipConfigurations = ipConfigurations; return this; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java index eee350ca41945..6ab462fddc542 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java @@ -11,7 +11,6 @@ import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSizes; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.NetworkInterfaceReference; import com.microsoft.azure.management.compute.StorageProfile; import com.microsoft.azure.management.compute.OSDisk; import com.microsoft.azure.management.compute.DataDisk; @@ -147,7 +146,7 @@ protected VirtualMachineImpl wrapModel(String name) { inner.withOsProfile(new OSProfile()); inner.withHardwareProfile(new HardwareProfile()); inner.withNetworkProfile(new NetworkProfile() - .withNetworkInterfaces(new ArrayList())); + .withNetworkInterfaces(new ArrayList())); return new VirtualMachineImpl(name, inner, this.innerCollection, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java index 746a434d52769..946a0bdf6af06 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java @@ -1,6 +1,7 @@ package com.microsoft.azure.management.network; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.network.implementation.NetworkInterfaceIPConfigurationInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; import com.microsoft.azure.management.resources.fluentcore.model.Attachable; import com.microsoft.azure.management.resources.fluentcore.model.Creatable; @@ -13,7 +14,7 @@ * An IP configuration in a network interface. */ public interface NicIpConfiguration extends - Wrapper, + Wrapper, ChildResource { // Getters diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientConfiguration.java index d1ae5de8c50a0..c71295f44f13d 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientConfiguration.java @@ -9,6 +9,8 @@ package com.microsoft.azure.management.network; import java.util.List; +import com.microsoft.azure.management.network.implementation.VpnClientRootCertificateInner; +import com.microsoft.azure.management.network.implementation.VpnClientRevokedCertificateInner; /** * VpnClientConfiguration for P2S client. @@ -23,12 +25,12 @@ public class VpnClientConfiguration { /** * VpnClientRootCertificate for Virtual network gateway. */ - private List vpnClientRootCertificates; + private List vpnClientRootCertificates; /** * VpnClientRevokedCertificate for Virtual network gateway. */ - private List vpnClientRevokedCertificates; + private List vpnClientRevokedCertificates; /** * Get the vpnClientAddressPool value. @@ -55,7 +57,7 @@ public VpnClientConfiguration withVpnClientAddressPool(AddressSpace vpnClientAdd * * @return the vpnClientRootCertificates value */ - public List vpnClientRootCertificates() { + public List vpnClientRootCertificates() { return this.vpnClientRootCertificates; } @@ -65,7 +67,7 @@ public List vpnClientRootCertificates() { * @param vpnClientRootCertificates the vpnClientRootCertificates value to set * @return the VpnClientConfiguration object itself. */ - public VpnClientConfiguration withVpnClientRootCertificates(List vpnClientRootCertificates) { + public VpnClientConfiguration withVpnClientRootCertificates(List vpnClientRootCertificates) { this.vpnClientRootCertificates = vpnClientRootCertificates; return this; } @@ -75,7 +77,7 @@ public VpnClientConfiguration withVpnClientRootCertificates(List vpnClientRevokedCertificates() { + public List vpnClientRevokedCertificates() { return this.vpnClientRevokedCertificates; } @@ -85,7 +87,7 @@ public List vpnClientRevokedCertificates() { * @param vpnClientRevokedCertificates the vpnClientRevokedCertificates value to set * @return the VpnClientConfiguration object itself. */ - public VpnClientConfiguration withVpnClientRevokedCertificates(List vpnClientRevokedCertificates) { + public VpnClientConfiguration withVpnClientRevokedCertificates(List vpnClientRevokedCertificates) { this.vpnClientRevokedCertificates = vpnClientRevokedCertificates; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddressPool.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendAddressPoolInner.java similarity index 74% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddressPool.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendAddressPoolInner.java index 9fbcf78d8ba6b..51ecd1ae7107a 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendAddressPool.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendAddressPoolInner.java @@ -6,10 +6,11 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import java.util.List; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.ApplicationGatewayBackendAddress; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -17,7 +18,7 @@ * Backend Address Pool of application gateway. */ @JsonFlatten -public class ApplicationGatewayBackendAddressPool extends SubResource { +public class ApplicationGatewayBackendAddressPoolInner extends SubResource { /** * Gets or sets backendIPConfiguration of application gateway. */ @@ -61,9 +62,9 @@ public List backendIPConfigurations() { * Set the backendIPConfigurations value. * * @param backendIPConfigurations the backendIPConfigurations value to set - * @return the ApplicationGatewayBackendAddressPool object itself. + * @return the ApplicationGatewayBackendAddressPoolInner object itself. */ - public ApplicationGatewayBackendAddressPool withBackendIPConfigurations(List backendIPConfigurations) { + public ApplicationGatewayBackendAddressPoolInner withBackendIPConfigurations(List backendIPConfigurations) { this.backendIPConfigurations = backendIPConfigurations; return this; } @@ -81,9 +82,9 @@ public List backendAddresses() { * Set the backendAddresses value. * * @param backendAddresses the backendAddresses value to set - * @return the ApplicationGatewayBackendAddressPool object itself. + * @return the ApplicationGatewayBackendAddressPoolInner object itself. */ - public ApplicationGatewayBackendAddressPool withBackendAddresses(List backendAddresses) { + public ApplicationGatewayBackendAddressPoolInner withBackendAddresses(List backendAddresses) { this.backendAddresses = backendAddresses; return this; } @@ -101,9 +102,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayBackendAddressPool object itself. + * @return the ApplicationGatewayBackendAddressPoolInner object itself. */ - public ApplicationGatewayBackendAddressPool withProvisioningState(String provisioningState) { + public ApplicationGatewayBackendAddressPoolInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -121,9 +122,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayBackendAddressPool object itself. + * @return the ApplicationGatewayBackendAddressPoolInner object itself. */ - public ApplicationGatewayBackendAddressPool withName(String name) { + public ApplicationGatewayBackendAddressPoolInner withName(String name) { this.name = name; return this; } @@ -141,9 +142,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayBackendAddressPool object itself. + * @return the ApplicationGatewayBackendAddressPoolInner object itself. */ - public ApplicationGatewayBackendAddressPool withEtag(String etag) { + public ApplicationGatewayBackendAddressPoolInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendHttpSettings.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendHttpSettingsInner.java similarity index 75% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendHttpSettings.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendHttpSettingsInner.java index 85efd38237a96..9f1301101812f 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayBackendHttpSettings.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendHttpSettingsInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +16,7 @@ * Backend address pool settings of application gateway. */ @JsonFlatten -public class ApplicationGatewayBackendHttpSettings extends SubResource { +public class ApplicationGatewayBackendHttpSettingsInner extends SubResource { /** * Gets or sets the port. */ @@ -79,9 +79,9 @@ public Integer port() { * Set the port value. * * @param port the port value to set - * @return the ApplicationGatewayBackendHttpSettings object itself. + * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettings withPort(Integer port) { + public ApplicationGatewayBackendHttpSettingsInner withPort(Integer port) { this.port = port; return this; } @@ -99,9 +99,9 @@ public String protocol() { * Set the protocol value. * * @param protocol the protocol value to set - * @return the ApplicationGatewayBackendHttpSettings object itself. + * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettings withProtocol(String protocol) { + public ApplicationGatewayBackendHttpSettingsInner withProtocol(String protocol) { this.protocol = protocol; return this; } @@ -119,9 +119,9 @@ public String cookieBasedAffinity() { * Set the cookieBasedAffinity value. * * @param cookieBasedAffinity the cookieBasedAffinity value to set - * @return the ApplicationGatewayBackendHttpSettings object itself. + * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettings withCookieBasedAffinity(String cookieBasedAffinity) { + public ApplicationGatewayBackendHttpSettingsInner withCookieBasedAffinity(String cookieBasedAffinity) { this.cookieBasedAffinity = cookieBasedAffinity; return this; } @@ -139,9 +139,9 @@ public Integer requestTimeout() { * Set the requestTimeout value. * * @param requestTimeout the requestTimeout value to set - * @return the ApplicationGatewayBackendHttpSettings object itself. + * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettings withRequestTimeout(Integer requestTimeout) { + public ApplicationGatewayBackendHttpSettingsInner withRequestTimeout(Integer requestTimeout) { this.requestTimeout = requestTimeout; return this; } @@ -159,9 +159,9 @@ public SubResource probe() { * Set the probe value. * * @param probe the probe value to set - * @return the ApplicationGatewayBackendHttpSettings object itself. + * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettings withProbe(SubResource probe) { + public ApplicationGatewayBackendHttpSettingsInner withProbe(SubResource probe) { this.probe = probe; return this; } @@ -179,9 +179,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayBackendHttpSettings object itself. + * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettings withProvisioningState(String provisioningState) { + public ApplicationGatewayBackendHttpSettingsInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -199,9 +199,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayBackendHttpSettings object itself. + * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettings withName(String name) { + public ApplicationGatewayBackendHttpSettingsInner withName(String name) { this.name = name; return this; } @@ -219,9 +219,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayBackendHttpSettings object itself. + * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettings withEtag(String etag) { + public ApplicationGatewayBackendHttpSettingsInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendIPConfigurationInner.java similarity index 72% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendIPConfigurationInner.java index 5438740d28466..ec5b7dc522ed5 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendIPConfigurationInner.java @@ -6,19 +6,20 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; /** - * IpConfiguration for Virtual network gateway. + * Frontend IP configuration of application gateway. */ @JsonFlatten -public class VirtualNetworkGatewayIPConfiguration extends SubResource { +public class ApplicationGatewayFrontendIPConfigurationInner extends SubResource { /** - * Gets or sets the privateIPAddress of the IP Configuration. + * Gets or sets the privateIPAddress of the Network Interface IP + * Configuration. */ @JsonProperty(value = "properties.privateIPAddress") private String privateIPAddress; @@ -73,9 +74,9 @@ public String privateIPAddress() { * Set the privateIPAddress value. * * @param privateIPAddress the privateIPAddress value to set - * @return the VirtualNetworkGatewayIPConfiguration object itself. + * @return the ApplicationGatewayFrontendIPConfigurationInner object itself. */ - public VirtualNetworkGatewayIPConfiguration withPrivateIPAddress(String privateIPAddress) { + public ApplicationGatewayFrontendIPConfigurationInner withPrivateIPAddress(String privateIPAddress) { this.privateIPAddress = privateIPAddress; return this; } @@ -93,9 +94,9 @@ public String privateIPAllocationMethod() { * Set the privateIPAllocationMethod value. * * @param privateIPAllocationMethod the privateIPAllocationMethod value to set - * @return the VirtualNetworkGatewayIPConfiguration object itself. + * @return the ApplicationGatewayFrontendIPConfigurationInner object itself. */ - public VirtualNetworkGatewayIPConfiguration withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public ApplicationGatewayFrontendIPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } @@ -113,9 +114,9 @@ public SubResource subnet() { * Set the subnet value. * * @param subnet the subnet value to set - * @return the VirtualNetworkGatewayIPConfiguration object itself. + * @return the ApplicationGatewayFrontendIPConfigurationInner object itself. */ - public VirtualNetworkGatewayIPConfiguration withSubnet(SubResource subnet) { + public ApplicationGatewayFrontendIPConfigurationInner withSubnet(SubResource subnet) { this.subnet = subnet; return this; } @@ -133,9 +134,9 @@ public SubResource publicIPAddress() { * Set the publicIPAddress value. * * @param publicIPAddress the publicIPAddress value to set - * @return the VirtualNetworkGatewayIPConfiguration object itself. + * @return the ApplicationGatewayFrontendIPConfigurationInner object itself. */ - public VirtualNetworkGatewayIPConfiguration withPublicIPAddress(SubResource publicIPAddress) { + public ApplicationGatewayFrontendIPConfigurationInner withPublicIPAddress(SubResource publicIPAddress) { this.publicIPAddress = publicIPAddress; return this; } @@ -153,9 +154,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the VirtualNetworkGatewayIPConfiguration object itself. + * @return the ApplicationGatewayFrontendIPConfigurationInner object itself. */ - public VirtualNetworkGatewayIPConfiguration withProvisioningState(String provisioningState) { + public ApplicationGatewayFrontendIPConfigurationInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -173,9 +174,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the VirtualNetworkGatewayIPConfiguration object itself. + * @return the ApplicationGatewayFrontendIPConfigurationInner object itself. */ - public VirtualNetworkGatewayIPConfiguration withName(String name) { + public ApplicationGatewayFrontendIPConfigurationInner withName(String name) { this.name = name; return this; } @@ -193,9 +194,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the VirtualNetworkGatewayIPConfiguration object itself. + * @return the ApplicationGatewayFrontendIPConfigurationInner object itself. */ - public VirtualNetworkGatewayIPConfiguration withEtag(String etag) { + public ApplicationGatewayFrontendIPConfigurationInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendPort.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendPortInner.java similarity index 76% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendPort.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendPortInner.java index defc62991dce2..81444ea46f0ac 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendPort.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendPortInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -16,7 +16,7 @@ * Frontend Port of application gateway. */ @JsonFlatten -public class ApplicationGatewayFrontendPort extends SubResource { +public class ApplicationGatewayFrontendPortInner extends SubResource { /** * Gets or sets the frontend port. */ @@ -54,9 +54,9 @@ public Integer port() { * Set the port value. * * @param port the port value to set - * @return the ApplicationGatewayFrontendPort object itself. + * @return the ApplicationGatewayFrontendPortInner object itself. */ - public ApplicationGatewayFrontendPort withPort(Integer port) { + public ApplicationGatewayFrontendPortInner withPort(Integer port) { this.port = port; return this; } @@ -74,9 +74,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayFrontendPort object itself. + * @return the ApplicationGatewayFrontendPortInner object itself. */ - public ApplicationGatewayFrontendPort withProvisioningState(String provisioningState) { + public ApplicationGatewayFrontendPortInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -94,9 +94,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayFrontendPort object itself. + * @return the ApplicationGatewayFrontendPortInner object itself. */ - public ApplicationGatewayFrontendPort withName(String name) { + public ApplicationGatewayFrontendPortInner withName(String name) { this.name = name; return this; } @@ -114,9 +114,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayFrontendPort object itself. + * @return the ApplicationGatewayFrontendPortInner object itself. */ - public ApplicationGatewayFrontendPort withEtag(String etag) { + public ApplicationGatewayFrontendPortInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayHttpListener.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayHttpListenerInner.java similarity index 77% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayHttpListener.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayHttpListenerInner.java index f78aa01550655..9036dc2c9edf3 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayHttpListener.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayHttpListenerInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +16,7 @@ * Http listener of application gateway. */ @JsonFlatten -public class ApplicationGatewayHttpListener extends SubResource { +public class ApplicationGatewayHttpListenerInner extends SubResource { /** * Gets or sets frontend IP configuration resource of application gateway. */ @@ -84,9 +84,9 @@ public SubResource frontendIPConfiguration() { * Set the frontendIPConfiguration value. * * @param frontendIPConfiguration the frontendIPConfiguration value to set - * @return the ApplicationGatewayHttpListener object itself. + * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListener withFrontendIPConfiguration(SubResource frontendIPConfiguration) { + public ApplicationGatewayHttpListenerInner withFrontendIPConfiguration(SubResource frontendIPConfiguration) { this.frontendIPConfiguration = frontendIPConfiguration; return this; } @@ -104,9 +104,9 @@ public SubResource frontendPort() { * Set the frontendPort value. * * @param frontendPort the frontendPort value to set - * @return the ApplicationGatewayHttpListener object itself. + * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListener withFrontendPort(SubResource frontendPort) { + public ApplicationGatewayHttpListenerInner withFrontendPort(SubResource frontendPort) { this.frontendPort = frontendPort; return this; } @@ -124,9 +124,9 @@ public String protocol() { * Set the protocol value. * * @param protocol the protocol value to set - * @return the ApplicationGatewayHttpListener object itself. + * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListener withProtocol(String protocol) { + public ApplicationGatewayHttpListenerInner withProtocol(String protocol) { this.protocol = protocol; return this; } @@ -144,9 +144,9 @@ public String hostName() { * Set the hostName value. * * @param hostName the hostName value to set - * @return the ApplicationGatewayHttpListener object itself. + * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListener withHostName(String hostName) { + public ApplicationGatewayHttpListenerInner withHostName(String hostName) { this.hostName = hostName; return this; } @@ -164,9 +164,9 @@ public SubResource sslCertificate() { * Set the sslCertificate value. * * @param sslCertificate the sslCertificate value to set - * @return the ApplicationGatewayHttpListener object itself. + * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListener withSslCertificate(SubResource sslCertificate) { + public ApplicationGatewayHttpListenerInner withSslCertificate(SubResource sslCertificate) { this.sslCertificate = sslCertificate; return this; } @@ -184,9 +184,9 @@ public Boolean requireServerNameIndication() { * Set the requireServerNameIndication value. * * @param requireServerNameIndication the requireServerNameIndication value to set - * @return the ApplicationGatewayHttpListener object itself. + * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListener withRequireServerNameIndication(Boolean requireServerNameIndication) { + public ApplicationGatewayHttpListenerInner withRequireServerNameIndication(Boolean requireServerNameIndication) { this.requireServerNameIndication = requireServerNameIndication; return this; } @@ -204,9 +204,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayHttpListener object itself. + * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListener withProvisioningState(String provisioningState) { + public ApplicationGatewayHttpListenerInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -224,9 +224,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayHttpListener object itself. + * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListener withName(String name) { + public ApplicationGatewayHttpListenerInner withName(String name) { this.name = name; return this; } @@ -244,9 +244,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayHttpListener object itself. + * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListener withEtag(String etag) { + public ApplicationGatewayHttpListenerInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayIPConfigurationInner.java similarity index 76% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayIPConfigurationInner.java index db9620ec45558..1dc7bb277fde9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayIPConfigurationInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +16,7 @@ * IP configuration of application gateway. */ @JsonFlatten -public class ApplicationGatewayIPConfiguration extends SubResource { +public class ApplicationGatewayIPConfigurationInner extends SubResource { /** * Gets or sets the reference of the subnet resource.A subnet from where * appliation gateway gets its private address. @@ -55,9 +55,9 @@ public SubResource subnet() { * Set the subnet value. * * @param subnet the subnet value to set - * @return the ApplicationGatewayIPConfiguration object itself. + * @return the ApplicationGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayIPConfiguration withSubnet(SubResource subnet) { + public ApplicationGatewayIPConfigurationInner withSubnet(SubResource subnet) { this.subnet = subnet; return this; } @@ -75,9 +75,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayIPConfiguration object itself. + * @return the ApplicationGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayIPConfiguration withProvisioningState(String provisioningState) { + public ApplicationGatewayIPConfigurationInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -95,9 +95,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayIPConfiguration object itself. + * @return the ApplicationGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayIPConfiguration withName(String name) { + public ApplicationGatewayIPConfigurationInner withName(String name) { this.name = name; return this; } @@ -115,9 +115,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayIPConfiguration object itself. + * @return the ApplicationGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayIPConfiguration withEtag(String etag) { + public ApplicationGatewayIPConfigurationInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java index ac19cbd07a825..f794018cda7ab 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java @@ -10,16 +10,6 @@ import com.microsoft.azure.management.network.ApplicationGatewaySku; import java.util.List; -import com.microsoft.azure.management.network.ApplicationGatewayIPConfiguration; -import com.microsoft.azure.management.network.ApplicationGatewaySslCertificate; -import com.microsoft.azure.management.network.ApplicationGatewayFrontendIPConfiguration; -import com.microsoft.azure.management.network.ApplicationGatewayFrontendPort; -import com.microsoft.azure.management.network.ApplicationGatewayProbe; -import com.microsoft.azure.management.network.ApplicationGatewayBackendAddressPool; -import com.microsoft.azure.management.network.ApplicationGatewayBackendHttpSettings; -import com.microsoft.azure.management.network.ApplicationGatewayHttpListener; -import com.microsoft.azure.management.network.ApplicationGatewayUrlPathMap; -import com.microsoft.azure.management.network.ApplicationGatewayRequestRoutingRule; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; @@ -46,61 +36,61 @@ public class ApplicationGatewayInner extends Resource { * Gets or sets subnets of application gateway resource. */ @JsonProperty(value = "properties.gatewayIPConfigurations") - private List gatewayIPConfigurations; + private List gatewayIPConfigurations; /** * Gets or sets ssl certificates of application gateway resource. */ @JsonProperty(value = "properties.sslCertificates") - private List sslCertificates; + private List sslCertificates; /** * Gets or sets frontend IP addresses of application gateway resource. */ @JsonProperty(value = "properties.frontendIPConfigurations") - private List frontendIPConfigurations; + private List frontendIPConfigurations; /** * Gets or sets frontend ports of application gateway resource. */ @JsonProperty(value = "properties.frontendPorts") - private List frontendPorts; + private List frontendPorts; /** * Gets or sets probes of application gateway resource. */ @JsonProperty(value = "properties.probes") - private List probes; + private List probes; /** * Gets or sets backend address pool of application gateway resource. */ @JsonProperty(value = "properties.backendAddressPools") - private List backendAddressPools; + private List backendAddressPools; /** * Gets or sets backend http settings of application gateway resource. */ @JsonProperty(value = "properties.backendHttpSettingsCollection") - private List backendHttpSettingsCollection; + private List backendHttpSettingsCollection; /** * Gets or sets HTTP listeners of application gateway resource. */ @JsonProperty(value = "properties.httpListeners") - private List httpListeners; + private List httpListeners; /** * Gets or sets URL path map of application gateway resource. */ @JsonProperty(value = "properties.urlPathMaps") - private List urlPathMaps; + private List urlPathMaps; /** * Gets or sets request routing rules of application gateway resource. */ @JsonProperty(value = "properties.requestRoutingRules") - private List requestRoutingRules; + private List requestRoutingRules; /** * Gets or sets resource guid property of the ApplicationGateway resource. @@ -155,7 +145,7 @@ public String operationalState() { * * @return the gatewayIPConfigurations value */ - public List gatewayIPConfigurations() { + public List gatewayIPConfigurations() { return this.gatewayIPConfigurations; } @@ -165,7 +155,7 @@ public List gatewayIPConfigurations() { * @param gatewayIPConfigurations the gatewayIPConfigurations value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withGatewayIPConfigurations(List gatewayIPConfigurations) { + public ApplicationGatewayInner withGatewayIPConfigurations(List gatewayIPConfigurations) { this.gatewayIPConfigurations = gatewayIPConfigurations; return this; } @@ -175,7 +165,7 @@ public ApplicationGatewayInner withGatewayIPConfigurations(List sslCertificates() { + public List sslCertificates() { return this.sslCertificates; } @@ -185,7 +175,7 @@ public List sslCertificates() { * @param sslCertificates the sslCertificates value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withSslCertificates(List sslCertificates) { + public ApplicationGatewayInner withSslCertificates(List sslCertificates) { this.sslCertificates = sslCertificates; return this; } @@ -195,7 +185,7 @@ public ApplicationGatewayInner withSslCertificates(List frontendIPConfigurations() { + public List frontendIPConfigurations() { return this.frontendIPConfigurations; } @@ -205,7 +195,7 @@ public List frontendIPConfigurations( * @param frontendIPConfigurations the frontendIPConfigurations value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withFrontendIPConfigurations(List frontendIPConfigurations) { + public ApplicationGatewayInner withFrontendIPConfigurations(List frontendIPConfigurations) { this.frontendIPConfigurations = frontendIPConfigurations; return this; } @@ -215,7 +205,7 @@ public ApplicationGatewayInner withFrontendIPConfigurations(List frontendPorts() { + public List frontendPorts() { return this.frontendPorts; } @@ -225,7 +215,7 @@ public List frontendPorts() { * @param frontendPorts the frontendPorts value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withFrontendPorts(List frontendPorts) { + public ApplicationGatewayInner withFrontendPorts(List frontendPorts) { this.frontendPorts = frontendPorts; return this; } @@ -235,7 +225,7 @@ public ApplicationGatewayInner withFrontendPorts(List probes() { + public List probes() { return this.probes; } @@ -245,7 +235,7 @@ public List probes() { * @param probes the probes value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withProbes(List probes) { + public ApplicationGatewayInner withProbes(List probes) { this.probes = probes; return this; } @@ -255,7 +245,7 @@ public ApplicationGatewayInner withProbes(List probes) * * @return the backendAddressPools value */ - public List backendAddressPools() { + public List backendAddressPools() { return this.backendAddressPools; } @@ -265,7 +255,7 @@ public List backendAddressPools() { * @param backendAddressPools the backendAddressPools value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withBackendAddressPools(List backendAddressPools) { + public ApplicationGatewayInner withBackendAddressPools(List backendAddressPools) { this.backendAddressPools = backendAddressPools; return this; } @@ -275,7 +265,7 @@ public ApplicationGatewayInner withBackendAddressPools(List backendHttpSettingsCollection() { + public List backendHttpSettingsCollection() { return this.backendHttpSettingsCollection; } @@ -285,7 +275,7 @@ public List backendHttpSettingsCollection * @param backendHttpSettingsCollection the backendHttpSettingsCollection value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withBackendHttpSettingsCollection(List backendHttpSettingsCollection) { + public ApplicationGatewayInner withBackendHttpSettingsCollection(List backendHttpSettingsCollection) { this.backendHttpSettingsCollection = backendHttpSettingsCollection; return this; } @@ -295,7 +285,7 @@ public ApplicationGatewayInner withBackendHttpSettingsCollection(List httpListeners() { + public List httpListeners() { return this.httpListeners; } @@ -305,7 +295,7 @@ public List httpListeners() { * @param httpListeners the httpListeners value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withHttpListeners(List httpListeners) { + public ApplicationGatewayInner withHttpListeners(List httpListeners) { this.httpListeners = httpListeners; return this; } @@ -315,7 +305,7 @@ public ApplicationGatewayInner withHttpListeners(List urlPathMaps() { + public List urlPathMaps() { return this.urlPathMaps; } @@ -325,7 +315,7 @@ public List urlPathMaps() { * @param urlPathMaps the urlPathMaps value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withUrlPathMaps(List urlPathMaps) { + public ApplicationGatewayInner withUrlPathMaps(List urlPathMaps) { this.urlPathMaps = urlPathMaps; return this; } @@ -335,7 +325,7 @@ public ApplicationGatewayInner withUrlPathMaps(List requestRoutingRules() { + public List requestRoutingRules() { return this.requestRoutingRules; } @@ -345,7 +335,7 @@ public List requestRoutingRules() { * @param requestRoutingRules the requestRoutingRules value to set * @return the ApplicationGatewayInner object itself. */ - public ApplicationGatewayInner withRequestRoutingRules(List requestRoutingRules) { + public ApplicationGatewayInner withRequestRoutingRules(List requestRoutingRules) { this.requestRoutingRules = requestRoutingRules; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayPathRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayPathRuleInner.java similarity index 77% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayPathRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayPathRuleInner.java index fab76f9a3b89c..4b2356fd9b347 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayPathRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayPathRuleInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import java.util.List; import com.microsoft.azure.SubResource; @@ -17,7 +17,7 @@ * Path rule of URL path map of application gateway. */ @JsonFlatten -public class ApplicationGatewayPathRule extends SubResource { +public class ApplicationGatewayPathRuleInner extends SubResource { /** * Gets or sets the path rules of URL path map. */ @@ -67,9 +67,9 @@ public List paths() { * Set the paths value. * * @param paths the paths value to set - * @return the ApplicationGatewayPathRule object itself. + * @return the ApplicationGatewayPathRuleInner object itself. */ - public ApplicationGatewayPathRule withPaths(List paths) { + public ApplicationGatewayPathRuleInner withPaths(List paths) { this.paths = paths; return this; } @@ -87,9 +87,9 @@ public SubResource backendAddressPool() { * Set the backendAddressPool value. * * @param backendAddressPool the backendAddressPool value to set - * @return the ApplicationGatewayPathRule object itself. + * @return the ApplicationGatewayPathRuleInner object itself. */ - public ApplicationGatewayPathRule withBackendAddressPool(SubResource backendAddressPool) { + public ApplicationGatewayPathRuleInner withBackendAddressPool(SubResource backendAddressPool) { this.backendAddressPool = backendAddressPool; return this; } @@ -107,9 +107,9 @@ public SubResource backendHttpSettings() { * Set the backendHttpSettings value. * * @param backendHttpSettings the backendHttpSettings value to set - * @return the ApplicationGatewayPathRule object itself. + * @return the ApplicationGatewayPathRuleInner object itself. */ - public ApplicationGatewayPathRule withBackendHttpSettings(SubResource backendHttpSettings) { + public ApplicationGatewayPathRuleInner withBackendHttpSettings(SubResource backendHttpSettings) { this.backendHttpSettings = backendHttpSettings; return this; } @@ -127,9 +127,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayPathRule object itself. + * @return the ApplicationGatewayPathRuleInner object itself. */ - public ApplicationGatewayPathRule withProvisioningState(String provisioningState) { + public ApplicationGatewayPathRuleInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -147,9 +147,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayPathRule object itself. + * @return the ApplicationGatewayPathRuleInner object itself. */ - public ApplicationGatewayPathRule withName(String name) { + public ApplicationGatewayPathRuleInner withName(String name) { this.name = name; return this; } @@ -167,9 +167,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayPathRule object itself. + * @return the ApplicationGatewayPathRuleInner object itself. */ - public ApplicationGatewayPathRule withEtag(String etag) { + public ApplicationGatewayPathRuleInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProbe.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayProbeInner.java similarity index 77% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProbe.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayProbeInner.java index e614400a1d8c9..a48de017fac59 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProbe.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayProbeInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -16,7 +16,7 @@ * Probe of application gateway. */ @JsonFlatten -public class ApplicationGatewayProbe extends SubResource { +public class ApplicationGatewayProbeInner extends SubResource { /** * Gets or sets the protocol. Possible values include: 'Http', 'Https'. */ @@ -84,9 +84,9 @@ public String protocol() { * Set the protocol value. * * @param protocol the protocol value to set - * @return the ApplicationGatewayProbe object itself. + * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbe withProtocol(String protocol) { + public ApplicationGatewayProbeInner withProtocol(String protocol) { this.protocol = protocol; return this; } @@ -104,9 +104,9 @@ public String host() { * Set the host value. * * @param host the host value to set - * @return the ApplicationGatewayProbe object itself. + * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbe withHost(String host) { + public ApplicationGatewayProbeInner withHost(String host) { this.host = host; return this; } @@ -124,9 +124,9 @@ public String path() { * Set the path value. * * @param path the path value to set - * @return the ApplicationGatewayProbe object itself. + * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbe withPath(String path) { + public ApplicationGatewayProbeInner withPath(String path) { this.path = path; return this; } @@ -144,9 +144,9 @@ public Integer interval() { * Set the interval value. * * @param interval the interval value to set - * @return the ApplicationGatewayProbe object itself. + * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbe withInterval(Integer interval) { + public ApplicationGatewayProbeInner withInterval(Integer interval) { this.interval = interval; return this; } @@ -164,9 +164,9 @@ public Integer timeout() { * Set the timeout value. * * @param timeout the timeout value to set - * @return the ApplicationGatewayProbe object itself. + * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbe withTimeout(Integer timeout) { + public ApplicationGatewayProbeInner withTimeout(Integer timeout) { this.timeout = timeout; return this; } @@ -184,9 +184,9 @@ public Integer unhealthyThreshold() { * Set the unhealthyThreshold value. * * @param unhealthyThreshold the unhealthyThreshold value to set - * @return the ApplicationGatewayProbe object itself. + * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbe withUnhealthyThreshold(Integer unhealthyThreshold) { + public ApplicationGatewayProbeInner withUnhealthyThreshold(Integer unhealthyThreshold) { this.unhealthyThreshold = unhealthyThreshold; return this; } @@ -204,9 +204,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayProbe object itself. + * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbe withProvisioningState(String provisioningState) { + public ApplicationGatewayProbeInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -224,9 +224,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayProbe object itself. + * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbe withName(String name) { + public ApplicationGatewayProbeInner withName(String name) { this.name = name; return this; } @@ -244,9 +244,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayProbe object itself. + * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbe withEtag(String etag) { + public ApplicationGatewayProbeInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleInner.java similarity index 75% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleInner.java index 577e7fb9baf98..722b0587d4f6d 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +16,7 @@ * Request routing rule of application gateway. */ @JsonFlatten -public class ApplicationGatewayRequestRoutingRule extends SubResource { +public class ApplicationGatewayRequestRoutingRuleInner extends SubResource { /** * Gets or sets the rule type. Possible values include: 'Basic', * 'PathBasedRouting'. @@ -79,9 +79,9 @@ public String ruleType() { * Set the ruleType value. * * @param ruleType the ruleType value to set - * @return the ApplicationGatewayRequestRoutingRule object itself. + * @return the ApplicationGatewayRequestRoutingRuleInner object itself. */ - public ApplicationGatewayRequestRoutingRule withRuleType(String ruleType) { + public ApplicationGatewayRequestRoutingRuleInner withRuleType(String ruleType) { this.ruleType = ruleType; return this; } @@ -99,9 +99,9 @@ public SubResource backendAddressPool() { * Set the backendAddressPool value. * * @param backendAddressPool the backendAddressPool value to set - * @return the ApplicationGatewayRequestRoutingRule object itself. + * @return the ApplicationGatewayRequestRoutingRuleInner object itself. */ - public ApplicationGatewayRequestRoutingRule withBackendAddressPool(SubResource backendAddressPool) { + public ApplicationGatewayRequestRoutingRuleInner withBackendAddressPool(SubResource backendAddressPool) { this.backendAddressPool = backendAddressPool; return this; } @@ -119,9 +119,9 @@ public SubResource backendHttpSettings() { * Set the backendHttpSettings value. * * @param backendHttpSettings the backendHttpSettings value to set - * @return the ApplicationGatewayRequestRoutingRule object itself. + * @return the ApplicationGatewayRequestRoutingRuleInner object itself. */ - public ApplicationGatewayRequestRoutingRule withBackendHttpSettings(SubResource backendHttpSettings) { + public ApplicationGatewayRequestRoutingRuleInner withBackendHttpSettings(SubResource backendHttpSettings) { this.backendHttpSettings = backendHttpSettings; return this; } @@ -139,9 +139,9 @@ public SubResource httpListener() { * Set the httpListener value. * * @param httpListener the httpListener value to set - * @return the ApplicationGatewayRequestRoutingRule object itself. + * @return the ApplicationGatewayRequestRoutingRuleInner object itself. */ - public ApplicationGatewayRequestRoutingRule withHttpListener(SubResource httpListener) { + public ApplicationGatewayRequestRoutingRuleInner withHttpListener(SubResource httpListener) { this.httpListener = httpListener; return this; } @@ -159,9 +159,9 @@ public SubResource urlPathMap() { * Set the urlPathMap value. * * @param urlPathMap the urlPathMap value to set - * @return the ApplicationGatewayRequestRoutingRule object itself. + * @return the ApplicationGatewayRequestRoutingRuleInner object itself. */ - public ApplicationGatewayRequestRoutingRule withUrlPathMap(SubResource urlPathMap) { + public ApplicationGatewayRequestRoutingRuleInner withUrlPathMap(SubResource urlPathMap) { this.urlPathMap = urlPathMap; return this; } @@ -179,9 +179,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayRequestRoutingRule object itself. + * @return the ApplicationGatewayRequestRoutingRuleInner object itself. */ - public ApplicationGatewayRequestRoutingRule withProvisioningState(String provisioningState) { + public ApplicationGatewayRequestRoutingRuleInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -199,9 +199,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayRequestRoutingRule object itself. + * @return the ApplicationGatewayRequestRoutingRuleInner object itself. */ - public ApplicationGatewayRequestRoutingRule withName(String name) { + public ApplicationGatewayRequestRoutingRuleInner withName(String name) { this.name = name; return this; } @@ -219,9 +219,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayRequestRoutingRule object itself. + * @return the ApplicationGatewayRequestRoutingRuleInner object itself. */ - public ApplicationGatewayRequestRoutingRule withEtag(String etag) { + public ApplicationGatewayRequestRoutingRuleInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySslCertificate.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewaySslCertificateInner.java similarity index 75% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySslCertificate.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewaySslCertificateInner.java index e1938170366b6..ac4b0cec8b891 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySslCertificate.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewaySslCertificateInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -16,7 +16,7 @@ * SSL certificates of application gateway. */ @JsonFlatten -public class ApplicationGatewaySslCertificate extends SubResource { +public class ApplicationGatewaySslCertificateInner extends SubResource { /** * Gets or sets the certificate data. */ @@ -66,9 +66,9 @@ public String data() { * Set the data value. * * @param data the data value to set - * @return the ApplicationGatewaySslCertificate object itself. + * @return the ApplicationGatewaySslCertificateInner object itself. */ - public ApplicationGatewaySslCertificate withData(String data) { + public ApplicationGatewaySslCertificateInner withData(String data) { this.data = data; return this; } @@ -86,9 +86,9 @@ public String password() { * Set the password value. * * @param password the password value to set - * @return the ApplicationGatewaySslCertificate object itself. + * @return the ApplicationGatewaySslCertificateInner object itself. */ - public ApplicationGatewaySslCertificate withPassword(String password) { + public ApplicationGatewaySslCertificateInner withPassword(String password) { this.password = password; return this; } @@ -106,9 +106,9 @@ public String publicCertData() { * Set the publicCertData value. * * @param publicCertData the publicCertData value to set - * @return the ApplicationGatewaySslCertificate object itself. + * @return the ApplicationGatewaySslCertificateInner object itself. */ - public ApplicationGatewaySslCertificate withPublicCertData(String publicCertData) { + public ApplicationGatewaySslCertificateInner withPublicCertData(String publicCertData) { this.publicCertData = publicCertData; return this; } @@ -126,9 +126,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewaySslCertificate object itself. + * @return the ApplicationGatewaySslCertificateInner object itself. */ - public ApplicationGatewaySslCertificate withProvisioningState(String provisioningState) { + public ApplicationGatewaySslCertificateInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -146,9 +146,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewaySslCertificate object itself. + * @return the ApplicationGatewaySslCertificateInner object itself. */ - public ApplicationGatewaySslCertificate withName(String name) { + public ApplicationGatewaySslCertificateInner withName(String name) { this.name = name; return this; } @@ -166,9 +166,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewaySslCertificate object itself. + * @return the ApplicationGatewaySslCertificateInner object itself. */ - public ApplicationGatewaySslCertificate withEtag(String etag) { + public ApplicationGatewaySslCertificateInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayUrlPathMap.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayUrlPathMapInner.java similarity index 75% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayUrlPathMap.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayUrlPathMapInner.java index a8da57fd8d062..789f4740274ac 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayUrlPathMap.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayUrlPathMapInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import java.util.List; @@ -17,7 +17,7 @@ * UrlPathMap of application gateway. */ @JsonFlatten -public class ApplicationGatewayUrlPathMap extends SubResource { +public class ApplicationGatewayUrlPathMapInner extends SubResource { /** * Gets or sets default backend address pool resource of URL path map. */ @@ -34,7 +34,7 @@ public class ApplicationGatewayUrlPathMap extends SubResource { * Gets or sets path rule of URL path map resource. */ @JsonProperty(value = "properties.pathRules") - private List pathRules; + private List pathRules; /** * Gets or sets Provisioning state of the backend http settings resource @@ -67,9 +67,9 @@ public SubResource defaultBackendAddressPool() { * Set the defaultBackendAddressPool value. * * @param defaultBackendAddressPool the defaultBackendAddressPool value to set - * @return the ApplicationGatewayUrlPathMap object itself. + * @return the ApplicationGatewayUrlPathMapInner object itself. */ - public ApplicationGatewayUrlPathMap withDefaultBackendAddressPool(SubResource defaultBackendAddressPool) { + public ApplicationGatewayUrlPathMapInner withDefaultBackendAddressPool(SubResource defaultBackendAddressPool) { this.defaultBackendAddressPool = defaultBackendAddressPool; return this; } @@ -87,9 +87,9 @@ public SubResource defaultBackendHttpSettings() { * Set the defaultBackendHttpSettings value. * * @param defaultBackendHttpSettings the defaultBackendHttpSettings value to set - * @return the ApplicationGatewayUrlPathMap object itself. + * @return the ApplicationGatewayUrlPathMapInner object itself. */ - public ApplicationGatewayUrlPathMap withDefaultBackendHttpSettings(SubResource defaultBackendHttpSettings) { + public ApplicationGatewayUrlPathMapInner withDefaultBackendHttpSettings(SubResource defaultBackendHttpSettings) { this.defaultBackendHttpSettings = defaultBackendHttpSettings; return this; } @@ -99,7 +99,7 @@ public ApplicationGatewayUrlPathMap withDefaultBackendHttpSettings(SubResource d * * @return the pathRules value */ - public List pathRules() { + public List pathRules() { return this.pathRules; } @@ -107,9 +107,9 @@ public List pathRules() { * Set the pathRules value. * * @param pathRules the pathRules value to set - * @return the ApplicationGatewayUrlPathMap object itself. + * @return the ApplicationGatewayUrlPathMapInner object itself. */ - public ApplicationGatewayUrlPathMap withPathRules(List pathRules) { + public ApplicationGatewayUrlPathMapInner withPathRules(List pathRules) { this.pathRules = pathRules; return this; } @@ -127,9 +127,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayUrlPathMap object itself. + * @return the ApplicationGatewayUrlPathMapInner object itself. */ - public ApplicationGatewayUrlPathMap withProvisioningState(String provisioningState) { + public ApplicationGatewayUrlPathMapInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -147,9 +147,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayUrlPathMap object itself. + * @return the ApplicationGatewayUrlPathMapInner object itself. */ - public ApplicationGatewayUrlPathMap withName(String name) { + public ApplicationGatewayUrlPathMapInner withName(String name) { this.name = name; return this; } @@ -167,9 +167,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayUrlPathMap object itself. + * @return the ApplicationGatewayUrlPathMapInner object itself. */ - public ApplicationGatewayUrlPathMap withEtag(String etag) { + public ApplicationGatewayUrlPathMapInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/BackendAddressPool.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/BackendAddressPoolInner.java similarity index 75% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/BackendAddressPool.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/BackendAddressPoolInner.java index 681dc12fa1747..c066277ccb1c3 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/BackendAddressPool.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/BackendAddressPoolInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import java.util.List; import com.microsoft.azure.SubResource; @@ -17,12 +17,12 @@ * Pool of backend IP addresseses. */ @JsonFlatten -public class BackendAddressPool extends SubResource { +public class BackendAddressPoolInner extends SubResource { /** * Gets collection of references to IPs defined in NICs. */ @JsonProperty(value = "properties.backendIPConfigurations") - private List backendIPConfigurations; + private List backendIPConfigurations; /** * Gets Load Balancing rules that use this Backend Address Pool. @@ -58,7 +58,7 @@ public class BackendAddressPool extends SubResource { * * @return the backendIPConfigurations value */ - public List backendIPConfigurations() { + public List backendIPConfigurations() { return this.backendIPConfigurations; } @@ -66,9 +66,9 @@ public List backendIPConfigurations() { * Set the backendIPConfigurations value. * * @param backendIPConfigurations the backendIPConfigurations value to set - * @return the BackendAddressPool object itself. + * @return the BackendAddressPoolInner object itself. */ - public BackendAddressPool withBackendIPConfigurations(List backendIPConfigurations) { + public BackendAddressPoolInner withBackendIPConfigurations(List backendIPConfigurations) { this.backendIPConfigurations = backendIPConfigurations; return this; } @@ -86,9 +86,9 @@ public List loadBalancingRules() { * Set the loadBalancingRules value. * * @param loadBalancingRules the loadBalancingRules value to set - * @return the BackendAddressPool object itself. + * @return the BackendAddressPoolInner object itself. */ - public BackendAddressPool withLoadBalancingRules(List loadBalancingRules) { + public BackendAddressPoolInner withLoadBalancingRules(List loadBalancingRules) { this.loadBalancingRules = loadBalancingRules; return this; } @@ -106,9 +106,9 @@ public SubResource outboundNatRule() { * Set the outboundNatRule value. * * @param outboundNatRule the outboundNatRule value to set - * @return the BackendAddressPool object itself. + * @return the BackendAddressPoolInner object itself. */ - public BackendAddressPool withOutboundNatRule(SubResource outboundNatRule) { + public BackendAddressPoolInner withOutboundNatRule(SubResource outboundNatRule) { this.outboundNatRule = outboundNatRule; return this; } @@ -126,9 +126,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the BackendAddressPool object itself. + * @return the BackendAddressPoolInner object itself. */ - public BackendAddressPool withProvisioningState(String provisioningState) { + public BackendAddressPoolInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -146,9 +146,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the BackendAddressPool object itself. + * @return the BackendAddressPoolInner object itself. */ - public BackendAddressPool withName(String name) { + public BackendAddressPoolInner withName(String name) { this.name = name; return this; } @@ -166,9 +166,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the BackendAddressPool object itself. + * @return the BackendAddressPoolInner object itself. */ - public BackendAddressPool withEtag(String etag) { + public BackendAddressPoolInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/FrontendIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/FrontendIPConfigurationInner.java similarity index 78% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/FrontendIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/FrontendIPConfigurationInner.java index cad5e0c7e7a37..9c45a84e48cb3 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/FrontendIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/FrontendIPConfigurationInner.java @@ -6,11 +6,10 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import java.util.List; import com.microsoft.azure.SubResource; -import com.microsoft.azure.management.network.implementation.SubnetInner; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -18,7 +17,7 @@ * Frontend IP address of the load balancer. */ @JsonFlatten -public class FrontendIPConfiguration extends SubResource { +public class FrontendIPConfigurationInner extends SubResource { /** * Read only.Inbound rules URIs that use this frontend IP. */ @@ -99,9 +98,9 @@ public List inboundNatRules() { * Set the inboundNatRules value. * * @param inboundNatRules the inboundNatRules value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withInboundNatRules(List inboundNatRules) { + public FrontendIPConfigurationInner withInboundNatRules(List inboundNatRules) { this.inboundNatRules = inboundNatRules; return this; } @@ -119,9 +118,9 @@ public List inboundNatPools() { * Set the inboundNatPools value. * * @param inboundNatPools the inboundNatPools value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withInboundNatPools(List inboundNatPools) { + public FrontendIPConfigurationInner withInboundNatPools(List inboundNatPools) { this.inboundNatPools = inboundNatPools; return this; } @@ -139,9 +138,9 @@ public List outboundNatRules() { * Set the outboundNatRules value. * * @param outboundNatRules the outboundNatRules value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withOutboundNatRules(List outboundNatRules) { + public FrontendIPConfigurationInner withOutboundNatRules(List outboundNatRules) { this.outboundNatRules = outboundNatRules; return this; } @@ -159,9 +158,9 @@ public List loadBalancingRules() { * Set the loadBalancingRules value. * * @param loadBalancingRules the loadBalancingRules value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withLoadBalancingRules(List loadBalancingRules) { + public FrontendIPConfigurationInner withLoadBalancingRules(List loadBalancingRules) { this.loadBalancingRules = loadBalancingRules; return this; } @@ -179,9 +178,9 @@ public String privateIPAddress() { * Set the privateIPAddress value. * * @param privateIPAddress the privateIPAddress value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withPrivateIPAddress(String privateIPAddress) { + public FrontendIPConfigurationInner withPrivateIPAddress(String privateIPAddress) { this.privateIPAddress = privateIPAddress; return this; } @@ -199,9 +198,9 @@ public String privateIPAllocationMethod() { * Set the privateIPAllocationMethod value. * * @param privateIPAllocationMethod the privateIPAllocationMethod value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public FrontendIPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } @@ -219,9 +218,9 @@ public SubnetInner subnet() { * Set the subnet value. * * @param subnet the subnet value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withSubnet(SubnetInner subnet) { + public FrontendIPConfigurationInner withSubnet(SubnetInner subnet) { this.subnet = subnet; return this; } @@ -239,9 +238,9 @@ public SubResource publicIPAddress() { * Set the publicIPAddress value. * * @param publicIPAddress the publicIPAddress value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withPublicIPAddress(SubResource publicIPAddress) { + public FrontendIPConfigurationInner withPublicIPAddress(SubResource publicIPAddress) { this.publicIPAddress = publicIPAddress; return this; } @@ -259,9 +258,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withProvisioningState(String provisioningState) { + public FrontendIPConfigurationInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -279,9 +278,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withName(String name) { + public FrontendIPConfigurationInner withName(String name) { this.name = name; return this; } @@ -299,9 +298,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the FrontendIPConfiguration object itself. + * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfiguration withEtag(String etag) { + public FrontendIPConfigurationInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/IPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/IPConfigurationInner.java similarity index 79% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/IPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/IPConfigurationInner.java index d7f96f74831ec..c0033f4668bb6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/IPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/IPConfigurationInner.java @@ -6,10 +6,8 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; -import com.microsoft.azure.management.network.implementation.SubnetInner; -import com.microsoft.azure.management.network.implementation.PublicIPAddressInner; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; @@ -18,7 +16,7 @@ * IPConfiguration. */ @JsonFlatten -public class IPConfiguration extends SubResource { +public class IPConfigurationInner extends SubResource { /** * Gets or sets the privateIPAddress of the IP Configuration. */ @@ -75,9 +73,9 @@ public String privateIPAddress() { * Set the privateIPAddress value. * * @param privateIPAddress the privateIPAddress value to set - * @return the IPConfiguration object itself. + * @return the IPConfigurationInner object itself. */ - public IPConfiguration withPrivateIPAddress(String privateIPAddress) { + public IPConfigurationInner withPrivateIPAddress(String privateIPAddress) { this.privateIPAddress = privateIPAddress; return this; } @@ -95,9 +93,9 @@ public String privateIPAllocationMethod() { * Set the privateIPAllocationMethod value. * * @param privateIPAllocationMethod the privateIPAllocationMethod value to set - * @return the IPConfiguration object itself. + * @return the IPConfigurationInner object itself. */ - public IPConfiguration withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public IPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } @@ -115,9 +113,9 @@ public SubnetInner subnet() { * Set the subnet value. * * @param subnet the subnet value to set - * @return the IPConfiguration object itself. + * @return the IPConfigurationInner object itself. */ - public IPConfiguration withSubnet(SubnetInner subnet) { + public IPConfigurationInner withSubnet(SubnetInner subnet) { this.subnet = subnet; return this; } @@ -135,9 +133,9 @@ public PublicIPAddressInner publicIPAddress() { * Set the publicIPAddress value. * * @param publicIPAddress the publicIPAddress value to set - * @return the IPConfiguration object itself. + * @return the IPConfigurationInner object itself. */ - public IPConfiguration withPublicIPAddress(PublicIPAddressInner publicIPAddress) { + public IPConfigurationInner withPublicIPAddress(PublicIPAddressInner publicIPAddress) { this.publicIPAddress = publicIPAddress; return this; } @@ -155,9 +153,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the IPConfiguration object itself. + * @return the IPConfigurationInner object itself. */ - public IPConfiguration withProvisioningState(String provisioningState) { + public IPConfigurationInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -175,9 +173,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the IPConfiguration object itself. + * @return the IPConfigurationInner object itself. */ - public IPConfiguration withName(String name) { + public IPConfigurationInner withName(String name) { this.name = name; return this; } @@ -195,9 +193,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the IPConfiguration object itself. + * @return the IPConfigurationInner object itself. */ - public IPConfiguration withEtag(String etag) { + public IPConfigurationInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatPool.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatPoolInner.java similarity index 83% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatPool.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatPoolInner.java index bd54ff3eeef78..9d2716220015c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatPool.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatPoolInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +16,7 @@ * Inbound NAT pool of the loadbalancer. */ @JsonFlatten -public class InboundNatPool extends SubResource { +public class InboundNatPoolInner extends SubResource { /** * Gets or sets a reference to frontend IP Addresses. */ @@ -92,9 +92,9 @@ public SubResource frontendIPConfiguration() { * Set the frontendIPConfiguration value. * * @param frontendIPConfiguration the frontendIPConfiguration value to set - * @return the InboundNatPool object itself. + * @return the InboundNatPoolInner object itself. */ - public InboundNatPool withFrontendIPConfiguration(SubResource frontendIPConfiguration) { + public InboundNatPoolInner withFrontendIPConfiguration(SubResource frontendIPConfiguration) { this.frontendIPConfiguration = frontendIPConfiguration; return this; } @@ -112,9 +112,9 @@ public String protocol() { * Set the protocol value. * * @param protocol the protocol value to set - * @return the InboundNatPool object itself. + * @return the InboundNatPoolInner object itself. */ - public InboundNatPool withProtocol(String protocol) { + public InboundNatPoolInner withProtocol(String protocol) { this.protocol = protocol; return this; } @@ -132,9 +132,9 @@ public int frontendPortRangeStart() { * Set the frontendPortRangeStart value. * * @param frontendPortRangeStart the frontendPortRangeStart value to set - * @return the InboundNatPool object itself. + * @return the InboundNatPoolInner object itself. */ - public InboundNatPool withFrontendPortRangeStart(int frontendPortRangeStart) { + public InboundNatPoolInner withFrontendPortRangeStart(int frontendPortRangeStart) { this.frontendPortRangeStart = frontendPortRangeStart; return this; } @@ -152,9 +152,9 @@ public int frontendPortRangeEnd() { * Set the frontendPortRangeEnd value. * * @param frontendPortRangeEnd the frontendPortRangeEnd value to set - * @return the InboundNatPool object itself. + * @return the InboundNatPoolInner object itself. */ - public InboundNatPool withFrontendPortRangeEnd(int frontendPortRangeEnd) { + public InboundNatPoolInner withFrontendPortRangeEnd(int frontendPortRangeEnd) { this.frontendPortRangeEnd = frontendPortRangeEnd; return this; } @@ -172,9 +172,9 @@ public int backendPort() { * Set the backendPort value. * * @param backendPort the backendPort value to set - * @return the InboundNatPool object itself. + * @return the InboundNatPoolInner object itself. */ - public InboundNatPool withBackendPort(int backendPort) { + public InboundNatPoolInner withBackendPort(int backendPort) { this.backendPort = backendPort; return this; } @@ -192,9 +192,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the InboundNatPool object itself. + * @return the InboundNatPoolInner object itself. */ - public InboundNatPool withProvisioningState(String provisioningState) { + public InboundNatPoolInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -212,9 +212,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the InboundNatPool object itself. + * @return the InboundNatPoolInner object itself. */ - public InboundNatPool withName(String name) { + public InboundNatPoolInner withName(String name) { this.name = name; return this; } @@ -232,9 +232,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the InboundNatPool object itself. + * @return the InboundNatPoolInner object itself. */ - public InboundNatPool withEtag(String etag) { + public InboundNatPoolInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatRuleInner.java similarity index 81% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatRuleInner.java index 87591fbb2af1b..34b9bd11da768 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/InboundNatRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatRuleInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +16,7 @@ * Inbound NAT rule of the loadbalancer. */ @JsonFlatten -public class InboundNatRule extends SubResource { +public class InboundNatRuleInner extends SubResource { /** * Gets or sets a reference to frontend IP Addresses. */ @@ -29,7 +29,7 @@ public class InboundNatRule extends SubResource { * frontendIPConfigurations is forwarded to the backed IP. */ @JsonProperty(value = "properties.backendIPConfiguration") - private NetworkInterfaceIPConfiguration backendIPConfiguration; + private NetworkInterfaceIPConfigurationInner backendIPConfiguration; /** * Gets or sets the transport potocol for the external endpoint. Possible @@ -108,9 +108,9 @@ public SubResource frontendIPConfiguration() { * Set the frontendIPConfiguration value. * * @param frontendIPConfiguration the frontendIPConfiguration value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withFrontendIPConfiguration(SubResource frontendIPConfiguration) { + public InboundNatRuleInner withFrontendIPConfiguration(SubResource frontendIPConfiguration) { this.frontendIPConfiguration = frontendIPConfiguration; return this; } @@ -120,7 +120,7 @@ public InboundNatRule withFrontendIPConfiguration(SubResource frontendIPConfigur * * @return the backendIPConfiguration value */ - public NetworkInterfaceIPConfiguration backendIPConfiguration() { + public NetworkInterfaceIPConfigurationInner backendIPConfiguration() { return this.backendIPConfiguration; } @@ -128,9 +128,9 @@ public NetworkInterfaceIPConfiguration backendIPConfiguration() { * Set the backendIPConfiguration value. * * @param backendIPConfiguration the backendIPConfiguration value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withBackendIPConfiguration(NetworkInterfaceIPConfiguration backendIPConfiguration) { + public InboundNatRuleInner withBackendIPConfiguration(NetworkInterfaceIPConfigurationInner backendIPConfiguration) { this.backendIPConfiguration = backendIPConfiguration; return this; } @@ -148,9 +148,9 @@ public String protocol() { * Set the protocol value. * * @param protocol the protocol value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withProtocol(String protocol) { + public InboundNatRuleInner withProtocol(String protocol) { this.protocol = protocol; return this; } @@ -168,9 +168,9 @@ public Integer frontendPort() { * Set the frontendPort value. * * @param frontendPort the frontendPort value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withFrontendPort(Integer frontendPort) { + public InboundNatRuleInner withFrontendPort(Integer frontendPort) { this.frontendPort = frontendPort; return this; } @@ -188,9 +188,9 @@ public Integer backendPort() { * Set the backendPort value. * * @param backendPort the backendPort value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withBackendPort(Integer backendPort) { + public InboundNatRuleInner withBackendPort(Integer backendPort) { this.backendPort = backendPort; return this; } @@ -208,9 +208,9 @@ public Integer idleTimeoutInMinutes() { * Set the idleTimeoutInMinutes value. * * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) { + public InboundNatRuleInner withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) { this.idleTimeoutInMinutes = idleTimeoutInMinutes; return this; } @@ -228,9 +228,9 @@ public Boolean enableFloatingIP() { * Set the enableFloatingIP value. * * @param enableFloatingIP the enableFloatingIP value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withEnableFloatingIP(Boolean enableFloatingIP) { + public InboundNatRuleInner withEnableFloatingIP(Boolean enableFloatingIP) { this.enableFloatingIP = enableFloatingIP; return this; } @@ -248,9 +248,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withProvisioningState(String provisioningState) { + public InboundNatRuleInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -268,9 +268,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withName(String name) { + public InboundNatRuleInner withName(String name) { this.name = name; return this; } @@ -288,9 +288,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the InboundNatRule object itself. + * @return the InboundNatRuleInner object itself. */ - public InboundNatRule withEtag(String etag) { + public InboundNatRuleInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java index 07d750e11dbb7..bf1e13e75b8bf 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java @@ -10,8 +10,6 @@ import java.util.List; import com.microsoft.azure.SubResource; -import com.microsoft.azure.management.network.BackendAddressPool; -import com.microsoft.azure.management.network.FrontendIPConfiguration; import com.microsoft.azure.management.network.LoadBalancer; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NicIpConfiguration; @@ -75,16 +73,16 @@ public ServiceCall applyAsync(ServiceCallback callback) { private void ensureCreationPrerequisites() { // Ensure backend pools list - List backendPools = this.inner().backendAddressPools(); + List backendPools = this.inner().backendAddressPools(); if (backendPools == null) { backendPools = new ArrayList<>(); this.inner().withBackendAddressPools(backendPools); } // Ensure first backend pool - BackendAddressPool backendPool; + BackendAddressPoolInner backendPool; if (backendPools.size() == 0) { - backendPool = new BackendAddressPool(); + backendPool = new BackendAddressPoolInner(); backendPools.add(backendPool); backendPool.withName("backendpool" + backendPools.size()); } @@ -120,14 +118,14 @@ NetworkManager myManager() { return super.myManager; } - private FrontendIPConfiguration createFrontendIPConfig(String name) { - List frontendIpConfigs = this.inner().frontendIPConfigurations(); + private FrontendIPConfigurationInner createFrontendIPConfig(String name) { + List frontendIpConfigs = this.inner().frontendIPConfigurations(); if (frontendIpConfigs == null) { - frontendIpConfigs = new ArrayList(); + frontendIpConfigs = new ArrayList(); this.inner().withFrontendIPConfigurations(frontendIpConfigs); } - FrontendIPConfiguration frontendIpConfig = new FrontendIPConfiguration(); + FrontendIPConfigurationInner frontendIpConfig = new FrontendIPConfigurationInner(); frontendIpConfigs.add(frontendIpConfig); if (name == null) { name = "frontend" + frontendIpConfigs.size() + 1; @@ -144,7 +142,7 @@ private LoadBalancerImpl withExistingPublicIpAddress(PublicIpAddress publicIpAdd } private LoadBalancerImpl withExistingPublicIpAddress(String resourceId) { - FrontendIPConfiguration frontendIpConfig = createFrontendIPConfig(null); + FrontendIPConfigurationInner frontendIpConfig = createFrontendIPConfig(null); SubResource pip = new SubResource(); pip.withId(resourceId); frontendIpConfig.withPublicIPAddress(pip); @@ -240,7 +238,7 @@ public void success(ServiceResponse result) { public List publicIpAddressIds() { List publicIpAddressIds = new ArrayList<>(); if (this.inner().frontendIPConfigurations() != null) { - for (FrontendIPConfiguration frontEndIpConfig : this.inner().frontendIPConfigurations()) { + for (FrontendIPConfigurationInner frontEndIpConfig : this.inner().frontendIPConfigurations()) { publicIpAddressIds.add(frontEndIpConfig.publicIPAddress().id()); } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerInner.java index da43038bbce7e..e7940abde8686 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerInner.java @@ -9,13 +9,6 @@ package com.microsoft.azure.management.network.implementation; import java.util.List; -import com.microsoft.azure.management.network.FrontendIPConfiguration; -import com.microsoft.azure.management.network.BackendAddressPool; -import com.microsoft.azure.management.network.LoadBalancingRule; -import com.microsoft.azure.management.network.Probe; -import com.microsoft.azure.management.network.InboundNatRule; -import com.microsoft.azure.management.network.InboundNatPool; -import com.microsoft.azure.management.network.OutboundNatRule; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; @@ -29,43 +22,43 @@ public class LoadBalancerInner extends Resource { * Gets or sets frontend IP addresses of the load balancer. */ @JsonProperty(value = "properties.frontendIPConfigurations") - private List frontendIPConfigurations; + private List frontendIPConfigurations; /** * Gets or sets Pools of backend IP addresseses. */ @JsonProperty(value = "properties.backendAddressPools") - private List backendAddressPools; + private List backendAddressPools; /** * Gets or sets loadbalancing rules. */ @JsonProperty(value = "properties.loadBalancingRules") - private List loadBalancingRules; + private List loadBalancingRules; /** * Gets or sets list of Load balancer probes. */ @JsonProperty(value = "properties.probes") - private List probes; + private List probes; /** * Gets or sets list of inbound rules. */ @JsonProperty(value = "properties.inboundNatRules") - private List inboundNatRules; + private List inboundNatRules; /** * Gets or sets inbound NAT pools. */ @JsonProperty(value = "properties.inboundNatPools") - private List inboundNatPools; + private List inboundNatPools; /** * Gets or sets outbound NAT rules. */ @JsonProperty(value = "properties.outboundNatRules") - private List outboundNatRules; + private List outboundNatRules; /** * Gets or sets resource guid property of the Load balancer resource. @@ -91,7 +84,7 @@ public class LoadBalancerInner extends Resource { * * @return the frontendIPConfigurations value */ - public List frontendIPConfigurations() { + public List frontendIPConfigurations() { return this.frontendIPConfigurations; } @@ -101,7 +94,7 @@ public List frontendIPConfigurations() { * @param frontendIPConfigurations the frontendIPConfigurations value to set * @return the LoadBalancerInner object itself. */ - public LoadBalancerInner withFrontendIPConfigurations(List frontendIPConfigurations) { + public LoadBalancerInner withFrontendIPConfigurations(List frontendIPConfigurations) { this.frontendIPConfigurations = frontendIPConfigurations; return this; } @@ -111,7 +104,7 @@ public LoadBalancerInner withFrontendIPConfigurations(List backendAddressPools() { + public List backendAddressPools() { return this.backendAddressPools; } @@ -121,7 +114,7 @@ public List backendAddressPools() { * @param backendAddressPools the backendAddressPools value to set * @return the LoadBalancerInner object itself. */ - public LoadBalancerInner withBackendAddressPools(List backendAddressPools) { + public LoadBalancerInner withBackendAddressPools(List backendAddressPools) { this.backendAddressPools = backendAddressPools; return this; } @@ -131,7 +124,7 @@ public LoadBalancerInner withBackendAddressPools(List backen * * @return the loadBalancingRules value */ - public List loadBalancingRules() { + public List loadBalancingRules() { return this.loadBalancingRules; } @@ -141,7 +134,7 @@ public List loadBalancingRules() { * @param loadBalancingRules the loadBalancingRules value to set * @return the LoadBalancerInner object itself. */ - public LoadBalancerInner withLoadBalancingRules(List loadBalancingRules) { + public LoadBalancerInner withLoadBalancingRules(List loadBalancingRules) { this.loadBalancingRules = loadBalancingRules; return this; } @@ -151,7 +144,7 @@ public LoadBalancerInner withLoadBalancingRules(List loadBala * * @return the probes value */ - public List probes() { + public List probes() { return this.probes; } @@ -161,7 +154,7 @@ public List probes() { * @param probes the probes value to set * @return the LoadBalancerInner object itself. */ - public LoadBalancerInner withProbes(List probes) { + public LoadBalancerInner withProbes(List probes) { this.probes = probes; return this; } @@ -171,7 +164,7 @@ public LoadBalancerInner withProbes(List probes) { * * @return the inboundNatRules value */ - public List inboundNatRules() { + public List inboundNatRules() { return this.inboundNatRules; } @@ -181,7 +174,7 @@ public List inboundNatRules() { * @param inboundNatRules the inboundNatRules value to set * @return the LoadBalancerInner object itself. */ - public LoadBalancerInner withInboundNatRules(List inboundNatRules) { + public LoadBalancerInner withInboundNatRules(List inboundNatRules) { this.inboundNatRules = inboundNatRules; return this; } @@ -191,7 +184,7 @@ public LoadBalancerInner withInboundNatRules(List inboundNatRule * * @return the inboundNatPools value */ - public List inboundNatPools() { + public List inboundNatPools() { return this.inboundNatPools; } @@ -201,7 +194,7 @@ public List inboundNatPools() { * @param inboundNatPools the inboundNatPools value to set * @return the LoadBalancerInner object itself. */ - public LoadBalancerInner withInboundNatPools(List inboundNatPools) { + public LoadBalancerInner withInboundNatPools(List inboundNatPools) { this.inboundNatPools = inboundNatPools; return this; } @@ -211,7 +204,7 @@ public LoadBalancerInner withInboundNatPools(List inboundNatPool * * @return the outboundNatRules value */ - public List outboundNatRules() { + public List outboundNatRules() { return this.outboundNatRules; } @@ -221,7 +214,7 @@ public List outboundNatRules() { * @param outboundNatRules the outboundNatRules value to set * @return the LoadBalancerInner object itself. */ - public LoadBalancerInner withOutboundNatRules(List outboundNatRules) { + public LoadBalancerInner withOutboundNatRules(List outboundNatRules) { this.outboundNatRules = outboundNatRules; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleInner.java similarity index 82% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleInner.java index 2b71c343e458c..4b5e734e78e56 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancingRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +16,7 @@ * Rules of the load balancer. */ @JsonFlatten -public class LoadBalancingRule extends SubResource { +public class LoadBalancingRuleInner extends SubResource { /** * Gets or sets a reference to frontend IP Addresses. */ @@ -121,9 +121,9 @@ public SubResource frontendIPConfiguration() { * Set the frontendIPConfiguration value. * * @param frontendIPConfiguration the frontendIPConfiguration value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withFrontendIPConfiguration(SubResource frontendIPConfiguration) { + public LoadBalancingRuleInner withFrontendIPConfiguration(SubResource frontendIPConfiguration) { this.frontendIPConfiguration = frontendIPConfiguration; return this; } @@ -141,9 +141,9 @@ public SubResource backendAddressPool() { * Set the backendAddressPool value. * * @param backendAddressPool the backendAddressPool value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withBackendAddressPool(SubResource backendAddressPool) { + public LoadBalancingRuleInner withBackendAddressPool(SubResource backendAddressPool) { this.backendAddressPool = backendAddressPool; return this; } @@ -161,9 +161,9 @@ public SubResource probe() { * Set the probe value. * * @param probe the probe value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withProbe(SubResource probe) { + public LoadBalancingRuleInner withProbe(SubResource probe) { this.probe = probe; return this; } @@ -181,9 +181,9 @@ public String protocol() { * Set the protocol value. * * @param protocol the protocol value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withProtocol(String protocol) { + public LoadBalancingRuleInner withProtocol(String protocol) { this.protocol = protocol; return this; } @@ -201,9 +201,9 @@ public String loadDistribution() { * Set the loadDistribution value. * * @param loadDistribution the loadDistribution value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withLoadDistribution(String loadDistribution) { + public LoadBalancingRuleInner withLoadDistribution(String loadDistribution) { this.loadDistribution = loadDistribution; return this; } @@ -221,9 +221,9 @@ public int frontendPort() { * Set the frontendPort value. * * @param frontendPort the frontendPort value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withFrontendPort(int frontendPort) { + public LoadBalancingRuleInner withFrontendPort(int frontendPort) { this.frontendPort = frontendPort; return this; } @@ -241,9 +241,9 @@ public Integer backendPort() { * Set the backendPort value. * * @param backendPort the backendPort value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withBackendPort(Integer backendPort) { + public LoadBalancingRuleInner withBackendPort(Integer backendPort) { this.backendPort = backendPort; return this; } @@ -261,9 +261,9 @@ public Integer idleTimeoutInMinutes() { * Set the idleTimeoutInMinutes value. * * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) { + public LoadBalancingRuleInner withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes) { this.idleTimeoutInMinutes = idleTimeoutInMinutes; return this; } @@ -281,9 +281,9 @@ public Boolean enableFloatingIP() { * Set the enableFloatingIP value. * * @param enableFloatingIP the enableFloatingIP value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withEnableFloatingIP(Boolean enableFloatingIP) { + public LoadBalancingRuleInner withEnableFloatingIP(Boolean enableFloatingIP) { this.enableFloatingIP = enableFloatingIP; return this; } @@ -301,9 +301,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withProvisioningState(String provisioningState) { + public LoadBalancingRuleInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -321,9 +321,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withName(String name) { + public LoadBalancingRuleInner withName(String name) { this.name = name; return this; } @@ -341,9 +341,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the LoadBalancingRule object itself. + * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRule withEtag(String etag) { + public LoadBalancingRuleInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaceIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceIPConfigurationInner.java similarity index 73% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaceIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceIPConfigurationInner.java index a0096fefeb530..f6b468ec48b31 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaceIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceIPConfigurationInner.java @@ -6,31 +6,29 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; +import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import com.microsoft.azure.SubResource; -import com.microsoft.azure.management.network.implementation.SubnetInner; import com.microsoft.rest.serializer.JsonFlatten; - -import java.util.List; +import com.microsoft.azure.SubResource; /** * IPConfiguration in a NetworkInterface. */ @JsonFlatten -public class NetworkInterfaceIPConfiguration extends SubResource { +public class NetworkInterfaceIPConfigurationInner extends SubResource { /** * Gets or sets the reference of LoadBalancerBackendAddressPool resource. */ @JsonProperty(value = "properties.loadBalancerBackendAddressPools") - private List loadBalancerBackendAddressPools; + private List loadBalancerBackendAddressPools; /** * Gets or sets list of references of LoadBalancerInboundNatRules. */ @JsonProperty(value = "properties.loadBalancerInboundNatRules") - private List loadBalancerInboundNatRules; + private List loadBalancerInboundNatRules; /** * The privateIPAddress property. @@ -79,7 +77,7 @@ public class NetworkInterfaceIPConfiguration extends SubResource { * * @return the loadBalancerBackendAddressPools value */ - public List loadBalancerBackendAddressPools() { + public List loadBalancerBackendAddressPools() { return this.loadBalancerBackendAddressPools; } @@ -87,9 +85,9 @@ public List loadBalancerBackendAddressPools() { * Set the loadBalancerBackendAddressPools value. * * @param loadBalancerBackendAddressPools the loadBalancerBackendAddressPools value to set - * @return the NetworkInterfaceIPConfiguration object itself. + * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfiguration withLoadBalancerBackendAddressPools(List loadBalancerBackendAddressPools) { + public NetworkInterfaceIPConfigurationInner withLoadBalancerBackendAddressPools(List loadBalancerBackendAddressPools) { this.loadBalancerBackendAddressPools = loadBalancerBackendAddressPools; return this; } @@ -99,7 +97,7 @@ public NetworkInterfaceIPConfiguration withLoadBalancerBackendAddressPools(List< * * @return the loadBalancerInboundNatRules value */ - public List loadBalancerInboundNatRules() { + public List loadBalancerInboundNatRules() { return this.loadBalancerInboundNatRules; } @@ -107,9 +105,9 @@ public List loadBalancerInboundNatRules() { * Set the loadBalancerInboundNatRules value. * * @param loadBalancerInboundNatRules the loadBalancerInboundNatRules value to set - * @return the NetworkInterfaceIPConfiguration object itself. + * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfiguration withLoadBalancerInboundNatRules(List loadBalancerInboundNatRules) { + public NetworkInterfaceIPConfigurationInner withLoadBalancerInboundNatRules(List loadBalancerInboundNatRules) { this.loadBalancerInboundNatRules = loadBalancerInboundNatRules; return this; } @@ -127,9 +125,9 @@ public String privateIPAddress() { * Set the privateIPAddress value. * * @param privateIPAddress the privateIPAddress value to set - * @return the NetworkInterfaceIPConfiguration object itself. + * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfiguration withPrivateIPAddress(String privateIPAddress) { + public NetworkInterfaceIPConfigurationInner withPrivateIPAddress(String privateIPAddress) { this.privateIPAddress = privateIPAddress; return this; } @@ -147,9 +145,9 @@ public String privateIPAllocationMethod() { * Set the privateIPAllocationMethod value. * * @param privateIPAllocationMethod the privateIPAllocationMethod value to set - * @return the NetworkInterfaceIPConfiguration object itself. + * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfiguration withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public NetworkInterfaceIPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } @@ -167,9 +165,9 @@ public SubnetInner subnet() { * Set the subnet value. * * @param subnet the subnet value to set - * @return the NetworkInterfaceIPConfiguration object itself. + * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfiguration withSubnet(SubnetInner subnet) { + public NetworkInterfaceIPConfigurationInner withSubnet(SubnetInner subnet) { this.subnet = subnet; return this; } @@ -187,9 +185,9 @@ public SubResource publicIPAddress() { * Set the publicIPAddress value. * * @param publicIPAddress the publicIPAddress value to set - * @return the NetworkInterfaceIPConfiguration object itself. + * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfiguration withPublicIPAddress(SubResource publicIPAddress) { + public NetworkInterfaceIPConfigurationInner withPublicIPAddress(SubResource publicIPAddress) { this.publicIPAddress = publicIPAddress; return this; } @@ -207,9 +205,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the NetworkInterfaceIPConfiguration object itself. + * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfiguration withProvisioningState(String provisioningState) { + public NetworkInterfaceIPConfigurationInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -227,9 +225,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the NetworkInterfaceIPConfiguration object itself. + * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfiguration withName(String name) { + public NetworkInterfaceIPConfigurationInner withName(String name) { this.name = name; return this; } @@ -247,9 +245,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the NetworkInterfaceIPConfiguration object itself. + * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfiguration withEtag(String etag) { + public NetworkInterfaceIPConfigurationInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java index b1eb382692b71..a429791ca1fc8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java @@ -13,7 +13,6 @@ import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NicIpConfiguration; import com.microsoft.azure.management.network.PublicIpAddress; -import com.microsoft.azure.management.network.NetworkInterfaceIPConfiguration; import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -413,11 +412,11 @@ private List dnsServerIps() { */ private void initializeNicIpConfigurations() { if (this.inner().ipConfigurations() == null) { - this.inner().withIpConfigurations(new ArrayList()); + this.inner().withIpConfigurations(new ArrayList()); } this.nicIpConfigurations = new ArrayList<>(); - for (NetworkInterfaceIPConfiguration ipConfig : this.inner().ipConfigurations()) { + for (NetworkInterfaceIPConfigurationInner ipConfig : this.inner().ipConfigurations()) { NicIpConfigurationImpl nicIpConfiguration = new NicIpConfigurationImpl(ipConfig.name(), ipConfig, this, @@ -428,7 +427,7 @@ private void initializeNicIpConfigurations() { } /** - * Gets a new IP configuration child resource {@link NicIpConfiguration} wrapping {@link NetworkInterfaceIPConfiguration}. + * Gets a new IP configuration child resource {@link NicIpConfiguration} wrapping {@link NetworkInterfaceIPConfigurationInner}. * * @param name the name for the new ip configuration * @return {@link NicIpConfiguration} diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceInner.java index f061f73961387..c82f25489192d 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceInner.java @@ -10,7 +10,6 @@ import com.microsoft.azure.SubResource; import java.util.List; -import com.microsoft.azure.management.network.NetworkInterfaceIPConfiguration; import com.microsoft.azure.management.network.NetworkInterfaceDnsSettings; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -37,7 +36,7 @@ public class NetworkInterfaceInner extends Resource { * Gets or sets list of IPConfigurations of the NetworkInterface. */ @JsonProperty(value = "properties.ipConfigurations") - private List ipConfigurations; + private List ipConfigurations; /** * Gets or sets DNS Settings in NetworkInterface. @@ -127,7 +126,7 @@ public NetworkInterfaceInner withNetworkSecurityGroup(SubResource networkSecurit * * @return the ipConfigurations value */ - public List ipConfigurations() { + public List ipConfigurations() { return this.ipConfigurations; } @@ -137,7 +136,7 @@ public List ipConfigurations() { * @param ipConfigurations the ipConfigurations value to set * @return the NetworkInterfaceInner object itself. */ - public NetworkInterfaceInner withIpConfigurations(List ipConfigurations) { + public NetworkInterfaceInner withIpConfigurations(List ipConfigurations) { this.ipConfigurations = ipConfigurations; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java index df3c2eb888238..615c5cebe1d18 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java @@ -4,7 +4,6 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NetworkInterfaces; -import com.microsoft.azure.management.network.NetworkInterfaceIPConfiguration; import com.microsoft.azure.management.network.NetworkInterfaceDnsSettings; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; @@ -63,7 +62,7 @@ public NetworkInterfaceImpl define(String name) { @Override protected NetworkInterfaceImpl wrapModel(String name) { NetworkInterfaceInner inner = new NetworkInterfaceInner(); - inner.withIpConfigurations(new ArrayList()); + inner.withIpConfigurations(new ArrayList()); inner.withDnsSettings(new NetworkInterfaceDnsSettings()); return new NetworkInterfaceImpl(name, inner, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java index a5c45e44318c4..5af3b39f2740a 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java @@ -2,13 +2,11 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.SubResource; -import com.microsoft.azure.management.network.BackendAddressPool; import com.microsoft.azure.management.network.LoadBalancer; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NicIpConfiguration; import com.microsoft.azure.management.network.PublicIpAddress; -import com.microsoft.azure.management.network.NetworkInterfaceIPConfiguration; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl; import com.microsoft.azure.management.resources.fluentcore.model.Creatable; @@ -22,7 +20,7 @@ */ class NicIpConfigurationImpl extends - ChildResourceImpl + ChildResourceImpl implements NicIpConfiguration, NicIpConfiguration.Definition, @@ -56,7 +54,7 @@ class NicIpConfigurationImpl private LoadBalancer loadBalancerToAssociate; protected NicIpConfigurationImpl(String name, - NetworkInterfaceIPConfiguration inner, + NetworkInterfaceIPConfigurationInner inner, NetworkInterfaceImpl parent, NetworkManager networkManager, final boolean isInCreateModel) { @@ -68,7 +66,7 @@ protected NicIpConfigurationImpl(String name, protected static NicIpConfigurationImpl prepareNicIpConfiguration(String name, NetworkInterfaceImpl parent, final NetworkManager networkManager) { - NetworkInterfaceIPConfiguration ipConfigurationInner = new NetworkInterfaceIPConfiguration(); + NetworkInterfaceIPConfigurationInner ipConfigurationInner = new NetworkInterfaceIPConfigurationInner(); ipConfigurationInner.withName(name); return new NicIpConfigurationImpl(name, ipConfigurationInner, @@ -221,7 +219,7 @@ public NicIpConfigurationImpl withExistingLoadBalancer(LoadBalancer loadBalancer @Override public NicIpConfigurationImpl withBackendAddressPool(String name) { - for (BackendAddressPool pool : this.loadBalancerToAssociate.inner().backendAddressPools()) { + for (BackendAddressPoolInner pool : this.loadBalancerToAssociate.inner().backendAddressPools()) { if (pool.name().equalsIgnoreCase(name)) { ensureBackendAddressPools().add(pool); return this; @@ -231,8 +229,8 @@ public NicIpConfigurationImpl withBackendAddressPool(String name) { return null; } - private List ensureBackendAddressPools() { - List poolRefs = this.inner().loadBalancerBackendAddressPools(); + private List ensureBackendAddressPools() { + List poolRefs = this.inner().loadBalancerBackendAddressPools(); if (poolRefs == null) { poolRefs = new ArrayList<>(); this.inner().withLoadBalancerBackendAddressPools(poolRefs); diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/OutboundNatRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/OutboundNatRuleInner.java similarity index 80% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/OutboundNatRule.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/OutboundNatRuleInner.java index e678d0149033c..e5a442b0f21f2 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/OutboundNatRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/OutboundNatRuleInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import java.util.List; import com.microsoft.azure.SubResource; @@ -17,7 +17,7 @@ * Outbound NAT pool of the loadbalancer. */ @JsonFlatten -public class OutboundNatRule extends SubResource { +public class OutboundNatRuleInner extends SubResource { /** * Gets or sets the number of outbound ports to be used for SNAT. */ @@ -68,9 +68,9 @@ public Integer allocatedOutboundPorts() { * Set the allocatedOutboundPorts value. * * @param allocatedOutboundPorts the allocatedOutboundPorts value to set - * @return the OutboundNatRule object itself. + * @return the OutboundNatRuleInner object itself. */ - public OutboundNatRule withAllocatedOutboundPorts(Integer allocatedOutboundPorts) { + public OutboundNatRuleInner withAllocatedOutboundPorts(Integer allocatedOutboundPorts) { this.allocatedOutboundPorts = allocatedOutboundPorts; return this; } @@ -88,9 +88,9 @@ public List frontendIPConfigurations() { * Set the frontendIPConfigurations value. * * @param frontendIPConfigurations the frontendIPConfigurations value to set - * @return the OutboundNatRule object itself. + * @return the OutboundNatRuleInner object itself. */ - public OutboundNatRule withFrontendIPConfigurations(List frontendIPConfigurations) { + public OutboundNatRuleInner withFrontendIPConfigurations(List frontendIPConfigurations) { this.frontendIPConfigurations = frontendIPConfigurations; return this; } @@ -108,9 +108,9 @@ public SubResource backendAddressPool() { * Set the backendAddressPool value. * * @param backendAddressPool the backendAddressPool value to set - * @return the OutboundNatRule object itself. + * @return the OutboundNatRuleInner object itself. */ - public OutboundNatRule withBackendAddressPool(SubResource backendAddressPool) { + public OutboundNatRuleInner withBackendAddressPool(SubResource backendAddressPool) { this.backendAddressPool = backendAddressPool; return this; } @@ -128,9 +128,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the OutboundNatRule object itself. + * @return the OutboundNatRuleInner object itself. */ - public OutboundNatRule withProvisioningState(String provisioningState) { + public OutboundNatRuleInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -148,9 +148,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the OutboundNatRule object itself. + * @return the OutboundNatRuleInner object itself. */ - public OutboundNatRule withName(String name) { + public OutboundNatRuleInner withName(String name) { this.name = name; return this; } @@ -168,9 +168,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the OutboundNatRule object itself. + * @return the OutboundNatRuleInner object itself. */ - public OutboundNatRule withEtag(String etag) { + public OutboundNatRuleInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Probe.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ProbeInner.java similarity index 85% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Probe.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ProbeInner.java index 1cb135f18df89..ea3c8876b9000 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Probe.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ProbeInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import java.util.List; import com.microsoft.azure.SubResource; @@ -17,7 +17,7 @@ * Load balancer Probe. */ @JsonFlatten -public class Probe extends SubResource { +public class ProbeInner extends SubResource { /** * Gets Load balancer rules that use this probe. */ @@ -99,9 +99,9 @@ public List loadBalancingRules() { * Set the loadBalancingRules value. * * @param loadBalancingRules the loadBalancingRules value to set - * @return the Probe object itself. + * @return the ProbeInner object itself. */ - public Probe withLoadBalancingRules(List loadBalancingRules) { + public ProbeInner withLoadBalancingRules(List loadBalancingRules) { this.loadBalancingRules = loadBalancingRules; return this; } @@ -119,9 +119,9 @@ public String protocol() { * Set the protocol value. * * @param protocol the protocol value to set - * @return the Probe object itself. + * @return the ProbeInner object itself. */ - public Probe withProtocol(String protocol) { + public ProbeInner withProtocol(String protocol) { this.protocol = protocol; return this; } @@ -139,9 +139,9 @@ public int port() { * Set the port value. * * @param port the port value to set - * @return the Probe object itself. + * @return the ProbeInner object itself. */ - public Probe withPort(int port) { + public ProbeInner withPort(int port) { this.port = port; return this; } @@ -159,9 +159,9 @@ public Integer intervalInSeconds() { * Set the intervalInSeconds value. * * @param intervalInSeconds the intervalInSeconds value to set - * @return the Probe object itself. + * @return the ProbeInner object itself. */ - public Probe withIntervalInSeconds(Integer intervalInSeconds) { + public ProbeInner withIntervalInSeconds(Integer intervalInSeconds) { this.intervalInSeconds = intervalInSeconds; return this; } @@ -179,9 +179,9 @@ public Integer numberOfProbes() { * Set the numberOfProbes value. * * @param numberOfProbes the numberOfProbes value to set - * @return the Probe object itself. + * @return the ProbeInner object itself. */ - public Probe withNumberOfProbes(Integer numberOfProbes) { + public ProbeInner withNumberOfProbes(Integer numberOfProbes) { this.numberOfProbes = numberOfProbes; return this; } @@ -199,9 +199,9 @@ public String requestPath() { * Set the requestPath value. * * @param requestPath the requestPath value to set - * @return the Probe object itself. + * @return the ProbeInner object itself. */ - public Probe withRequestPath(String requestPath) { + public ProbeInner withRequestPath(String requestPath) { this.requestPath = requestPath; return this; } @@ -219,9 +219,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the Probe object itself. + * @return the ProbeInner object itself. */ - public Probe withProvisioningState(String provisioningState) { + public ProbeInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -239,9 +239,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the Probe object itself. + * @return the ProbeInner object itself. */ - public Probe withName(String name) { + public ProbeInner withName(String name) { this.name = name; return this; } @@ -259,9 +259,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the Probe object itself. + * @return the ProbeInner object itself. */ - public Probe withEtag(String etag) { + public ProbeInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java index 6464b1d6b0dfb..810a9f60a0a27 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java @@ -8,7 +8,6 @@ package com.microsoft.azure.management.network.implementation; -import com.microsoft.azure.management.network.IPConfiguration; import com.microsoft.azure.management.network.PublicIPAddressDnsSettings; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -30,7 +29,7 @@ public class PublicIPAddressInner extends Resource { * The ipConfiguration property. */ @JsonProperty(value = "properties.ipConfiguration") - private IPConfiguration ipConfiguration; + private IPConfigurationInner ipConfiguration; /** * Gets or sets FQDN of the DNS record associated with the public IP @@ -95,7 +94,7 @@ public PublicIPAddressInner withPublicIPAllocationMethod(String publicIPAllocati * * @return the ipConfiguration value */ - public IPConfiguration ipConfiguration() { + public IPConfigurationInner ipConfiguration() { return this.ipConfiguration; } @@ -105,7 +104,7 @@ public IPConfiguration ipConfiguration() { * @param ipConfiguration the ipConfiguration value to set * @return the PublicIPAddressInner object itself. */ - public PublicIPAddressInner withIpConfiguration(IPConfiguration ipConfiguration) { + public PublicIPAddressInner withIpConfiguration(IPConfigurationInner ipConfiguration) { this.ipConfiguration = ipConfiguration; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetInner.java index 934051aa19c26..db09136480b45 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetInner.java @@ -9,7 +9,6 @@ package com.microsoft.azure.management.network.implementation; import java.util.List; -import com.microsoft.azure.management.network.IPConfiguration; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; @@ -42,7 +41,7 @@ public class SubnetInner extends SubResource { * using subnet. */ @JsonProperty(value = "properties.ipConfigurations") - private List ipConfigurations; + private List ipConfigurations; /** * Gets or sets Provisioning state of the PublicIP resource @@ -127,7 +126,7 @@ public SubnetInner withRouteTable(RouteTableInner routeTable) { * * @return the ipConfigurations value */ - public List ipConfigurations() { + public List ipConfigurations() { return this.ipConfigurations; } @@ -137,7 +136,7 @@ public List ipConfigurations() { * @param ipConfigurations the ipConfigurations value to set * @return the SubnetInner object itself. */ - public SubnetInner withIpConfigurations(List ipConfigurations) { + public SubnetInner withIpConfigurations(List ipConfigurations) { this.ipConfigurations = ipConfigurations; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendIPConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationInner.java similarity index 79% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendIPConfiguration.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationInner.java index c4f1c11430ef4..bb0ed7b03c69c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayFrontendIPConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationInner.java @@ -6,20 +6,19 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; /** - * Frontend IP configuration of application gateway. + * IpConfiguration for Virtual network gateway. */ @JsonFlatten -public class ApplicationGatewayFrontendIPConfiguration extends SubResource { +public class VirtualNetworkGatewayIPConfigurationInner extends SubResource { /** - * Gets or sets the privateIPAddress of the Network Interface IP - * Configuration. + * Gets or sets the privateIPAddress of the IP Configuration. */ @JsonProperty(value = "properties.privateIPAddress") private String privateIPAddress; @@ -74,9 +73,9 @@ public String privateIPAddress() { * Set the privateIPAddress value. * * @param privateIPAddress the privateIPAddress value to set - * @return the ApplicationGatewayFrontendIPConfiguration object itself. + * @return the VirtualNetworkGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayFrontendIPConfiguration withPrivateIPAddress(String privateIPAddress) { + public VirtualNetworkGatewayIPConfigurationInner withPrivateIPAddress(String privateIPAddress) { this.privateIPAddress = privateIPAddress; return this; } @@ -94,9 +93,9 @@ public String privateIPAllocationMethod() { * Set the privateIPAllocationMethod value. * * @param privateIPAllocationMethod the privateIPAllocationMethod value to set - * @return the ApplicationGatewayFrontendIPConfiguration object itself. + * @return the VirtualNetworkGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayFrontendIPConfiguration withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public VirtualNetworkGatewayIPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } @@ -114,9 +113,9 @@ public SubResource subnet() { * Set the subnet value. * * @param subnet the subnet value to set - * @return the ApplicationGatewayFrontendIPConfiguration object itself. + * @return the VirtualNetworkGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayFrontendIPConfiguration withSubnet(SubResource subnet) { + public VirtualNetworkGatewayIPConfigurationInner withSubnet(SubResource subnet) { this.subnet = subnet; return this; } @@ -134,9 +133,9 @@ public SubResource publicIPAddress() { * Set the publicIPAddress value. * * @param publicIPAddress the publicIPAddress value to set - * @return the ApplicationGatewayFrontendIPConfiguration object itself. + * @return the VirtualNetworkGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayFrontendIPConfiguration withPublicIPAddress(SubResource publicIPAddress) { + public VirtualNetworkGatewayIPConfigurationInner withPublicIPAddress(SubResource publicIPAddress) { this.publicIPAddress = publicIPAddress; return this; } @@ -154,9 +153,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the ApplicationGatewayFrontendIPConfiguration object itself. + * @return the VirtualNetworkGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayFrontendIPConfiguration withProvisioningState(String provisioningState) { + public VirtualNetworkGatewayIPConfigurationInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -174,9 +173,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the ApplicationGatewayFrontendIPConfiguration object itself. + * @return the VirtualNetworkGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayFrontendIPConfiguration withName(String name) { + public VirtualNetworkGatewayIPConfigurationInner withName(String name) { this.name = name; return this; } @@ -194,9 +193,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the ApplicationGatewayFrontendIPConfiguration object itself. + * @return the VirtualNetworkGatewayIPConfigurationInner object itself. */ - public ApplicationGatewayFrontendIPConfiguration withEtag(String etag) { + public VirtualNetworkGatewayIPConfigurationInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java index 3a72045850dd2..e4fb9d5f5d90b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java @@ -9,7 +9,6 @@ package com.microsoft.azure.management.network.implementation; import java.util.List; -import com.microsoft.azure.management.network.VirtualNetworkGatewayIPConfiguration; import com.microsoft.azure.SubResource; import com.microsoft.azure.management.network.VirtualNetworkGatewaySku; import com.microsoft.azure.management.network.VpnClientConfiguration; @@ -27,7 +26,7 @@ public class VirtualNetworkGatewayInner extends Resource { * IpConfigurations for Virtual network gateway. */ @JsonProperty(value = "properties.ipConfigurations") - private List ipConfigurations; + private List ipConfigurations; /** * The type of this virtual network gateway. Possible values include: @@ -102,7 +101,7 @@ public class VirtualNetworkGatewayInner extends Resource { * * @return the ipConfigurations value */ - public List ipConfigurations() { + public List ipConfigurations() { return this.ipConfigurations; } @@ -112,7 +111,7 @@ public List ipConfigurations() { * @param ipConfigurations the ipConfigurations value to set * @return the VirtualNetworkGatewayInner object itself. */ - public VirtualNetworkGatewayInner withIpConfigurations(List ipConfigurations) { + public VirtualNetworkGatewayInner withIpConfigurations(List ipConfigurations) { this.ipConfigurations = ipConfigurations; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRevokedCertificate.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VpnClientRevokedCertificateInner.java similarity index 77% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRevokedCertificate.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VpnClientRevokedCertificateInner.java index 379ee8bd216af..8188f612cb224 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRevokedCertificate.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VpnClientRevokedCertificateInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -16,7 +16,7 @@ * VPN client revoked certificate of virtual network gateway. */ @JsonFlatten -public class VpnClientRevokedCertificate extends SubResource { +public class VpnClientRevokedCertificateInner extends SubResource { /** * Gets or sets the revoked Vpn client certificate thumbprint. */ @@ -54,9 +54,9 @@ public String thumbprint() { * Set the thumbprint value. * * @param thumbprint the thumbprint value to set - * @return the VpnClientRevokedCertificate object itself. + * @return the VpnClientRevokedCertificateInner object itself. */ - public VpnClientRevokedCertificate withThumbprint(String thumbprint) { + public VpnClientRevokedCertificateInner withThumbprint(String thumbprint) { this.thumbprint = thumbprint; return this; } @@ -74,9 +74,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the VpnClientRevokedCertificate object itself. + * @return the VpnClientRevokedCertificateInner object itself. */ - public VpnClientRevokedCertificate withProvisioningState(String provisioningState) { + public VpnClientRevokedCertificateInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -94,9 +94,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the VpnClientRevokedCertificate object itself. + * @return the VpnClientRevokedCertificateInner object itself. */ - public VpnClientRevokedCertificate withName(String name) { + public VpnClientRevokedCertificateInner withName(String name) { this.name = name; return this; } @@ -114,9 +114,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the VpnClientRevokedCertificate object itself. + * @return the VpnClientRevokedCertificateInner object itself. */ - public VpnClientRevokedCertificate withEtag(String etag) { + public VpnClientRevokedCertificateInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRootCertificate.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VpnClientRootCertificateInner.java similarity index 78% rename from azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRootCertificate.java rename to azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VpnClientRootCertificateInner.java index 83a3bc3783b3b..c21c0b96983c6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientRootCertificate.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VpnClientRootCertificateInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.network; +package com.microsoft.azure.management.network.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -16,7 +16,7 @@ * VPN client root certificate of virtual network gateway. */ @JsonFlatten -public class VpnClientRootCertificate extends SubResource { +public class VpnClientRootCertificateInner extends SubResource { /** * Gets or sets the certificate public data. */ @@ -54,9 +54,9 @@ public String publicCertData() { * Set the publicCertData value. * * @param publicCertData the publicCertData value to set - * @return the VpnClientRootCertificate object itself. + * @return the VpnClientRootCertificateInner object itself. */ - public VpnClientRootCertificate withPublicCertData(String publicCertData) { + public VpnClientRootCertificateInner withPublicCertData(String publicCertData) { this.publicCertData = publicCertData; return this; } @@ -74,9 +74,9 @@ public String provisioningState() { * Set the provisioningState value. * * @param provisioningState the provisioningState value to set - * @return the VpnClientRootCertificate object itself. + * @return the VpnClientRootCertificateInner object itself. */ - public VpnClientRootCertificate withProvisioningState(String provisioningState) { + public VpnClientRootCertificateInner withProvisioningState(String provisioningState) { this.provisioningState = provisioningState; return this; } @@ -94,9 +94,9 @@ public String name() { * Set the name value. * * @param name the name value to set - * @return the VpnClientRootCertificate object itself. + * @return the VpnClientRootCertificateInner object itself. */ - public VpnClientRootCertificate withName(String name) { + public VpnClientRootCertificateInner withName(String name) { this.name = name; return this; } @@ -114,9 +114,9 @@ public String etag() { * Set the etag value. * * @param etag the etag value to set - * @return the VpnClientRootCertificate object itself. + * @return the VpnClientRootCertificateInner object itself. */ - public VpnClientRootCertificate withEtag(String etag) { + public VpnClientRootCertificateInner withEtag(String etag) { this.etag = etag; return this; } diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java index 9c376bcf630de..4fae8301c132f 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java @@ -7,11 +7,12 @@ package com.microsoft.azure.management.storage; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; +import com.microsoft.azure.management.storage.implementation.UsageInner; /** * An immutable client-side representation of an Azure storage resource usage info object. */ -public interface StorageUsage extends Wrapper { +public interface StorageUsage extends Wrapper { /** * @return the unit of measurement. Possible values include: 'Count', * 'Bytes', 'Seconds', 'Percent', 'CountsPerSecond', 'BytesPerSecond'. diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageImpl.java index 02337051b8861..5f876fbb5fc12 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageImpl.java @@ -2,15 +2,14 @@ import com.microsoft.azure.management.resources.fluentcore.model.implementation.WrapperImpl; import com.microsoft.azure.management.storage.StorageUsage; -import com.microsoft.azure.management.storage.Usage; import com.microsoft.azure.management.storage.UsageName; import com.microsoft.azure.management.storage.UsageUnit; /** - * The implementation of {@link Usage}. + * The implementation of {@link UsageInner}. */ -class UsageImpl extends WrapperImpl implements StorageUsage { - UsageImpl(Usage innerObject) { +class UsageImpl extends WrapperImpl implements StorageUsage { + UsageImpl(UsageInner innerObject) { super(innerObject); } diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usage.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageInner.java similarity index 89% rename from azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usage.java rename to azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageInner.java index 12764d61b02cd..04ffd5d3fa752 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usage.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageInner.java @@ -6,14 +6,16 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.storage; +package com.microsoft.azure.management.storage.implementation; +import com.microsoft.azure.management.storage.UsageUnit; +import com.microsoft.azure.management.storage.UsageName; import com.fasterxml.jackson.annotation.JsonProperty; /** * Describes Storage Resource Usage. */ -public class Usage { +public class UsageInner { /** * Gets the unit of measurement. Possible values include: 'Count', * 'Bytes', 'Seconds', 'Percent', 'CountsPerSecond', 'BytesPerSecond'. diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageListResultInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageListResultInner.java deleted file mode 100644 index c2a4749b67734..0000000000000 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsageListResultInner.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - * - * Code generated by Microsoft (R) AutoRest Code Generator. - */ - -package com.microsoft.azure.management.storage.implementation; - -import java.util.List; -import com.microsoft.azure.management.storage.Usage; - -/** - * The List Usages operation response. - */ -public class UsageListResultInner { - /** - * Gets or sets the list Storage Resource Usages. - */ - private List value; - - /** - * Get the value value. - * - * @return the value value - */ - public List value() { - return this.value; - } - - /** - * Set the value value. - * - * @param value the value value to set - * @return the UsageListResultInner object itself. - */ - public UsageListResultInner withValue(List value) { - this.value = value; - return this; - } - -} diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesImpl.java index 8080eb1d3b918..ae0457edb2ad8 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesImpl.java @@ -6,7 +6,6 @@ import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; import com.microsoft.azure.management.resources.implementation.PageImpl; import com.microsoft.azure.management.storage.StorageUsage; -import com.microsoft.azure.management.storage.Usage; import com.microsoft.azure.management.storage.Usages; import com.microsoft.rest.RestException; @@ -26,23 +25,23 @@ class UsagesImpl @Override public PagedList list() throws CloudException, IOException { - PagedListConverter converter = - new PagedListConverter() { + PagedListConverter converter = + new PagedListConverter() { @Override - public StorageUsage typeConvert(Usage usageInner) { + public StorageUsage typeConvert(UsageInner usageInner) { return new UsageImpl(usageInner); } }; - return converter.convert(toPagedList(client.usages().list().getBody().value())); + return converter.convert(toPagedList(client.usages().list().getBody())); } - private PagedList toPagedList(List list) { - PageImpl page = new PageImpl<>(); + private PagedList toPagedList(List list) { + PageImpl page = new PageImpl<>(); page.setItems(list); page.setNextPageLink(null); - return new PagedList(page) { + return new PagedList(page) { @Override - public Page nextPage(String nextPageLink) throws RestException, IOException { + public Page nextPage(String nextPageLink) throws RestException, IOException { return null; } }; diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesInner.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesInner.java index af7a739cb66cb..4a74c9db43b8a 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesInner.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesInner.java @@ -17,6 +17,7 @@ import com.microsoft.rest.ServiceResponse; import com.microsoft.rest.ServiceResponseCallback; import java.io.IOException; +import java.util.List; import okhttp3.ResponseBody; import retrofit2.Call; import retrofit2.http.GET; @@ -64,9 +65,9 @@ interface UsagesService { * @throws CloudException exception thrown from REST call * @throws IOException exception thrown from serialization/deserialization * @throws IllegalArgumentException exception thrown from invalid parameters - * @return the UsageListResultInner object wrapped in {@link ServiceResponse} if successful. + * @return the List<UsageInner> object wrapped in {@link ServiceResponse} if successful. */ - public ServiceResponse list() throws CloudException, IOException, IllegalArgumentException { + public ServiceResponse> list() throws CloudException, IOException, IllegalArgumentException { if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } @@ -74,7 +75,9 @@ public ServiceResponse list() throws CloudException, IOExc throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } Call call = service.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()); - return listDelegate(call.execute()); + ServiceResponse> response = listDelegate(call.execute()); + List result = response.getBody().getItems(); + return new ServiceResponse<>(result, response.getResponse()); } /** @@ -84,7 +87,7 @@ public ServiceResponse list() throws CloudException, IOExc * @throws IllegalArgumentException thrown if callback is null * @return the {@link Call} object */ - public ServiceCall listAsync(final ServiceCallback serviceCallback) throws IllegalArgumentException { + public ServiceCall listAsync(final ServiceCallback> serviceCallback) throws IllegalArgumentException { if (serviceCallback == null) { throw new IllegalArgumentException("ServiceCallback is required for async calls."); } @@ -98,11 +101,12 @@ public ServiceCall listAsync(final ServiceCallback service } Call call = service.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()); final ServiceCall serviceCall = new ServiceCall(call); - call.enqueue(new ServiceResponseCallback(serviceCallback) { + call.enqueue(new ServiceResponseCallback>(serviceCallback) { @Override public void onResponse(Call call, Response response) { try { - serviceCallback.success(listDelegate(response)); + ServiceResponse> result = listDelegate(response); + serviceCallback.success(new ServiceResponse<>(result.getBody().getItems(), result.getResponse())); } catch (CloudException | IOException exception) { serviceCallback.failure(exception); } @@ -111,9 +115,9 @@ public void onResponse(Call call, Response response) return serviceCall; } - private ServiceResponse listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateDetails.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java similarity index 78% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateDetails.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java index 1789228edaa1a..ea955b5a4e544 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateDetails.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website; +package com.microsoft.azure.management.website.implementation; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,7 +17,7 @@ * Certificate Details. */ @JsonFlatten -public class CertificateDetails extends Resource { +public class CertificateDetailsInner extends Resource { /** * Version. */ @@ -85,9 +85,9 @@ public Integer version() { * Set the version value. * * @param version the version value to set - * @return the CertificateDetails object itself. + * @return the CertificateDetailsInner object itself. */ - public CertificateDetails withVersion(Integer version) { + public CertificateDetailsInner withVersion(Integer version) { this.version = version; return this; } @@ -105,9 +105,9 @@ public String serialNumber() { * Set the serialNumber value. * * @param serialNumber the serialNumber value to set - * @return the CertificateDetails object itself. + * @return the CertificateDetailsInner object itself. */ - public CertificateDetails withSerialNumber(String serialNumber) { + public CertificateDetailsInner withSerialNumber(String serialNumber) { this.serialNumber = serialNumber; return this; } @@ -125,9 +125,9 @@ public String thumbprint() { * Set the thumbprint value. * * @param thumbprint the thumbprint value to set - * @return the CertificateDetails object itself. + * @return the CertificateDetailsInner object itself. */ - public CertificateDetails withThumbprint(String thumbprint) { + public CertificateDetailsInner withThumbprint(String thumbprint) { this.thumbprint = thumbprint; return this; } @@ -145,9 +145,9 @@ public String subject() { * Set the subject value. * * @param subject the subject value to set - * @return the CertificateDetails object itself. + * @return the CertificateDetailsInner object itself. */ - public CertificateDetails withSubject(String subject) { + public CertificateDetailsInner withSubject(String subject) { this.subject = subject; return this; } @@ -165,9 +165,9 @@ public DateTime notBefore() { * Set the notBefore value. * * @param notBefore the notBefore value to set - * @return the CertificateDetails object itself. + * @return the CertificateDetailsInner object itself. */ - public CertificateDetails withNotBefore(DateTime notBefore) { + public CertificateDetailsInner withNotBefore(DateTime notBefore) { this.notBefore = notBefore; return this; } @@ -185,9 +185,9 @@ public DateTime notAfter() { * Set the notAfter value. * * @param notAfter the notAfter value to set - * @return the CertificateDetails object itself. + * @return the CertificateDetailsInner object itself. */ - public CertificateDetails withNotAfter(DateTime notAfter) { + public CertificateDetailsInner withNotAfter(DateTime notAfter) { this.notAfter = notAfter; return this; } @@ -205,9 +205,9 @@ public String signatureAlgorithm() { * Set the signatureAlgorithm value. * * @param signatureAlgorithm the signatureAlgorithm value to set - * @return the CertificateDetails object itself. + * @return the CertificateDetailsInner object itself. */ - public CertificateDetails withSignatureAlgorithm(String signatureAlgorithm) { + public CertificateDetailsInner withSignatureAlgorithm(String signatureAlgorithm) { this.signatureAlgorithm = signatureAlgorithm; return this; } @@ -225,9 +225,9 @@ public String issuer() { * Set the issuer value. * * @param issuer the issuer value to set - * @return the CertificateDetails object itself. + * @return the CertificateDetailsInner object itself. */ - public CertificateDetails withIssuer(String issuer) { + public CertificateDetailsInner withIssuer(String issuer) { this.issuer = issuer; return this; } @@ -245,9 +245,9 @@ public String rawData() { * Set the rawData value. * * @param rawData the rawData value to set - * @return the CertificateDetails object itself. + * @return the CertificateDetailsInner object itself. */ - public CertificateDetails withRawData(String rawData) { + public CertificateDetailsInner withRawData(String rawData) { this.rawData = rawData; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderInner.java index 3db5952d8ef7f..663a1f3e88a47 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderInner.java @@ -12,7 +12,6 @@ import com.microsoft.azure.management.website.CertificateProductType; import com.microsoft.azure.management.website.ProvisioningState; import com.microsoft.azure.management.website.CertificateOrderStatus; -import com.microsoft.azure.management.website.CertificateDetails; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -85,7 +84,7 @@ public class CertificateOrderInner extends Resource { * Signed certificate. */ @JsonProperty(value = "properties.signedCertificate") - private CertificateDetails signedCertificate; + private CertificateDetailsInner signedCertificate; /** * Last CSR that was created for this order. @@ -97,13 +96,13 @@ public class CertificateOrderInner extends Resource { * Intermediate certificate. */ @JsonProperty(value = "properties.intermediate") - private CertificateDetails intermediate; + private CertificateDetailsInner intermediate; /** * Root certificate. */ @JsonProperty(value = "properties.root") - private CertificateDetails root; + private CertificateDetailsInner root; /** * Current serial number of the certificate. @@ -308,7 +307,7 @@ public CertificateOrderInner withStatus(CertificateOrderStatus status) { * * @return the signedCertificate value */ - public CertificateDetails signedCertificate() { + public CertificateDetailsInner signedCertificate() { return this.signedCertificate; } @@ -318,7 +317,7 @@ public CertificateDetails signedCertificate() { * @param signedCertificate the signedCertificate value to set * @return the CertificateOrderInner object itself. */ - public CertificateOrderInner withSignedCertificate(CertificateDetails signedCertificate) { + public CertificateOrderInner withSignedCertificate(CertificateDetailsInner signedCertificate) { this.signedCertificate = signedCertificate; return this; } @@ -348,7 +347,7 @@ public CertificateOrderInner withCsr(String csr) { * * @return the intermediate value */ - public CertificateDetails intermediate() { + public CertificateDetailsInner intermediate() { return this.intermediate; } @@ -358,7 +357,7 @@ public CertificateDetails intermediate() { * @param intermediate the intermediate value to set * @return the CertificateOrderInner object itself. */ - public CertificateOrderInner withIntermediate(CertificateDetails intermediate) { + public CertificateOrderInner withIntermediate(CertificateDetailsInner intermediate) { this.intermediate = intermediate; return this; } @@ -368,7 +367,7 @@ public CertificateOrderInner withIntermediate(CertificateDetails intermediate) { * * @return the root value */ - public CertificateDetails root() { + public CertificateDetailsInner root() { return this.root; } @@ -378,7 +377,7 @@ public CertificateDetails root() { * @param root the root value to set * @return the CertificateOrderInner object itself. */ - public CertificateOrderInner withRoot(CertificateDetails root) { + public CertificateOrderInner withRoot(CertificateDetailsInner root) { this.root = root; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteCollectionInner.java index bf557415d0785..e0936d4b3c3ca 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteCollectionInner.java @@ -9,7 +9,6 @@ package com.microsoft.azure.management.website.implementation; import java.util.List; -import com.microsoft.azure.management.website.DeletedSite; /** * Collection of deleted sites. @@ -18,7 +17,7 @@ public class DeletedSiteCollectionInner { /** * Collection of resources. */ - private List value; + private List value; /** * Link to next page of resources. @@ -30,7 +29,7 @@ public class DeletedSiteCollectionInner { * * @return the value value */ - public List value() { + public List value() { return this.value; } @@ -40,7 +39,7 @@ public List value() { * @param value the value value to set * @return the DeletedSiteCollectionInner object itself. */ - public DeletedSiteCollectionInner withValue(List value) { + public DeletedSiteCollectionInner withValue(List value) { this.value = value; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeletedSite.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java similarity index 86% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeletedSite.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java index 098c649b9d2d7..ce8d446497dbe 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeletedSite.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java @@ -6,11 +6,15 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website; +package com.microsoft.azure.management.website.implementation; import org.joda.time.DateTime; import java.util.List; -import com.microsoft.azure.management.website.implementation.SiteConfigInner; +import com.microsoft.azure.management.website.UsageState; +import com.microsoft.azure.management.website.SiteAvailabilityState; +import com.microsoft.azure.management.website.HostNameSslState; +import com.microsoft.azure.management.website.HostingEnvironmentProfile; +import com.microsoft.azure.management.website.CloningInfo; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; @@ -19,7 +23,7 @@ * Reports deleted site including the timestamp of operation. */ @JsonFlatten -public class DeletedSite extends Resource { +public class DeletedSiteInner extends Resource { /** * Time when the site was deleted. */ @@ -144,6 +148,7 @@ public class DeletedSite extends Resource { private HostingEnvironmentProfile hostingEnvironmentProfile; /** + * The microService property. */ @JsonProperty(value = "properties.microService") private String microService; @@ -235,9 +240,9 @@ public DateTime deletedTimestamp() { * Set the deletedTimestamp value. * * @param deletedTimestamp the deletedTimestamp value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withDeletedTimestamp(DateTime deletedTimestamp) { + public DeletedSiteInner withDeletedTimestamp(DateTime deletedTimestamp) { this.deletedTimestamp = deletedTimestamp; return this; } @@ -255,9 +260,9 @@ public String deletedSiteName() { * Set the deletedSiteName value. * * @param deletedSiteName the deletedSiteName value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withDeletedSiteName(String deletedSiteName) { + public DeletedSiteInner withDeletedSiteName(String deletedSiteName) { this.deletedSiteName = deletedSiteName; return this; } @@ -311,9 +316,9 @@ public Boolean enabled() { * Set the enabled value. * * @param enabled the enabled value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withEnabled(Boolean enabled) { + public DeletedSiteInner withEnabled(Boolean enabled) { this.enabled = enabled; return this; } @@ -349,9 +354,9 @@ public List hostNameSslStates() { * Set the hostNameSslStates value. * * @param hostNameSslStates the hostNameSslStates value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withHostNameSslStates(List hostNameSslStates) { + public DeletedSiteInner withHostNameSslStates(List hostNameSslStates) { this.hostNameSslStates = hostNameSslStates; return this; } @@ -369,9 +374,9 @@ public String serverFarmId() { * Set the serverFarmId value. * * @param serverFarmId the serverFarmId value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withServerFarmId(String serverFarmId) { + public DeletedSiteInner withServerFarmId(String serverFarmId) { this.serverFarmId = serverFarmId; return this; } @@ -398,9 +403,9 @@ public SiteConfigInner siteConfig() { * Set the siteConfig value. * * @param siteConfig the siteConfig value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withSiteConfig(SiteConfigInner siteConfig) { + public DeletedSiteInner withSiteConfig(SiteConfigInner siteConfig) { this.siteConfig = siteConfig; return this; } @@ -436,9 +441,9 @@ public Boolean scmSiteAlsoStopped() { * Set the scmSiteAlsoStopped value. * * @param scmSiteAlsoStopped the scmSiteAlsoStopped value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withScmSiteAlsoStopped(Boolean scmSiteAlsoStopped) { + public DeletedSiteInner withScmSiteAlsoStopped(Boolean scmSiteAlsoStopped) { this.scmSiteAlsoStopped = scmSiteAlsoStopped; return this; } @@ -465,9 +470,9 @@ public HostingEnvironmentProfile hostingEnvironmentProfile() { * Set the hostingEnvironmentProfile value. * * @param hostingEnvironmentProfile the hostingEnvironmentProfile value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withHostingEnvironmentProfile(HostingEnvironmentProfile hostingEnvironmentProfile) { + public DeletedSiteInner withHostingEnvironmentProfile(HostingEnvironmentProfile hostingEnvironmentProfile) { this.hostingEnvironmentProfile = hostingEnvironmentProfile; return this; } @@ -485,9 +490,9 @@ public String microService() { * Set the microService value. * * @param microService the microService value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withMicroService(String microService) { + public DeletedSiteInner withMicroService(String microService) { this.microService = microService; return this; } @@ -505,9 +510,9 @@ public String gatewaySiteName() { * Set the gatewaySiteName value. * * @param gatewaySiteName the gatewaySiteName value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withGatewaySiteName(String gatewaySiteName) { + public DeletedSiteInner withGatewaySiteName(String gatewaySiteName) { this.gatewaySiteName = gatewaySiteName; return this; } @@ -525,9 +530,9 @@ public Boolean clientAffinityEnabled() { * Set the clientAffinityEnabled value. * * @param clientAffinityEnabled the clientAffinityEnabled value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withClientAffinityEnabled(Boolean clientAffinityEnabled) { + public DeletedSiteInner withClientAffinityEnabled(Boolean clientAffinityEnabled) { this.clientAffinityEnabled = clientAffinityEnabled; return this; } @@ -545,9 +550,9 @@ public Boolean clientCertEnabled() { * Set the clientCertEnabled value. * * @param clientCertEnabled the clientCertEnabled value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withClientCertEnabled(Boolean clientCertEnabled) { + public DeletedSiteInner withClientCertEnabled(Boolean clientCertEnabled) { this.clientCertEnabled = clientCertEnabled; return this; } @@ -565,9 +570,9 @@ public Boolean hostNamesDisabled() { * Set the hostNamesDisabled value. * * @param hostNamesDisabled the hostNamesDisabled value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withHostNamesDisabled(Boolean hostNamesDisabled) { + public DeletedSiteInner withHostNamesDisabled(Boolean hostNamesDisabled) { this.hostNamesDisabled = hostNamesDisabled; return this; } @@ -594,9 +599,9 @@ public Integer containerSize() { * Set the containerSize value. * * @param containerSize the containerSize value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withContainerSize(Integer containerSize) { + public DeletedSiteInner withContainerSize(Integer containerSize) { this.containerSize = containerSize; return this; } @@ -614,9 +619,9 @@ public Integer maxNumberOfWorkers() { * Set the maxNumberOfWorkers value. * * @param maxNumberOfWorkers the maxNumberOfWorkers value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withMaxNumberOfWorkers(Integer maxNumberOfWorkers) { + public DeletedSiteInner withMaxNumberOfWorkers(Integer maxNumberOfWorkers) { this.maxNumberOfWorkers = maxNumberOfWorkers; return this; } @@ -634,9 +639,9 @@ public CloningInfo cloningInfo() { * Set the cloningInfo value. * * @param cloningInfo the cloningInfo value to set - * @return the DeletedSite object itself. + * @return the DeletedSiteInner object itself. */ - public DeletedSite withCloningInfo(CloningInfo cloningInfo) { + public DeletedSiteInner withCloningInfo(CloningInfo cloningInfo) { this.cloningInfo = cloningInfo; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionCollectionInner.java index d85c5a26d9396..37fa8ccadd647 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionCollectionInner.java @@ -9,7 +9,6 @@ package com.microsoft.azure.management.website.implementation; import java.util.List; -import com.microsoft.azure.management.website.GeoRegion; /** * Collection of geo regions. @@ -18,7 +17,7 @@ public class GeoRegionCollectionInner { /** * Collection of resources. */ - private List value; + private List value; /** * Link to next page of resources. @@ -30,7 +29,7 @@ public class GeoRegionCollectionInner { * * @return the value value */ - public List value() { + public List value() { return this.value; } @@ -40,7 +39,7 @@ public List value() { * @param value the value value to set * @return the GeoRegionCollectionInner object itself. */ - public GeoRegionCollectionInner withValue(List value) { + public GeoRegionCollectionInner withValue(List value) { this.value = value; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GeoRegion.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java similarity index 80% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GeoRegion.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java index d04cf84b89785..a3692dafa8d8f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GeoRegion.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -16,7 +16,7 @@ * Geographical region. */ @JsonFlatten -public class GeoRegion extends Resource { +public class GeoRegionInner extends Resource { /** * Region name. */ @@ -48,9 +48,9 @@ public String geoRegionName() { * Set the geoRegionName value. * * @param geoRegionName the geoRegionName value to set - * @return the GeoRegion object itself. + * @return the GeoRegionInner object itself. */ - public GeoRegion withGeoRegionName(String geoRegionName) { + public GeoRegionInner withGeoRegionName(String geoRegionName) { this.geoRegionName = geoRegionName; return this; } @@ -68,9 +68,9 @@ public String description() { * Set the description value. * * @param description the description value to set - * @return the GeoRegion object itself. + * @return the GeoRegionInner object itself. */ - public GeoRegion withDescription(String description) { + public GeoRegionInner withDescription(String description) { this.description = description; return this; } @@ -88,9 +88,9 @@ public String displayName() { * Set the displayName value. * * @param displayName the displayName value to set - * @return the GeoRegion object itself. + * @return the GeoRegionInner object itself. */ - public GeoRegion withDisplayName(String displayName) { + public GeoRegionInner withDisplayName(String displayName) { this.displayName = displayName; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java index 3521bb08f3508..67f9372d956f0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java @@ -142,6 +142,7 @@ public class SiteInner extends Resource { private HostingEnvironmentProfile hostingEnvironmentProfile; /** + * The microService property. */ @JsonProperty(value = "properties.microService") private String microService; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceCollectionInner.java index bf950cad4854b..2ba430b5d5527 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceCollectionInner.java @@ -9,7 +9,6 @@ package com.microsoft.azure.management.website.implementation; import java.util.List; -import com.microsoft.azure.management.website.SiteInstance; /** * Collection of site instances. @@ -18,7 +17,7 @@ public class SiteInstanceCollectionInner { /** * Collection of resources. */ - private List value; + private List value; /** * Link to next page of resources. @@ -30,7 +29,7 @@ public class SiteInstanceCollectionInner { * * @return the value value */ - public List value() { + public List value() { return this.value; } @@ -40,7 +39,7 @@ public List value() { * @param value the value value to set * @return the SiteInstanceCollectionInner object itself. */ - public SiteInstanceCollectionInner withValue(List value) { + public SiteInstanceCollectionInner withValue(List value) { this.value = value; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteInstance.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java similarity index 79% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteInstance.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java index f313f1f438f55..40ddc3a0bc259 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteInstance.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -16,7 +16,7 @@ * Instance of a web app. */ @JsonFlatten -public class SiteInstance extends Resource { +public class SiteInstanceInner extends Resource { /** * Name of instance. */ @@ -36,9 +36,9 @@ public String siteInstanceName() { * Set the siteInstanceName value. * * @param siteInstanceName the siteInstanceName value to set - * @return the SiteInstance object itself. + * @return the SiteInstanceInner object itself. */ - public SiteInstance withSiteInstanceName(String siteInstanceName) { + public SiteInstanceInner withSiteInstanceName(String siteInstanceName) { this.siteInstanceName = siteInstanceName; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceCollectionInner.java index af989e039ba72..d70f43fc49b90 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceCollectionInner.java @@ -9,7 +9,6 @@ package com.microsoft.azure.management.website.implementation; import java.util.List; -import com.microsoft.azure.management.website.SlotDifference; /** * Collection of Slot Differences. @@ -18,7 +17,7 @@ public class SlotDifferenceCollectionInner { /** * Collection of resources. */ - private List value; + private List value; /** * Link to next page of resources. @@ -30,7 +29,7 @@ public class SlotDifferenceCollectionInner { * * @return the value value */ - public List value() { + public List value() { return this.value; } @@ -40,7 +39,7 @@ public List value() { * @param value the value value to set * @return the SlotDifferenceCollectionInner object itself. */ - public SlotDifferenceCollectionInner withValue(List value) { + public SlotDifferenceCollectionInner withValue(List value) { this.value = value; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotDifference.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java similarity index 80% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotDifference.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java index 8c54aa898ece7..d1166dff970e4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotDifference.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website; +package com.microsoft.azure.management.website.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -17,7 +17,7 @@ * slots. */ @JsonFlatten -public class SlotDifference extends Resource { +public class SlotDifferenceInner extends Resource { /** * Indicates the type of the difference: Information, Warning or Error. */ @@ -74,9 +74,9 @@ public String slotDifferenceType() { * Set the slotDifferenceType value. * * @param slotDifferenceType the slotDifferenceType value to set - * @return the SlotDifference object itself. + * @return the SlotDifferenceInner object itself. */ - public SlotDifference withSlotDifferenceType(String slotDifferenceType) { + public SlotDifferenceInner withSlotDifferenceType(String slotDifferenceType) { this.slotDifferenceType = slotDifferenceType; return this; } @@ -94,9 +94,9 @@ public String settingType() { * Set the settingType value. * * @param settingType the settingType value to set - * @return the SlotDifference object itself. + * @return the SlotDifferenceInner object itself. */ - public SlotDifference withSettingType(String settingType) { + public SlotDifferenceInner withSettingType(String settingType) { this.settingType = settingType; return this; } @@ -114,9 +114,9 @@ public String diffRule() { * Set the diffRule value. * * @param diffRule the diffRule value to set - * @return the SlotDifference object itself. + * @return the SlotDifferenceInner object itself. */ - public SlotDifference withDiffRule(String diffRule) { + public SlotDifferenceInner withDiffRule(String diffRule) { this.diffRule = diffRule; return this; } @@ -134,9 +134,9 @@ public String settingName() { * Set the settingName value. * * @param settingName the settingName value to set - * @return the SlotDifference object itself. + * @return the SlotDifferenceInner object itself. */ - public SlotDifference withSettingName(String settingName) { + public SlotDifferenceInner withSettingName(String settingName) { this.settingName = settingName; return this; } @@ -154,9 +154,9 @@ public String valueInCurrentSlot() { * Set the valueInCurrentSlot value. * * @param valueInCurrentSlot the valueInCurrentSlot value to set - * @return the SlotDifference object itself. + * @return the SlotDifferenceInner object itself. */ - public SlotDifference withValueInCurrentSlot(String valueInCurrentSlot) { + public SlotDifferenceInner withValueInCurrentSlot(String valueInCurrentSlot) { this.valueInCurrentSlot = valueInCurrentSlot; return this; } @@ -174,9 +174,9 @@ public String valueInTargetSlot() { * Set the valueInTargetSlot value. * * @param valueInTargetSlot the valueInTargetSlot value to set - * @return the SlotDifference object itself. + * @return the SlotDifferenceInner object itself. */ - public SlotDifference withValueInTargetSlot(String valueInTargetSlot) { + public SlotDifferenceInner withValueInTargetSlot(String valueInTargetSlot) { this.valueInTargetSlot = valueInTargetSlot; return this; } @@ -194,9 +194,9 @@ public String description() { * Set the description value. * * @param description the description value to set - * @return the SlotDifference object itself. + * @return the SlotDifferenceInner object itself. */ - public SlotDifference withDescription(String description) { + public SlotDifferenceInner withDescription(String description) { this.description = description; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageCollectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageCollectionInner.java index 6a850a88773ef..e948f25469602 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageCollectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageCollectionInner.java @@ -9,7 +9,6 @@ package com.microsoft.azure.management.website.implementation; import java.util.List; -import com.microsoft.azure.management.website.Usage; /** * Collection of usages. @@ -18,7 +17,7 @@ public class UsageCollectionInner { /** * Collection of resources. */ - private List value; + private List value; /** * Link to next page of resources. @@ -30,7 +29,7 @@ public class UsageCollectionInner { * * @return the value value */ - public List value() { + public List value() { return this.value; } @@ -40,7 +39,7 @@ public List value() { * @param value the value value to set * @return the UsageCollectionInner object itself. */ - public UsageCollectionInner withValue(List value) { + public UsageCollectionInner withValue(List value) { this.value = value; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Usage.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java similarity index 81% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Usage.java rename to azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java index 2928c08e1ec21..180d7878a2af5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Usage.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java @@ -6,9 +6,10 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website; +package com.microsoft.azure.management.website.implementation; import org.joda.time.DateTime; +import com.microsoft.azure.management.website.ComputeModeOptions; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; @@ -17,7 +18,7 @@ * Class that represents usage of the quota resource. */ @JsonFlatten -public class Usage extends Resource { +public class UsageInner extends Resource { /** * Friendly name shown in the UI. */ @@ -86,9 +87,9 @@ public String displayName() { * Set the displayName value. * * @param displayName the displayName value to set - * @return the Usage object itself. + * @return the UsageInner object itself. */ - public Usage withDisplayName(String displayName) { + public UsageInner withDisplayName(String displayName) { this.displayName = displayName; return this; } @@ -106,9 +107,9 @@ public String usageName() { * Set the usageName value. * * @param usageName the usageName value to set - * @return the Usage object itself. + * @return the UsageInner object itself. */ - public Usage withUsageName(String usageName) { + public UsageInner withUsageName(String usageName) { this.usageName = usageName; return this; } @@ -126,9 +127,9 @@ public String resourceName() { * Set the resourceName value. * * @param resourceName the resourceName value to set - * @return the Usage object itself. + * @return the UsageInner object itself. */ - public Usage withResourceName(String resourceName) { + public UsageInner withResourceName(String resourceName) { this.resourceName = resourceName; return this; } @@ -146,9 +147,9 @@ public String unit() { * Set the unit value. * * @param unit the unit value to set - * @return the Usage object itself. + * @return the UsageInner object itself. */ - public Usage withUnit(String unit) { + public UsageInner withUnit(String unit) { this.unit = unit; return this; } @@ -166,9 +167,9 @@ public Long currentValue() { * Set the currentValue value. * * @param currentValue the currentValue value to set - * @return the Usage object itself. + * @return the UsageInner object itself. */ - public Usage withCurrentValue(Long currentValue) { + public UsageInner withCurrentValue(Long currentValue) { this.currentValue = currentValue; return this; } @@ -186,9 +187,9 @@ public Long limit() { * Set the limit value. * * @param limit the limit value to set - * @return the Usage object itself. + * @return the UsageInner object itself. */ - public Usage withLimit(Long limit) { + public UsageInner withLimit(Long limit) { this.limit = limit; return this; } @@ -206,9 +207,9 @@ public DateTime nextResetTime() { * Set the nextResetTime value. * * @param nextResetTime the nextResetTime value to set - * @return the Usage object itself. + * @return the UsageInner object itself. */ - public Usage withNextResetTime(DateTime nextResetTime) { + public UsageInner withNextResetTime(DateTime nextResetTime) { this.nextResetTime = nextResetTime; return this; } @@ -226,9 +227,9 @@ public ComputeModeOptions computeMode() { * Set the computeMode value. * * @param computeMode the computeMode value to set - * @return the Usage object itself. + * @return the UsageInner object itself. */ - public Usage withComputeMode(ComputeModeOptions computeMode) { + public UsageInner withComputeMode(ComputeModeOptions computeMode) { this.computeMode = computeMode; return this; } @@ -246,9 +247,9 @@ public String siteMode() { * Set the siteMode value. * * @param siteMode the siteMode value to set - * @return the Usage object itself. + * @return the UsageInner object itself. */ - public Usage withSiteMode(String siteMode) { + public UsageInner withSiteMode(String siteMode) { this.siteMode = siteMode; return this; } diff --git a/gulpfile.js b/gulpfile.js index 2f9c185092be1..ace97440e0744 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -181,7 +181,7 @@ var deleteFolderRecursive = function(path) { function GetAutoRestFolder() { if (isWindows) { - return "src/core/AutoRest/bin/Release/net451/win7-x64/"; + return "src/core/AutoRest/bin/Debug/net451/win7-x64/"; } if( isMac ) { return "src/core/AutoRest/bin/Debug/net451/osx.10.11-x64/";