Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ready for review] Annotation for virtual machine extension images #1105

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ Thumbs.db

# reduced pom files should not be included
dependency-reduced-pom.xml

# the translation file should not be included
translation.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.microsoft.azure.management.compute;

import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionImageInner;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;

Expand All @@ -9,7 +10,7 @@
* <p>
* Note: Azure virtual machine extension image is also referred as virtual machine extension handler.
*/
@Fluent
@LangDefinition() // No @Fluent, since methods -> Property conversion is what we needed

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't understand this. We use @fluent at the top interface instead of LangDefinition. We use @method when we need to ensure the member gets converted to a method, not a property. We have all of our other models annotated that way now. What am I missing?

public interface VirtualMachineExtensionImage extends
Wrapper<VirtualMachineExtensionImageInner> {
/**
Expand Down Expand Up @@ -70,5 +71,6 @@ public interface VirtualMachineExtensionImage extends
/**
* @return the virtual machine extension image version this image belongs to
*/
@LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit as Property

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from what I understand from @alvadb, this would be the other way around, by default this would be a property, which it should be.

VirtualMachineExtensionImageVersion version();
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package com.microsoft.azure.management.compute;

import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionImageInner;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;

/**
* An immutable client-side representation of an Azure virtual machine extension image type.
*/
@Fluent
@LangDefinition // No @Fluent, since methods -> Property conversion is what we needed
public interface VirtualMachineExtensionImageType extends
Wrapper<VirtualMachineExtensionImageInner> {
/**
Expand All @@ -28,11 +29,13 @@ public interface VirtualMachineExtensionImageType extends
/**
* @return the publisher of this virtual machine extension image type
*/
@LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit as Property
VirtualMachinePublisher publisher();

/**
* @return Virtual machine image extension versions available in this type
*/
@LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit as Property
VirtualMachineExtensionImageVersions versions();
}

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.microsoft.azure.management.compute;

import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;

/**
* Entry point to virtual machine image extension types.
*/
@Fluent
@LangDefinition
public interface VirtualMachineExtensionImageTypes extends SupportsListing<VirtualMachineExtensionImageType> {
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.microsoft.azure.management.compute;

import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
import com.microsoft.azure.management.apigeneration.Method;
import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionImageInner;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;

/**
* An immutable client-side representation of an Azure virtual machine extension image version.
*/
@Fluent
@LangDefinition // No @Fluent, since methods -> Property conversion is what we needed
public interface VirtualMachineExtensionImageVersion extends
Wrapper<VirtualMachineExtensionImageInner> {
/**
Expand All @@ -28,10 +30,12 @@ public interface VirtualMachineExtensionImageVersion extends
/**
* @return the virtual machine extension image type this version belongs to
*/
@LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit Property
VirtualMachineExtensionImageType type();

/**
* @return virtual machine extension image this version represents
*/
@Method
VirtualMachineExtensionImage image();
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.microsoft.azure.management.compute;

import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;

/**
* Entry point to virtual machine image extension versions.
*/
@Fluent
@LangDefinition
public interface VirtualMachineExtensionImageVersions extends SupportsListing<VirtualMachineExtensionImageVersion> {
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.microsoft.azure.management.compute;

import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListingByRegion;

/**
* Entry point to virtual machine extension image management API.
*/
@Fluent
@LangDefinition
public interface VirtualMachineExtensionImages extends SupportsListingByRegion<VirtualMachineExtensionImage> {
/**
* @return entry point to virtual machine extension image publishers
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.microsoft.azure.management.compute.implementation;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
import com.microsoft.azure.management.compute.ComputeRoles;
import com.microsoft.azure.management.compute.OperatingSystemTypes;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImage;
Expand All @@ -9,6 +11,7 @@
/**
* The implementation for {@link VirtualMachineExtensionImage}.
*/
@LangDefinition
class VirtualMachineExtensionImageImpl
extends WrapperImpl<VirtualMachineExtensionImageInner>
implements VirtualMachineExtensionImage {
Expand Down Expand Up @@ -70,6 +73,7 @@ public boolean supportsMultipleExtensions() {
}

@Override
@LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit Property
public VirtualMachineExtensionImageVersion version() {
return this.version;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.microsoft.azure.management.compute.implementation;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersions;
import com.microsoft.azure.management.compute.VirtualMachinePublisher;
Expand All @@ -8,6 +10,7 @@
/**
* The implementation for {@link VirtualMachineExtensionImageType}.
*/
@LangDefinition
class VirtualMachineExtensionImageTypeImpl
extends WrapperImpl<VirtualMachineExtensionImageInner>
implements VirtualMachineExtensionImageType {
Expand Down Expand Up @@ -38,11 +41,13 @@ public String regionName() {
}

@Override
@LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit as Property
public VirtualMachinePublisher publisher() {
return this.publisher;
}

@Override
@LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit Property
public VirtualMachineExtensionImageVersions versions() {
return new VirtualMachineExtensionImageVersionsImpl(this.client, this);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.microsoft.azure.management.compute.implementation;

import com.microsoft.azure.PagedList;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageTypes;
import com.microsoft.azure.management.compute.VirtualMachinePublisher;
Expand All @@ -9,6 +10,7 @@
/**
* The implementation for {@link VirtualMachineExtensionImageTypes}.
*/
@LangDefinition
class VirtualMachineExtensionImageTypesImpl
extends ReadableWrappersImpl<VirtualMachineExtensionImageType, VirtualMachineExtensionImageTypeImpl, VirtualMachineExtensionImageInner>
implements VirtualMachineExtensionImageTypes {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.microsoft.azure.management.compute.implementation;

import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
import com.microsoft.azure.management.apigeneration.Method;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImage;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersion;
Expand All @@ -8,6 +11,7 @@
/**
* The implementation for {@link VirtualMachineExtensionImageVersion}.
*/
@LangDefinition
class VirtualMachineExtensionImageVersionImpl
extends WrapperImpl<VirtualMachineExtensionImageInner>
implements VirtualMachineExtensionImageVersion {
Expand Down Expand Up @@ -38,11 +42,13 @@ public String regionName() {
}

@Override
@LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit Property
public VirtualMachineExtensionImageType type() {
return this.type;
}

@Override
@Method
public VirtualMachineExtensionImage image() {
VirtualMachineExtensionImageInner inner = this.client.get(this.regionName(),
this.type().publisher().name(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.microsoft.azure.management.compute.implementation;

import com.microsoft.azure.PagedList;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersion;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersions;
Expand All @@ -9,6 +10,7 @@
/**
* The implementation for {@link VirtualMachineExtensionImageVersions}.
*/
@LangDefinition
public class VirtualMachineExtensionImageVersionsImpl
extends ReadableWrappersImpl<VirtualMachineExtensionImageVersion, VirtualMachineExtensionImageVersionImpl, VirtualMachineExtensionImageInner>
implements VirtualMachineExtensionImageVersions {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.microsoft.azure.management.compute.implementation;

import com.microsoft.azure.PagedList;
import com.microsoft.azure.management.apigeneration.LangDefinition;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImage;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersion;
Expand All @@ -13,6 +14,7 @@
/**
* The implementation for {@link VirtualMachineExtensionImages}.
*/
@LangDefinition
class VirtualMachineExtensionImagesImpl
implements VirtualMachineExtensionImages {
private final VirtualMachinePublishers publishers;
Expand Down