From f2e5ce4ee7fb671e02c7ade2c074829f8e217aa2 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 07:35:35 -0700 Subject: [PATCH 01/17] factoring create() out of concrete impls and into CreatableImpl base class, to follow the DRY principle and to reduce code coplexity and opportunity for error --- .../implementation/AvailabilitySetImpl.java | 10 ++---- .../implementation/VirtualMachineImpl.java | 8 +---- .../network/implementation/NetworkImpl.java | 8 +---- .../implementation/NetworkInterfaceImpl.java | 8 +---- .../NetworkSecurityGroupImpl.java | 8 +---- .../implementation/PublicIpAddressImpl.java | 8 +---- .../model/implementation/CreatableImpl.java | 31 +++++++++---------- .../implementation/ResourceGroupImpl.java | 8 +---- .../implementation/StorageAccountImpl.java | 6 ---- 9 files changed, 23 insertions(+), 72 deletions(-) diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java index 3f475f65d74f..0c7a31f349cc 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java @@ -112,20 +112,14 @@ public AvailabilitySetImpl withFaultDomainCount(int faultDomainCount) { return this; } - @Override - public AvailabilitySetImpl create() throws Exception { - super.creatablesCreate(); - return this; - } - @Override public AvailabilitySetImpl update() throws Exception { return this; } @Override - public AvailabilitySetImpl apply() throws Exception { - return create(); + public AvailabilitySet apply() throws Exception { + return this.create(); } @Override 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 08c932a4364d..b29d68312ae3 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 @@ -148,12 +148,6 @@ public VirtualMachine refresh() throws Exception { return this; } - @Override - public VirtualMachine create() throws Exception { - super.creatablesCreate(); - return this; - } - @Override public VirtualMachineImpl update() throws Exception { return this; @@ -738,7 +732,7 @@ public PublicIpAddress primaryPublicIpAddress() throws CloudException, IOExcept @Override public List networkInterfaceIds() { - List nicIds = new ArrayList(); + List nicIds = new ArrayList<>(); for (NetworkInterfaceReference nicRef : inner().networkProfile().networkInterfaces()) { nicIds.add(nicRef.id()); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java index ad18d1c3da66..b78baf9b28c6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java @@ -62,19 +62,13 @@ public NetworkImpl refresh() throws Exception { return this; } - @Override - public NetworkImpl create() throws Exception { - super.creatablesCreate(); - return this; - } - @Override public NetworkImpl update() throws Exception { return this; } @Override - public NetworkImpl apply() throws Exception { + public Network apply() throws Exception { return this.create(); } 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 fffddc417f89..d441a229e354 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 @@ -82,19 +82,13 @@ public NetworkInterface refresh() throws Exception { return this; } - @Override - public NetworkInterfaceImpl create() throws Exception { - this.creatablesCreate(); - return this; - } - @Override public NetworkInterfaceImpl update() throws Exception { return this; } @Override - public NetworkInterfaceImpl apply() throws Exception { + public NetworkInterface apply() throws Exception { return this.create(); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java index 9902f4b0d665..94be825a1314 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java @@ -70,19 +70,13 @@ public NetworkSecurityGroupImpl refresh() throws Exception { return this; } - @Override - public NetworkSecurityGroupImpl create() throws Exception { - super.creatablesCreate(); - return this; - } - @Override public NetworkSecurityGroupImpl update() throws Exception { return this; } @Override - public NetworkSecurityGroupImpl apply() throws Exception { + public NetworkSecurityGroup apply() throws Exception { return this.create(); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java index 9f219af29ccb..e9a1325938cc 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java @@ -38,7 +38,7 @@ class PublicIpAddressImpl // Verbs @Override - public PublicIpAddressImpl apply() throws Exception { + public PublicIpAddress apply() throws Exception { return this.create(); } @@ -56,12 +56,6 @@ public PublicIpAddress refresh() throws Exception { return this; } - @Override - public PublicIpAddressImpl create() throws Exception { - super.creatablesCreate(); - return this; - } - // Setters (fluent) @Override diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableImpl.java index e747a7e3a12a..a21a89f26d13 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableImpl.java @@ -28,22 +28,6 @@ protected CreatableImpl(String name, InnerModelT innerObject) { creatableTaskGroup = new CreatableTaskGroup(name, (Creatable) this, this); } - /** - * create this resource and creatable resources it depends on. - *

- * dependency resources will be created only if this is the root group otherwise - * it creates the main resource. - * - * @throws Exception the exception - */ - protected void creatablesCreate() throws Exception { - if (creatableTaskGroup.isRoot()) { - creatableTaskGroup.execute(); - } else { - createResource(); - } - } - /** * add a creatable resource dependency for this resource. * @@ -63,6 +47,21 @@ protected Resource createdResource(String key) { return this.creatableTaskGroup.taskResult(key); } + /** + * Default implementation of create(). + * @return the created resource + * @throws Exception when anything goes wrong + */ + @SuppressWarnings("unchecked") + public FluentModelT create() throws Exception { + if (creatableTaskGroup.isRoot()) { + creatableTaskGroup.execute(); + } else { + createResource(); + } + return (FluentModelT) this; + } + /** * Creates this resource. * diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java index 2ff10a0f86eb..87731f662588 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java @@ -101,16 +101,10 @@ public ResourceGroupImpl withoutTag(String key) { } @Override - public ResourceGroupImpl apply() throws Exception { + public ResourceGroup apply() throws Exception { return this.create(); } - @Override - public ResourceGroupImpl create() throws Exception { // FLUENT: implementation of ResourceGroup.DefinitionCreatable.Creatable - super.creatablesCreate(); - return this; - } - @Override public ResourceGroupImpl refresh() throws Exception { // FLUENT: implementation of ResourceGroup.Refreshable this.setInner(client.get(this.key).getBody()); diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java index 483ebff128a2..69be5a149717 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java @@ -121,12 +121,6 @@ public StorageAccount refresh() throws Exception { return this; } - @Override - public StorageAccountImpl create() throws Exception { - super.creatablesCreate(); - return this; - } - @Override public StorageAccountImpl withAccountType(AccountType accountType) { this.inner().withAccountType(accountType); From cd69a662535ebdd0d572379076030476f5d11794 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 07:55:50 -0700 Subject: [PATCH 02/17] making file-based auth optional in azure tests --- azure/src/test/java/com/microsoft/azure/AzureTests.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/azure/src/test/java/com/microsoft/azure/AzureTests.java b/azure/src/test/java/com/microsoft/azure/AzureTests.java index de56cc903340..4feb27226543 100644 --- a/azure/src/test/java/com/microsoft/azure/AzureTests.java +++ b/azure/src/test/java/com/microsoft/azure/AzureTests.java @@ -57,8 +57,13 @@ public void setup() throws Exception { azure = azureAuthed.withSubscription(SUBSCRIPTION_ID); // Authenticate based on file - //this.azure2 = Azure.authenticate(new File("my.azureauth")) - // .withDefaultSubscription(); + File authFile = new File("my.azureauth"); + if(authFile.exists()) { + this.azure2 = Azure.authenticate(new File("my.azureauth")) + .withDefaultSubscription(); + } else { + this.azure2 = azure; + } } /** From c7a75bf32c681117a1dd4fdf53cff744b2680e33 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 09:05:23 -0700 Subject: [PATCH 03/17] fix break due to storage changes --- .../management/compute/implementation/VirtualMachineImpl.java | 1 - 1 file changed, 1 deletion(-) 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 0ba1f6b8f883..fca286130b2e 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 @@ -883,7 +883,6 @@ private void handleStorageSettings() throws Exception { .define(nameWithPrefix("stg", null)) .withRegion(this.region()) .withExistingGroup(this.resourceGroupName()) - .withAccountType(AccountType.STANDARD_GRS) .create(); } From 3921798e9cb68a0777165eddea1c15cafe5d12f4 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 09:19:44 -0700 Subject: [PATCH 04/17] checkstyle issues --- .../java/com/microsoft/azure/TestNSG.java | 3 +-- .../microsoft/azure/TestNetworkInterface.java | 5 +++-- .../microsoft/azure/TestVirtualMachine.java | 2 -- .../azure/TestVirtualMachineNics.java | 1 - .../test/java/com/microsoft/azure/Utils.java | 22 ++++++++++++++----- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/azure/src/test/java/com/microsoft/azure/TestNSG.java b/azure/src/test/java/com/microsoft/azure/TestNSG.java index 64b6030379ef..44ba72ce8233 100644 --- a/azure/src/test/java/com/microsoft/azure/TestNSG.java +++ b/azure/src/test/java/com/microsoft/azure/TestNSG.java @@ -75,8 +75,7 @@ public void print(NetworkSecurityGroup resource) { .append("\n\t\tTo port: ").append(rule.destinationPortRange()) .append("\n\t\tProtocol: ").append(rule.protocol()) .append("\n\t\tPriority: ").append(rule.priority()); - - } + } info.append("\n\tNICs: ").append(resource.networkInterfaceIds()); diff --git a/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java b/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java index 7d6fe3952f8b..c7ff6a21e709 100644 --- a/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java +++ b/azure/src/test/java/com/microsoft/azure/TestNetworkInterface.java @@ -5,9 +5,10 @@ */ package com.microsoft.azure; -import com.microsoft.azure.management.network.*; import org.junit.Assert; +import com.microsoft.azure.management.network.NetworkInterface; +import com.microsoft.azure.management.network.NetworkInterfaces; import com.microsoft.azure.management.resources.fluentcore.arm.Region; public class TestNetworkInterface extends TestTemplate { @@ -53,7 +54,7 @@ public void print(NetworkInterface resource) { .append("\n\tDNS server IPs: "); // Output dns servers - for(String dnsServerIp : resource.dnsServers()) { + for (String dnsServerIp : resource.dnsServers()) { info.append("\n\t\t").append(dnsServerIp); } info.append("\n\t IP forwarding enabled: ").append(resource.isIpForwardingEnabled()) diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java index 54efa6045917..f4328c4afcbd 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java @@ -3,9 +3,7 @@ import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; import com.microsoft.azure.management.compute.implementation.KnownVirtualMachineImage; -import com.microsoft.azure.management.compute.implementation.api.DataDisk; import com.microsoft.azure.management.resources.fluentcore.arm.Region; -import org.junit.Assert; public class TestVirtualMachine extends TestTemplate { @Override diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java index fa5ef6429727..51b6801beef0 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java @@ -9,7 +9,6 @@ import com.microsoft.azure.management.network.NetworkInterfaces; import com.microsoft.azure.management.network.Networks; import com.microsoft.azure.management.network.PublicIpAddress; -import com.microsoft.azure.management.network.PublicIpAddresses; import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.ResourceGroups; import com.microsoft.azure.management.resources.fluentcore.arm.Region; diff --git a/azure/src/test/java/com/microsoft/azure/Utils.java b/azure/src/test/java/com/microsoft/azure/Utils.java index fd5f61285748..4c8defa549e6 100644 --- a/azure/src/test/java/com/microsoft/azure/Utils.java +++ b/azure/src/test/java/com/microsoft/azure/Utils.java @@ -3,11 +3,21 @@ import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.implementation.api.DataDisk; -public class Utils { +/** + * Test utilities. + */ +public final class Utils { + private Utils() { + + }; + /** + * Shows a virtual machine. + * @param resource virtual machine to show + */ public static void print(VirtualMachine resource) { StringBuilder storageProfile = new StringBuilder().append("\n\tStorageProfile: "); if (resource.storageProfile().imageReference() != null) { - storageProfile.append("\n\t\tImageReference:" ); + storageProfile.append("\n\t\tImageReference:"); storageProfile.append("\n\t\t\tPublisher: ").append(resource.storageProfile().imageReference().publisher()); storageProfile.append("\n\t\t\tOffer: ").append(resource.storageProfile().imageReference().offer()); storageProfile.append("\n\t\t\tSKU: ").append(resource.storageProfile().imageReference().sku()); @@ -15,7 +25,7 @@ public static void print(VirtualMachine resource) { } if (resource.storageProfile().osDisk() != null) { - storageProfile.append("\n\t\tOSDisk:" ); + storageProfile.append("\n\t\tOSDisk:"); storageProfile.append("\n\t\t\tOSType: ").append(resource.storageProfile().osDisk().osType()); storageProfile.append("\n\t\t\tName: ").append(resource.storageProfile().osDisk().name()); storageProfile.append("\n\t\t\tCaching: ").append(resource.storageProfile().osDisk().caching()); @@ -46,7 +56,7 @@ public static void print(VirtualMachine resource) { if (resource.storageProfile().dataDisks() != null) { int i = 0; for (DataDisk disk : resource.storageProfile().dataDisks()) { - storageProfile.append("\n\t\tDataDisk: #" ).append(i++); + storageProfile.append("\n\t\tDataDisk: #").append(i++); storageProfile.append("\n\t\t\tName: ").append(disk.name()); storageProfile.append("\n\t\t\tCaching: ").append(disk.caching()); storageProfile.append("\n\t\t\tCreateOption: ").append(disk.createOption()); @@ -62,7 +72,7 @@ public static void print(VirtualMachine resource) { } StringBuilder osProfile = new StringBuilder().append("\n\tOSProfile: "); - osProfile.append("\n\t\tComputerName:" ).append(resource.osProfile().computerName()); + osProfile.append("\n\t\tComputerName:").append(resource.osProfile().computerName()); if (resource.osProfile().windowsConfiguration() != null) { osProfile.append("\n\t\t\tWindowsConfiguration: "); osProfile.append("\n\t\t\t\tProvisionVMAgent: ") @@ -81,7 +91,7 @@ public static void print(VirtualMachine resource) { StringBuilder networkProfile = new StringBuilder().append("\n\tNetworkProfile: "); for (String networkInterfaceId : resource.networkInterfaceIds()) { - networkProfile.append("\n\t\tId:" ).append(networkInterfaceId); + networkProfile.append("\n\t\tId:").append(networkInterfaceId); } System.out.println(new StringBuilder().append("Virtual Machine: ").append(resource.id()) From 3ad0f321be193bc115c27bf8ba0240f4f67149bb Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 09:54:30 -0700 Subject: [PATCH 05/17] checkstyle fixes --- .../resources/ResourceGroupExportTemplateOptions.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportTemplateOptions.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportTemplateOptions.java index 076d07b1fb50..b91cbd0145ae 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportTemplateOptions.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportTemplateOptions.java @@ -10,10 +10,19 @@ * The export template options. */ public enum ResourceGroupExportTemplateOptions { + /** + * Includes default parameter values. + */ INCLUDE_PARAMETER_DEFAULT_VALUE("IncludeParameterDefaultValue"), + /** + * Includes comments. + */ INCLUDE_COMMENTS("IncludeComments"), + /** + * Includes default parameter values and comments. + */ INCLUDE_BOTH("IncludeParameterDefaultValue, IncludeComments"); private String value; @@ -26,4 +35,4 @@ public enum ResourceGroupExportTemplateOptions { public String toString() { return this.value; } -} +} \ No newline at end of file From f589a619f9dc051907993a325ef68d9b2e2f4102 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 11:28:38 -0700 Subject: [PATCH 06/17] need to suppress warnings as this is a proper use of generics in fluent impl --- .../fluentcore/arm/implementation/AzureConfigurableImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/implementation/AzureConfigurableImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/implementation/AzureConfigurableImpl.java index f4cfb178c173..31966a22e625 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/implementation/AzureConfigurableImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/implementation/AzureConfigurableImpl.java @@ -27,18 +27,21 @@ protected AzureConfigurableImpl() { this.restClientBuilder = AzureEnvironment.AZURE.newRestClientBuilder(); } + @SuppressWarnings("unchecked") @Override public T withLogLevel(HttpLoggingInterceptor.Level level) { this.restClientBuilder = this.restClientBuilder.withLogLevel(level); return (T) this; } + @SuppressWarnings("unchecked") @Override public T withInterceptor(Interceptor interceptor) { this.restClientBuilder = this.restClientBuilder.withInterceptor(interceptor); return (T) this; } + @SuppressWarnings("unchecked") @Override public T withUserAgent(String userAgent) { this.restClientBuilder = this.restClientBuilder.withUserAgent(userAgent); From eb46495cbdb9f018bbc6789c9373ac63ddaaae8d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 16:27:56 -0700 Subject: [PATCH 07/17] removing unused fields to eliminate compiler warnings --- .../compute/implementation/VirtualMachineImageImpl.java | 3 --- .../resources/implementation/DeploymentOperationsImpl.java | 2 -- .../implementation/DeploymentOperationsInGroupImpl.java | 2 -- .../resources/implementation/GenericResourceImpl.java | 2 -- 4 files changed, 9 deletions(-) diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageImpl.java index 0b66a4abbcfe..8ac632896a84 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImageImpl.java @@ -18,7 +18,6 @@ class VirtualMachineImageImpl extends IndexableWrapperImpl implements VirtualMachineImage { - private final VirtualMachineImagesInner client; private final Region location; private ImageReference imageReference; @@ -30,7 +29,6 @@ class VirtualMachineImageImpl this.imageReference.withOffer(offer); this.imageReference.withSku(sku); this.imageReference.withVersion(version); - this.client = client; } VirtualMachineImageImpl(Region location, String publisher, String offer, String sku, String version, VirtualMachineImageInner innerModel, VirtualMachineImagesInner client) { @@ -41,7 +39,6 @@ class VirtualMachineImageImpl this.imageReference.withOffer(offer); this.imageReference.withSku(sku); this.imageReference.withVersion(version); - this.client = client; } @Override diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java index adaf086372f9..81ef1904f43c 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java @@ -26,7 +26,6 @@ final class DeploymentOperationsImpl implements DeploymentOperations { private final DeploymentOperationsInner client; private final Deployment deployment; - private final ResourceGroups resourceGroups; private final PagedListConverter converter; DeploymentOperationsImpl(final DeploymentOperationsInner client, @@ -34,7 +33,6 @@ final class DeploymentOperationsImpl final ResourceGroups resourceGroups) { this.client = client; this.deployment = deployment; - this.resourceGroups = resourceGroups; converter = new PagedListConverter() { @Override public DeploymentOperation typeConvert(DeploymentOperationInner deploymentInner) { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInGroupImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInGroupImpl.java index 4f9ef71f6bdf..813ec8a15b89 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInGroupImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInGroupImpl.java @@ -21,11 +21,9 @@ class DeploymentOperationsInGroupImpl implements DeploymentOperations.InGroup { private final DeploymentOperations deploymentOperations; - private final ResourceGroup resourceGroup; DeploymentOperationsInGroupImpl(final DeploymentOperations deploymentOperations, final ResourceGroup resourceGroup) { this.deploymentOperations = deploymentOperations; - this.resourceGroup = resourceGroup; } @Override diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java index e5ef8dbc7bd2..2186ef55da73 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java @@ -31,7 +31,6 @@ final class GenericResourceImpl GenericResource.UpdateWithApiVersion, GenericResource.Update { private final ResourcesInner client; - private final ResourceManagementClientImpl serviceClient; private String resourceProviderNamespace; private String parentResourceId; private String resourceType; @@ -43,7 +42,6 @@ final class GenericResourceImpl final ResourceManagementClientImpl serviceClient) { super(key, innerModel, new ResourceGroupsImpl(serviceClient)); this.client = client; - this.serviceClient = serviceClient; } @Override From 86ea9a1f04618df661b91b65a7546d086b4c2867 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 18:14:51 -0700 Subject: [PATCH 08/17] moving update() to new base class all creatable/updatable resoource impls extend --- .../implementation/AvailabilitySetImpl.java | 5 --- .../implementation/VirtualMachineImpl.java | 5 --- .../network/implementation/NetworkImpl.java | 5 --- .../implementation/NetworkInterfaceImpl.java | 5 --- .../NetworkSecurityGroupImpl.java | 5 --- .../implementation/PublicIpAddressImpl.java | 5 --- .../implementation/GroupableResourceImpl.java | 2 +- .../models/implementation/ResourceImpl.java | 4 +- .../CreatableUpdatableImpl.java | 38 +++++++++++++++++++ .../implementation/DeploymentImpl.java | 9 +---- .../implementation/GenericResourceImpl.java | 5 --- .../implementation/ResourceGroupImpl.java | 9 +---- .../implementation/StorageAccountImpl.java | 4 +- 13 files changed, 47 insertions(+), 54 deletions(-) create mode 100644 azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableUpdatableImpl.java diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java index 0c7a31f349cc..178e41da2ea2 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java @@ -112,11 +112,6 @@ public AvailabilitySetImpl withFaultDomainCount(int faultDomainCount) { return this; } - @Override - public AvailabilitySetImpl update() throws Exception { - return this; - } - @Override public AvailabilitySet apply() throws Exception { return this.create(); 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 fca286130b2e..b164e1169fbf 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 @@ -147,11 +147,6 @@ public VirtualMachine refresh() throws Exception { return this; } - @Override - public VirtualMachineImpl update() throws Exception { - return this; - } - @Override public VirtualMachine apply() throws Exception { return this.create(); diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java index b78baf9b28c6..44a766d751a2 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java @@ -62,11 +62,6 @@ public NetworkImpl refresh() throws Exception { return this; } - @Override - public NetworkImpl update() throws Exception { - return this; - } - @Override public Network apply() throws Exception { return this.create(); 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 d441a229e354..40ebddc3568e 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 @@ -82,11 +82,6 @@ public NetworkInterface refresh() throws Exception { return this; } - @Override - public NetworkInterfaceImpl update() throws Exception { - return this; - } - @Override public NetworkInterface apply() throws Exception { return this.create(); diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java index 94be825a1314..3382a53f3ad6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java @@ -70,11 +70,6 @@ public NetworkSecurityGroupImpl refresh() throws Exception { return this; } - @Override - public NetworkSecurityGroupImpl update() throws Exception { - return this; - } - @Override public NetworkSecurityGroup apply() throws Exception { return this.create(); diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java index e9a1325938cc..9ad1c5c83051 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java @@ -42,11 +42,6 @@ public PublicIpAddress apply() throws Exception { return this.create(); } - @Override - public PublicIpAddressImpl update() throws Exception { - return this; - } - @Override public PublicIpAddress refresh() throws Exception { ServiceResponse response = diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupableResourceImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupableResourceImpl.java index 6dfc3d09fd37..cbef6c7b43aa 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupableResourceImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/GroupableResourceImpl.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; /** - * The implemenation for {@link GroupableResource}. + * The implementation for {@link GroupableResource}. * (Internal use only) * * @param The fluent model type diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java index 7843867eae35..a2a4ea72000d 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/implementation/ResourceImpl.java @@ -8,7 +8,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; -import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableImpl; +import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import java.util.Collections; import java.util.HashMap; @@ -29,7 +29,7 @@ public abstract class ResourceImpl< InnerModelT extends com.microsoft.azure.Resource, FluentModelImplT extends ResourceImpl> extends - CreatableImpl + CreatableUpdatableImpl implements Resource { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableUpdatableImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableUpdatableImpl.java new file mode 100644 index 000000000000..b5e5c6e8205a --- /dev/null +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableUpdatableImpl.java @@ -0,0 +1,38 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + */ + +package com.microsoft.azure.management.resources.fluentcore.model.implementation; + +import com.microsoft.azure.management.resources.fluentcore.model.Appliable; + +/** + * The base class for all updatable resource. + * + * @param the fluent model type representing the resource + * @param the model inner type that the fluent model type wraps + * @param the implementation type of the fluent model + */ +public abstract class CreatableUpdatableImpl + extends CreatableImpl { + + protected CreatableUpdatableImpl(String name, InnerModelT innerObject) { + super(name, innerObject); + } + + /** + * Begins an update for a new resource. + *

+ * This is the beginning of the builder pattern used to update top level resources + * in Azure. The final method completing the definition and starting the actual resource creation + * process in Azure is {@link Appliable#apply()}. + * + * @return the stage of new resource update + */ + @SuppressWarnings("unchecked") + public FluentModelImplT update() { + return (FluentModelImplT) this; + } +} diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java index 46bba3a7f35b..d3d3a35c353f 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java @@ -17,7 +17,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.model.Creatable; -import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableImpl; +import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import com.microsoft.azure.management.resources.implementation.api.Dependency; import com.microsoft.azure.management.resources.implementation.api.DeploymentExportResultInner; import com.microsoft.azure.management.resources.implementation.api.DeploymentExtendedInner; @@ -40,7 +40,7 @@ * The implementation of Deployment and its parent interfaces. */ final class DeploymentImpl extends - CreatableImpl + CreatableUpdatableImpl implements Deployment, Deployment.DefinitionBlank, @@ -298,11 +298,6 @@ protected void createResource() throws Exception { client.createOrUpdate(resourceGroupName(), name(), inner); } - @Override - public Update update() throws Exception { - return this; - } - @Override public Deployment apply() throws Exception { if (this.templateLink() != null && this.template() != null) { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java index 2186ef55da73..3c99dc3bde52 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java @@ -139,11 +139,6 @@ protected void createResource() throws Exception { this.setInner(inner); } - @Override - public UpdateWithApiVersion update() throws Exception { - return this; - } - @Override public GenericResource apply() throws Exception { return create(); diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java index 8be282ef2aba..a1c3cc221d78 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.ResourceGroupExportResult; import com.microsoft.azure.management.resources.ResourceGroupExportTemplateOptions; import com.microsoft.azure.management.resources.fluentcore.arm.Region; -import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableImpl; +import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import com.microsoft.azure.management.resources.implementation.api.ExportTemplateRequestInner; import com.microsoft.azure.management.resources.implementation.api.ResourceGroupExportResultInner; import com.microsoft.azure.management.resources.implementation.api.ResourceGroupInner; @@ -29,7 +29,7 @@ * An instance of this class provides access to a resource group in Azure. */ public class ResourceGroupImpl extends - CreatableImpl + CreatableUpdatableImpl implements ResourceGroup, ResourceGroup.DefinitionBlank, @@ -133,11 +133,6 @@ public T connectToResource(ResourceConnector.Build return adapterBuilder.create(this.serviceClient.restClient(), this.serviceClient.subscriptionId(), this); } - @Override - public Update update() throws Exception { - return this; - } - @Override protected void createResource() throws Exception { ResourceGroupInner params = new ResourceGroupInner(); diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java index 8e958d24a2d2..3c7ebcda6ecf 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountImpl.java @@ -196,9 +196,9 @@ protected void createResource() throws Exception { } @Override - public StorageAccountImpl update() throws Exception { + public StorageAccountImpl update() { updateParameters = new StorageAccountUpdateParametersInner(); - return this; + return super.update(); } @Override From 1ab2f0f4f4408e7827527e0ef191989af054ff31 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 18:19:13 -0700 Subject: [PATCH 09/17] the user-facing enum KnownVirtualMachineImage should not be hidden in implementation package --- .../compute/{implementation => }/KnownVirtualMachineImage.java | 2 +- .../com/microsoft/azure/management/compute/VirtualMachine.java | 1 - .../management/compute/implementation/VirtualMachineImpl.java | 1 + azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java | 2 +- .../java/com/microsoft/azure/TestVirtualMachineDataDisk.java | 2 +- .../test/java/com/microsoft/azure/TestVirtualMachineNics.java | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/{implementation => }/KnownVirtualMachineImage.java (97%) diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownVirtualMachineImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownVirtualMachineImage.java similarity index 97% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownVirtualMachineImage.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownVirtualMachineImage.java index cdf3919634fc..91f18c35ae2d 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownVirtualMachineImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownVirtualMachineImage.java @@ -1,4 +1,4 @@ -package com.microsoft.azure.management.compute.implementation; +package com.microsoft.azure.management.compute; import com.microsoft.azure.management.compute.implementation.api.ImageReference; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java index 257d1691cf3b..ae685752c983 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java @@ -2,7 +2,6 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.compute.implementation.KnownVirtualMachineImage; import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInner; import com.microsoft.azure.management.compute.implementation.api.OperatingSystemTypes; import com.microsoft.azure.management.compute.implementation.api.CachingTypes; 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 b164e1169fbf..e3e1b32b43b7 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 @@ -7,6 +7,7 @@ import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.AvailabilitySets; import com.microsoft.azure.management.compute.DataDisk; +import com.microsoft.azure.management.compute.KnownVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSize; import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInner; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java index 89f8d0c3273a..6d5e9b113c0a 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java @@ -1,8 +1,8 @@ package com.microsoft.azure; +import com.microsoft.azure.management.compute.KnownVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.KnownVirtualMachineImage; import com.microsoft.azure.management.resources.fluentcore.arm.Region; public class TestVirtualMachine extends TestTemplate { diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java index c8c5cafa1b50..fc248c24380e 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java @@ -1,9 +1,9 @@ package com.microsoft.azure; import com.microsoft.azure.management.compute.DataDisk; +import com.microsoft.azure.management.compute.KnownVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.KnownVirtualMachineImage; import com.microsoft.azure.management.compute.implementation.api.CachingTypes; import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; import com.microsoft.azure.management.resources.fluentcore.arm.Region; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java index d31483f4daaa..f60f684297fb 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java @@ -1,8 +1,8 @@ package com.microsoft.azure; +import com.microsoft.azure.management.compute.KnownVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.KnownVirtualMachineImage; import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; From 922cdd60e8adf5a1e97c20b26314fbd76b5ce97d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 18:26:55 -0700 Subject: [PATCH 10/17] removing a no longer used class --- .../implementation/StorageAccountKeys.java | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountKeys.java diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountKeys.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountKeys.java deleted file mode 100644 index 40cfc6a22354..000000000000 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountKeys.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - */ - -package com.microsoft.azure.management.storage.implementation; - -/** - * An instance of this class contains information about the access keys of a storage account. - */ -public class StorageAccountKeys { - private String primaryKey; - private String secondaryKey; - - /** - * Creates an instance of StorageAccountKeys with a primary key and a secondary key. - * @param primaryKey the primary access key - * @param secondaryKey the secondary access key - */ - public StorageAccountKeys(String primaryKey, String secondaryKey) { - this.primaryKey = primaryKey; - this.secondaryKey = secondaryKey; - } - - /** - * @return the primary access key. - */ - public String primaryKey() { - return primaryKey; - } - - /** - * @return the secondary access key. - */ - public String secondary() { - return secondaryKey; - } -} From 31d9a602063c46d29fea8623918dd72fc4297e21 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 18:27:23 -0700 Subject: [PATCH 11/17] minor javadoc fixup --- .../compute/implementation/VirtualMachinesImpl.java | 4 ---- 1 file changed, 4 deletions(-) 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 821d4666122b..766138bab171 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 @@ -35,11 +35,7 @@ import java.util.List; /** -<<<<<<< HEAD * The implementation for {@link VirtualMachines}. -======= - * The type representing Azure virtual machines. ->>>>>>> eca873299bef401bbca4c7084dc790063446e986 */ class VirtualMachinesImpl implements VirtualMachines { From a55dafd23d23a719824cbdcfea27cef416a20bf3 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 18:28:03 -0700 Subject: [PATCH 12/17] model impl classes should be consistently package internal - these were public --- .../management/resources/implementation/ResourceGroupImpl.java | 2 +- .../management/resources/implementation/ResourceGroupsImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java index a1c3cc221d78..f14e80cbbc17 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java @@ -28,7 +28,7 @@ /** * An instance of this class provides access to a resource group in Azure. */ -public class ResourceGroupImpl extends +class ResourceGroupImpl extends CreatableUpdatableImpl implements ResourceGroup, diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java index 3e6efba78ea7..28935c6d1427 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java @@ -20,7 +20,7 @@ /** * The implementation for ResourceGroups and its parent interfaces. */ -public final class ResourceGroupsImpl +final class ResourceGroupsImpl implements ResourceGroups { private final ResourceGroupsInner client; private final ResourceManagementClientImpl serviceClient; From e2cd17b170688531c3287765d8799e260e81403a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 18:35:27 -0700 Subject: [PATCH 13/17] cleaning up leftover/missed InGroup implementation --- .../resources/DeploymentOperations.java | 16 -------- .../DeploymentOperationsImpl.java | 6 --- .../DeploymentOperationsInGroupImpl.java | 40 ------------------- .../resources/GroupPagedListTests.java | 4 -- 4 files changed, 66 deletions(-) delete mode 100644 azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInGroupImpl.java diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperations.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperations.java index e145f7405925..99c565b03754 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperations.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperations.java @@ -15,20 +15,4 @@ public interface DeploymentOperations extends SupportsListing, SupportsGettingByName { - - /** - * Filter the deployment operations by a specific resource group. - * - * @param resourceGroup the resource group to filter by - * @return the entry point to deployment operation management API in the resource group - */ - InGroup resourceGroup(ResourceGroup resourceGroup); - - /** - * Entry point to deployment operation management API in a specific resource group. - */ - interface InGroup extends - SupportsListing, - SupportsGettingByName { - } } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java index 81ef1904f43c..d8b36526bf50 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java @@ -11,7 +11,6 @@ import com.microsoft.azure.management.resources.Deployment; import com.microsoft.azure.management.resources.DeploymentOperation; import com.microsoft.azure.management.resources.DeploymentOperations; -import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.ResourceGroups; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; import com.microsoft.azure.management.resources.implementation.api.DeploymentOperationInner; @@ -41,11 +40,6 @@ public DeploymentOperation typeConvert(DeploymentOperationInner deploymentInner) }; } - @Override - public InGroup resourceGroup(ResourceGroup resourceGroup) { - return new DeploymentOperationsInGroupImpl(this, resourceGroup); - } - @Override public PagedList list() throws CloudException, IOException { return converter.convert(client.list(deployment.resourceGroupName(), deployment.name()).getBody()); diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInGroupImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInGroupImpl.java deleted file mode 100644 index 813ec8a15b89..000000000000 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsInGroupImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. - */ - -package com.microsoft.azure.management.resources.implementation; - -import com.microsoft.azure.CloudException; -import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.resources.DeploymentOperation; -import com.microsoft.azure.management.resources.DeploymentOperations; -import com.microsoft.azure.management.resources.ResourceGroup; - -import java.io.IOException; - -/** - * An instance of this class provides access to deployment operations in a - * resource group. - */ -class DeploymentOperationsInGroupImpl - implements DeploymentOperations.InGroup { - private final DeploymentOperations deploymentOperations; - - DeploymentOperationsInGroupImpl(final DeploymentOperations deploymentOperations, final ResourceGroup resourceGroup) { - this.deploymentOperations = deploymentOperations; - } - - @Override - public PagedList list() throws CloudException, IOException { - return deploymentOperations.list(); - } - - @Override - public DeploymentOperation get(String operationId) throws IOException, CloudException { - return deploymentOperations.get(operationId); - - } -} - diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GroupPagedListTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GroupPagedListTests.java index f9a43c401d89..38d3140f9b8b 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GroupPagedListTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GroupPagedListTests.java @@ -103,10 +103,6 @@ public List listNextGroup(String s) throws RestException, IOException { return groupItems; } }; - - for (String item : groupedResourceList) { - } - } private static ResourceGroup resourceGroup(final String name) { From eaf4f39cba7e9a9d58493999512136f652dced97 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 18:57:19 -0700 Subject: [PATCH 14/17] Known*VirtualMachineImage enum is user-facing so should not be under implementation --- .../KnownLinuxVirtualMachineImage.java | 2 +- .../KnownWindowsVirtualMachineImage.java | 2 +- .../management/compute/VirtualMachine.java | 2 - .../KnownVirtualMachineImage.java | 82 ------------------- .../implementation/VirtualMachineImpl.java | 2 + .../microsoft/azure/TestVirtualMachine.java | 2 +- .../azure/TestVirtualMachineDataDisk.java | 2 +- .../azure/TestVirtualMachineNics.java | 2 +- 8 files changed, 7 insertions(+), 89 deletions(-) rename azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/{implementation => }/KnownLinuxVirtualMachineImage.java (96%) rename azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/{implementation => }/KnownWindowsVirtualMachineImage.java (96%) delete mode 100644 azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownVirtualMachineImage.java diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownLinuxVirtualMachineImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownLinuxVirtualMachineImage.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownLinuxVirtualMachineImage.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownLinuxVirtualMachineImage.java index 9eb50e441e6c..ffb27b98dd79 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownLinuxVirtualMachineImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownLinuxVirtualMachineImage.java @@ -1,4 +1,4 @@ -package com.microsoft.azure.management.compute.implementation; +package com.microsoft.azure.management.compute; import com.microsoft.azure.management.compute.implementation.api.ImageReference; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownWindowsVirtualMachineImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownWindowsVirtualMachineImage.java similarity index 96% rename from azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownWindowsVirtualMachineImage.java rename to azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownWindowsVirtualMachineImage.java index 67b4c5255854..4486fc1ed248 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownWindowsVirtualMachineImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/KnownWindowsVirtualMachineImage.java @@ -1,4 +1,4 @@ -package com.microsoft.azure.management.compute.implementation; +package com.microsoft.azure.management.compute; import com.microsoft.azure.management.compute.implementation.api.ImageReference; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java index bf5062df858f..63b7304c4241 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java @@ -4,8 +4,6 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInner; import com.microsoft.azure.management.compute.implementation.api.OperatingSystemTypes; -import com.microsoft.azure.management.compute.implementation.KnownLinuxVirtualMachineImage; -import com.microsoft.azure.management.compute.implementation.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.implementation.api.CachingTypes; import com.microsoft.azure.management.compute.implementation.api.VirtualMachineInstanceView; import com.microsoft.azure.management.compute.implementation.api.VirtualMachineExtensionInner; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownVirtualMachineImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownVirtualMachineImage.java deleted file mode 100644 index cdf3919634fc..000000000000 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/KnownVirtualMachineImage.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.microsoft.azure.management.compute.implementation; - -import com.microsoft.azure.management.compute.implementation.api.ImageReference; - -/** - * The popular Azure images. - */ -public enum KnownVirtualMachineImage { - /************************************************************** - * Linux images - **************************************************************/ - - /** UbuntuServer 14.04LTS. */ - UBUNTU_SERVER_14_04_LTS("Canonical", "UbuntuServer", "14.04.4-LTS"), - /** UbuntuServer 16.04LTS. */ - UBUNTU_SERVER_16_04_LTS("Canonical", "UbuntuServer", "16.04.0-LTS"), - /** Debian 8. */ - DEBIAN_8("credativ", "Debian", "8"), - /** CentOS 7.2. */ - CENTOS_7_2("OpenLogic", "CentOS", "7.2"), - /** OpenSUSE-Leap 42.1. */ - OPENSUSE_LEAP_42_1("SUSE", "openSUSE-Leap", "42.1"), - /** SLES 12-SP1. */ - SLES_12_SP1("SUSE", "SLES", "12-SP1"), - - /************************************************************** - * Windows images - **************************************************************/ - - /** Windows Server 2008 R2 SP1. */ - WINDOWS_SERVER_2008_R2_SP1("MicrosoftWindowsServer", "WindowsServer", "2008-R2-SP1"), - /** Windows Server 2012 Data center. */ - WINDOWS_SERVER_2012_DATACENTER("MicrosoftWindowsServer", "WindowsServer", "2012-Datacenter"), - /** Windows Server 2012 R2 Data center. */ - WINDOWS_SERVER_2012_R2_DATACENTER("MicrosoftWindowsServer", "WindowsServer", "2012-R2-Datacenter"), - /** Windows Server 2016 technical preview with container support. */ - WINDOWS_SERVER_2016_TECHNICAL_PREVIEW_WITH_CONTAINERS("MicrosoftWindowsServer", "WindowsServer", "2016-Technical-Preview-with-Containers"), - /** Windows Server 2016 technical preview. */ - WINDOWS_SERVER_TECHNICAL_PREVIEW("MicrosoftWindowsServer", "WindowsServer", "Windows-Server-Technical-Preview"); - - private final String publisher; - private final String offer; - private final String sku; - - KnownVirtualMachineImage(String publisher, String offer, String sku) { - this.publisher = publisher; - this.offer = offer; - this.sku = sku; - } - - /** - * @return the name of the image publisher - */ - public String publisher() { - return this.publisher; - } - - /** - * @return the name of the image offer - */ - public String offer() { - return this.offer; - } - - /** - * @return the name of the image SKU - */ - public String sku() { - return this.sku; - } - - /** - * @return the image reference - */ - public ImageReference imageReference() { - return new ImageReference() - .withPublisher(publisher()) - .withOffer(offer()) - .withSku(sku()) - .withVersion("latest"); - } -} 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 47e780e22b9a..2e22b0b4cf5e 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 @@ -7,6 +7,8 @@ import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.AvailabilitySets; import com.microsoft.azure.management.compute.DataDisk; +import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage; +import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.PowerState; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSize; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java index af1ef7ffdf53..1bba7748e00c 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachine.java @@ -1,8 +1,8 @@ package com.microsoft.azure; +import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.resources.fluentcore.arm.Region; public class TestVirtualMachine extends TestTemplate { diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java index 32f663365d69..c313c8f3724b 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java @@ -1,9 +1,9 @@ package com.microsoft.azure; import com.microsoft.azure.management.compute.DataDisk; +import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.implementation.api.CachingTypes; import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; import com.microsoft.azure.management.resources.fluentcore.arm.Region; diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java index b5c8561cb10c..4729fb3077c2 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineNics.java @@ -1,8 +1,8 @@ package com.microsoft.azure; +import com.microsoft.azure.management.compute.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachines; -import com.microsoft.azure.management.compute.implementation.KnownWindowsVirtualMachineImage; import com.microsoft.azure.management.compute.implementation.api.VirtualMachineSizeTypes; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; From 2a0cc346d430f3d0110a7fe922abaef159d40158 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2016 19:03:05 -0700 Subject: [PATCH 15/17] another minor checkstyle hiccup --- .../management/resources/implementation/ResourceGroupsImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java index 28935c6d1427..2f1d4d9f70ee 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java @@ -30,7 +30,7 @@ final class ResourceGroupsImpl * * @param serviceClient the inner resource management client */ - public ResourceGroupsImpl(final ResourceManagementClientImpl serviceClient) { + ResourceGroupsImpl(final ResourceManagementClientImpl serviceClient) { this.serviceClient = serviceClient; this.client = serviceClient.resourceGroups(); } From a98b560af951a8d3d7fbe127df0d785a9d4c534c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Jun 2016 08:18:37 -0700 Subject: [PATCH 16/17] making CreatableImpl#create() return the impl, not the interface, to ensure consistency --- .../fluentcore/model/implementation/CreatableImpl.java | 7 ++++--- .../model/implementation/CreatableUpdatableImpl.java | 2 +- .../resources/implementation/DeploymentImpl.java | 2 +- .../resources/implementation/GenericResourceImpl.java | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableImpl.java index a21a89f26d13..3386870db264 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableImpl.java @@ -14,8 +14,9 @@ * * @param the fluent model type representing the creatable resource * @param the model inner type that the fluent model type wraps + * @param the fluent model implementation type */ -public abstract class CreatableImpl +public abstract class CreatableImpl extends IndexableRefreshableWrapperImpl implements CreatableTaskGroup.RootResourceCreator { /** @@ -53,13 +54,13 @@ protected Resource createdResource(String key) { * @throws Exception when anything goes wrong */ @SuppressWarnings("unchecked") - public FluentModelT create() throws Exception { + public FluentModelImplT create() throws Exception { if (creatableTaskGroup.isRoot()) { creatableTaskGroup.execute(); } else { createResource(); } - return (FluentModelT) this; + return (FluentModelImplT) this; } /** diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableUpdatableImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableUpdatableImpl.java index b5e5c6e8205a..64e8c797c7f5 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableUpdatableImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/implementation/CreatableUpdatableImpl.java @@ -16,7 +16,7 @@ * @param the implementation type of the fluent model */ public abstract class CreatableUpdatableImpl - extends CreatableImpl { + extends CreatableImpl { protected CreatableUpdatableImpl(String name, InnerModelT innerObject) { super(name, innerObject); diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java index d3d3a35c353f..21bc6c5d8ac9 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java @@ -273,7 +273,7 @@ public Deployment beginCreate() throws Exception { // FLUENT: implement } @Override - public Deployment create() throws Exception { // FLUENT: implementation of ResourceGroup.DefinitionCreatable.Creatable + public DeploymentImpl create() throws Exception { // FLUENT: implementation of ResourceGroup.DefinitionCreatable.Creatable if (this.creatableResourceGroup != null) { this.creatableResourceGroup.create(); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java index 3c99dc3bde52..2f0660f929f4 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java @@ -120,7 +120,7 @@ public GenericResourceImpl withApiVersion(String apiVersion) { } @Override - public GenericResource create() throws Exception { + public GenericResourceImpl create() throws Exception { createResource(); return this; } From 5c5388fe6632f3bf3c079a099cb934423720fce4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Jun 2016 08:26:22 -0700 Subject: [PATCH 17/17] reverting *Impl#create() to return impl not interface --- .../management/compute/implementation/AvailabilitySetImpl.java | 2 +- .../management/compute/implementation/VirtualMachineImpl.java | 2 +- .../azure/management/network/implementation/NetworkImpl.java | 2 +- .../management/network/implementation/NetworkInterfaceImpl.java | 2 +- .../network/implementation/NetworkSecurityGroupImpl.java | 2 +- .../management/network/implementation/PublicIpAddressImpl.java | 2 +- .../management/resources/implementation/DeploymentImpl.java | 2 +- .../resources/implementation/GenericResourceImpl.java | 2 +- .../management/resources/implementation/ResourceGroupImpl.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java index 178e41da2ea2..91c2ec1feacc 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java @@ -113,7 +113,7 @@ public AvailabilitySetImpl withFaultDomainCount(int faultDomainCount) { } @Override - public AvailabilitySet apply() throws Exception { + public AvailabilitySetImpl apply() throws Exception { return this.create(); } 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 2e22b0b4cf5e..1fca97dc92f0 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 @@ -156,7 +156,7 @@ public VirtualMachine refresh() throws Exception { } @Override - public VirtualMachine apply() throws Exception { + public VirtualMachineImpl apply() throws Exception { return this.create(); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java index 44a766d751a2..dbcf1322a64c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkImpl.java @@ -63,7 +63,7 @@ public NetworkImpl refresh() throws Exception { } @Override - public Network apply() throws Exception { + public NetworkImpl apply() throws Exception { return this.create(); } 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 40ebddc3568e..c5779d68b828 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 @@ -83,7 +83,7 @@ public NetworkInterface refresh() throws Exception { } @Override - public NetworkInterface apply() throws Exception { + public NetworkInterfaceImpl apply() throws Exception { return this.create(); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java index 3382a53f3ad6..154306abbe76 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupImpl.java @@ -71,7 +71,7 @@ public NetworkSecurityGroupImpl refresh() throws Exception { } @Override - public NetworkSecurityGroup apply() throws Exception { + public NetworkSecurityGroupImpl apply() throws Exception { return this.create(); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java index 9ad1c5c83051..6e8cfc51f81f 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java @@ -38,7 +38,7 @@ class PublicIpAddressImpl // Verbs @Override - public PublicIpAddress apply() throws Exception { + public PublicIpAddressImpl apply() throws Exception { return this.create(); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java index 21bc6c5d8ac9..8bff5a280ba3 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentImpl.java @@ -299,7 +299,7 @@ protected void createResource() throws Exception { } @Override - public Deployment apply() throws Exception { + public DeploymentImpl apply() throws Exception { if (this.templateLink() != null && this.template() != null) { this.withTemplate(null); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java index 2f0660f929f4..c953175755d0 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourceImpl.java @@ -140,7 +140,7 @@ protected void createResource() throws Exception { } @Override - public GenericResource apply() throws Exception { + public GenericResourceImpl apply() throws Exception { return create(); } } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java index f14e80cbbc17..288e16939786 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupImpl.java @@ -118,7 +118,7 @@ public ResourceGroupImpl withoutTag(String key) { } @Override - public ResourceGroup apply() throws Exception { + public ResourceGroupImpl apply() throws Exception { return this.create(); }