Merge pull request Azure#1143 from anuchandy/compute-annot

renaming image() -> getImage() as it make REST call and removing unne…
jianghaolu · Sep 30, 2016 · 351c20b · 351c20b
2 parents 8e9beec + 1ea35a0
commit 351c20b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/...main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersion.java b/...main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersion.java
@@ -33,5 +33,5 @@ public interface VirtualMachineExtensionImageVersion extends
     /**
      * @return virtual machine extension image this version represents
      */
-    VirtualMachineExtensionImage image();
+    VirtualMachineExtensionImage getImage();
 }
diff --git a/.../src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSkuTypes.java b/.../src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSkuTypes.java
@@ -1,11 +1,8 @@
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
-
 /**
  * Scale set virtual machine sku types.
  */
-@LangDefinition
 public class VirtualMachineScaleSetSkuTypes {
     /** Static value Standard_A0 for VirtualMachineScaleSetSkuTypes. */
     public static final VirtualMachineScaleSetSkuTypes STANDARD_A0 = new VirtualMachineScaleSetSkuTypes("Standard_A0", "Standard");

diff --git a/...soft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java b/...soft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java
@@ -43,7 +43,7 @@ public VirtualMachineExtensionImageType type() {
     }
 
     @Override
-    public VirtualMachineExtensionImage image() {
+    public VirtualMachineExtensionImage getImage() {
         VirtualMachineExtensionImageInner inner = this.client.get(this.regionName(),
                 this.type().publisher().name(),
                 this.type().name(),

diff --git a/.../microsoft/azure/management/compute/implementation/VirtualMachineExtensionImagesImpl.java b/.../microsoft/azure/management/compute/implementation/VirtualMachineExtensionImagesImpl.java
@@ -50,7 +50,7 @@ public PagedList<VirtualMachineExtensionImageVersion> loadList(VirtualMachineExt
                 new PagedListConverter<VirtualMachineExtensionImageVersion, VirtualMachineExtensionImage>() {
                     @Override
                     public VirtualMachineExtensionImage typeConvert(VirtualMachineExtensionImageVersion virtualMachineExtensionImageVersion) {
-                        return virtualMachineExtensionImageVersion.image();
+                        return virtualMachineExtensionImageVersion.getImage();
                     }
                 };
 

diff --git a/...a/com/microsoft/azure/management/compute/VirtualMachineExtensionImageOperationsTests.java b/...a/com/microsoft/azure/management/compute/VirtualMachineExtensionImageOperationsTests.java
@@ -104,7 +104,7 @@ public void canGetExtensionTypeVersionAndImage() throws Exception {
 
         // Fetch the Azure docker extension image
         //
-        VirtualMachineExtensionImage dockerExtensionImage = extensionImageFirstVersion.image();
+        VirtualMachineExtensionImage dockerExtensionImage = extensionImageFirstVersion.getImage();
 
         Assert.assertTrue(dockerExtensionImage.regionName().equalsIgnoreCase(Region.US_EAST.toString()));
         Assert.assertTrue(dockerExtensionImage.publisherName().equalsIgnoreCase(dockerExtensionPublisherName));

diff --git a/...ava/com/microsoft/azure/management/compute/samples/ListVirtualMachineExtensionImages.java b/...ava/com/microsoft/azure/management/compute/samples/ListVirtualMachineExtensionImages.java
@@ -72,7 +72,7 @@ public static void main(String[] args) {
 
                     for (VirtualMachineExtensionImageType imageType : chosenPublisher.extensionTypes().list()) {
                         for (VirtualMachineExtensionImageVersion version: imageType.versions().list()) {
-                            VirtualMachineExtensionImage image = version.image();
+                            VirtualMachineExtensionImage image = version.getImage();
                                 System.out.println("Image - " + chosenPublisher.name() + "/"
                                         + image.typeName() + "/"
                                         + image.versionName());