diff --git a/azure-mgmt-compute/pom.xml b/azure-mgmt-compute/pom.xml index 550c0ab29cc6..fa4ae4c6e5e4 100644 --- a/azure-mgmt-compute/pom.xml +++ b/azure-mgmt-compute/pom.xml @@ -77,6 +77,11 @@ 1.0.0-SNAPSHOT test + + com.microsoft.azure + api-annotations + 0.0.1-SNAPSHOT + @@ -119,6 +124,25 @@
*/]]> + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + + + com.microsoft.azure.management.apigeneration.LangDefinitionProcessor + + true + true + + true + true + + + + diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java index 96505f5c5d1b..f2cb9800a6ab 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.implementation.AvailabilitySetInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -19,6 +20,7 @@ /** * An immutable client-side representation of an Azure availability set. */ +@LangDefinition(ContainerName = "~/") public interface AvailabilitySet extends GroupableResource, Refreshable, @@ -67,6 +69,7 @@ public interface AvailabilitySet extends /** * Container interface for all the definitions. */ + @LangDefinition(ContainerName = "~/AvailabilitySet.Definition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -76,6 +79,7 @@ interface Definition extends /** * Grouping of availability set definition stages. */ + @LangDefinition(ContainerName = "~/AvailabilitySet.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of an availability set definition. @@ -132,6 +136,7 @@ interface WithCreate extends *

* Call {@link Update#apply()} to apply the changes to the resource in Azure. */ + @LangDefinition(ContainerName = "~/AvailabilitySet.Update") interface Update extends Appliable, Resource.UpdateWithTags { diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java index 0b1ea8485e0f..b9c15e5b0187 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java @@ -1,5 +1,6 @@ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -12,6 +13,7 @@ /** * Entry point to availability set management API. */ +@LangDefinition(ContainerName = "~/") public interface AvailabilitySets extends SupportsListingByGroup, SupportsGettingByGroup, 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 5fba3f859841..11cdde960a85 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 @@ -3,6 +3,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; import com.microsoft.azure.management.compute.implementation.VirtualMachineInner; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.PublicIpAddress; @@ -23,6 +24,7 @@ /** * An immutable client-side representation of an Azure virtual machine. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachine extends GroupableResource, Refreshable, @@ -256,6 +258,7 @@ public interface VirtualMachine extends /** * The entirety of the virtual machine definition. */ + @LangDefinition(ContainerName = "~/VirtualMachine.Definition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -275,6 +278,7 @@ interface Definition extends /** * Grouping of virtual machine definition stages. */ + @LangDefinition(ContainerName = "~/VirtualMachine.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of a virtual machine definition. @@ -847,6 +851,7 @@ interface WithCreate extends /** * Grouping of virtual machine update stages. */ + @LangDefinition(ContainerName = "~/VirtualMachine.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * The stage of the virtual machine definition allowing to specify data disk configuration. @@ -989,6 +994,7 @@ interface WithExtension { *

* Call {@link Update#apply()} to apply the changes to the resource in Azure. */ + @LangDefinition(ContainerName = "~/VirtualMachine.Update") interface Update extends Appliable, Resource.UpdateWithTags, diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java index b844b032c40f..8c463c5aceb1 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java @@ -1,5 +1,6 @@ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; import com.microsoft.azure.management.resources.fluentcore.model.Attachable; import com.microsoft.azure.management.resources.fluentcore.model.Settable; @@ -8,6 +9,7 @@ /** * A data disk of a virtual machine. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineDataDisk extends Wrapper, ChildResource { @@ -66,6 +68,7 @@ public interface VirtualMachineDataDisk extends /** * Grouping of data disk definition stages applicable as part of a virtual machine creation. */ + @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of a data disk definition. @@ -162,6 +165,7 @@ interface WithAttach extends Attachable.InUpdate { * The entirety of a data disk definition. * @param the return type of the final {@link Attachable#attach()} */ + @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Definition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithAttach, @@ -171,6 +175,7 @@ interface Definition extends /** * Grouping of data disk definition stages applicable as part of a virtual machine update. */ + @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Update", ContainerFileName = "IUpdateDefinition", IsContainerOnly = true) interface UpdateDefinitionStages { /** * The first stage of a data disk definition. @@ -266,7 +271,8 @@ interface WithAttach extends Attachable.InDefinition { /** The entirety of a data disk definition as part of a virtual machine update. * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} */ - interface UpdateDefinition extends + @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Update", ContainerFileName = "IUpdateDefinition") + interface UpdateDefinition extends UpdateDefinitionStages.Blank, UpdateDefinitionStages.WithAttach, UpdateDefinitionStages.WithStoreAt { @@ -275,6 +281,7 @@ interface UpdateDefinition extends /** * Grouping of data disk update stages. */ + @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Update", ContainerFileName = "IUpdate") interface UpdateStages { /** * Specifies the new size in GB for data disk. @@ -304,6 +311,7 @@ interface UpdateStages { /** * The entirety of a data disk update as part of a virtual machine update. */ + @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Update") interface Update extends UpdateStages, Settable { diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java index c840545abd98..a57bf77b3007 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.implementation.VirtualMachineImageInner; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; @@ -14,6 +15,7 @@ /** * An immutable client-side representation of an Azure virtual machine image. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineImage extends Wrapper { /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImages.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImages.java index 7f0fd764c314..5b1a7e68a8b5 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImages.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImages.java @@ -5,11 +5,13 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListingByRegion; /** * Entry point to virtual machine image management API. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineImages extends SupportsListingByRegion { /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImagesInSku.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImagesInSku.java index dc08fa163eda..3fb591b1c127 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImagesInSku.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImagesInSku.java @@ -1,8 +1,10 @@ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** * Entry point to virtual machine sku images. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineImagesInSku extends SupportsListing { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java index b0c7cb3fad39..192f82183d2a 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java @@ -5,11 +5,13 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.Region; /** * Represents a virtual machine image offer. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineOffer { /** * @return the region where this virtual machine image offer is available diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffers.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffers.java index 07f7b669945e..d3dbac4920de 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffers.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffers.java @@ -5,11 +5,13 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** * Entry point to virtual machine image offers. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineOffers extends SupportsListing { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java index f9d84263e672..fd5afda6f86b 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java @@ -5,11 +5,13 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.Region; /** * Represents a virtual machine image publisher. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachinePublisher { /** * @return the region where virtual machine images from this publisher is available diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublishers.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublishers.java index ed285369616c..c1692f1bdb60 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublishers.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublishers.java @@ -5,11 +5,13 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListingByRegion; /** * Entry point to virtual machine image publishers. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachinePublishers extends SupportsListingByRegion { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSize.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSize.java index 8a0aafaa82ed..85a03138194e 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSize.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSize.java @@ -5,9 +5,12 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; + /** * A type representing virtual machine size available for a subscription in a region. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineSize { /** * @return the VM size name diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizes.java index 153bc2964448..ddbee2edfcc1 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizes.java @@ -5,11 +5,13 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListingByRegion; /** * Entry point to virtual machine sizes API. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineSizes extends SupportsListingByRegion { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java index 882bfabfbc33..3f15803b8231 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java @@ -5,11 +5,13 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.Region; /** * Represents a virtual machine image SKU. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineSku { /** * @return the region where this virtual machine image offer SKU is available diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSkus.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSkus.java index 6b77809a2558..a25a339a29f1 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSkus.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSkus.java @@ -5,10 +5,12 @@ */ package com.microsoft.azure.management.compute; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** * Entry point to virtual machine image offer skus. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachineSkus extends SupportsListing { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java index c6aed475629e..bfe2b274d406 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java @@ -1,6 +1,7 @@ package com.microsoft.azure.management.compute; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -15,6 +16,7 @@ /** * Entry point to virtual machine management API. */ +@LangDefinition(ContainerName = "~/") public interface VirtualMachines extends SupportsListing, SupportsListingByGroup, 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 27ad41e5a9a0..3271a73bafcb 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 @@ -6,6 +6,7 @@ package com.microsoft.azure.management.compute.implementation; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.InstanceViewStatus; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; @@ -19,6 +20,7 @@ /** * The implementation for {@link AvailabilitySet} and its create and update interfaces. */ +@LangDefinition class AvailabilitySetImpl extends GroupableResourceImpl< diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java index 3dc3ba7d7027..985317572a93 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java @@ -7,6 +7,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.AvailabilitySets; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; @@ -20,6 +21,7 @@ /** * The implementation for {@link AvailabilitySets}. */ +@LangDefinition class AvailabilitySetsImpl extends GroupableResourcesImpl< AvailabilitySet, diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java index fc511eea8912..9827edff9f26 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java @@ -2,6 +2,7 @@ import com.microsoft.azure.management.compute.DataDisk; import com.microsoft.azure.management.compute.VirtualMachine; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.CachingTypes; import com.microsoft.azure.management.compute.DiskCreateOptionTypes; import com.microsoft.azure.management.compute.VirtualHardDisk; @@ -16,6 +17,7 @@ /** * The implementation for {@link DataDisk} and its create and update interfaces. */ +@LangDefinition class DataDiskImpl extends ChildResourceImpl implements 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 e3077a03a9df..a145c3bac7fc 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 @@ -1,6 +1,7 @@ package com.microsoft.azure.management.compute.implementation; import com.microsoft.azure.management.compute.VirtualMachineImage; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.DataDiskImage; import com.microsoft.azure.management.compute.ImageReference; import com.microsoft.azure.management.compute.OSDiskImage; @@ -13,6 +14,7 @@ /** * The implementation for {@link VirtualMachineImage}. */ +@LangDefinition class VirtualMachineImageImpl extends IndexableWrapperImpl implements VirtualMachineImage { diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesImpl.java index e23dcf587991..4b7d2c357fd6 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesImpl.java @@ -7,6 +7,7 @@ import com.microsoft.azure.management.compute.VirtualMachineOffer; import com.microsoft.azure.management.compute.VirtualMachinePublisher; import com.microsoft.azure.management.compute.VirtualMachinePublishers; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.VirtualMachineSku; import com.microsoft.azure.management.resources.fluentcore.arm.Region; @@ -15,6 +16,7 @@ /** * The implementation for {@link VirtualMachineImages}. */ +@LangDefinition class VirtualMachineImagesImpl implements VirtualMachineImages { private final VirtualMachinePublishers publishers; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInSkuImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInSkuImpl.java index 28d2ecfbb5e8..d609afb17076 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInSkuImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImagesInSkuImpl.java @@ -2,6 +2,7 @@ import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.VirtualMachineImage; import com.microsoft.azure.management.compute.VirtualMachineImagesInSku; import com.microsoft.azure.management.compute.VirtualMachineSku; @@ -14,6 +15,7 @@ /** * The implementation for {@link VirtualMachineImagesInSku}. */ +@LangDefinition class VirtualMachineImagesInSkuImpl implements VirtualMachineImagesInSku { private final VirtualMachineImagesInner innerCollection; 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 3979d78faf83..b18ccb132927 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 @@ -5,6 +5,7 @@ import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.AvailabilitySet; import com.microsoft.azure.management.compute.CachingTypes; import com.microsoft.azure.management.compute.DataDisk; @@ -61,6 +62,7 @@ /** * The implementation for {@link VirtualMachine} and its create and update interfaces. */ +@LangDefinition class VirtualMachineImpl extends GroupableResourceImpl< VirtualMachine, diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOfferImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOfferImpl.java index ec5719b28956..275ff160cb37 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOfferImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOfferImpl.java @@ -1,5 +1,6 @@ package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.VirtualMachineOffer; import com.microsoft.azure.management.compute.VirtualMachinePublisher; import com.microsoft.azure.management.compute.VirtualMachineSkus; @@ -8,6 +9,7 @@ /** * The implementation for {@link VirtualMachineOffer}. */ +@LangDefinition class VirtualMachineOfferImpl implements VirtualMachineOffer { private final VirtualMachinePublisher publisher; private final String offerName; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOffersImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOffersImpl.java index 25342bcf2b40..d93038360043 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOffersImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineOffersImpl.java @@ -7,6 +7,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.VirtualMachineOffer; import com.microsoft.azure.management.compute.VirtualMachineOffers; import com.microsoft.azure.management.compute.VirtualMachinePublisher; @@ -17,6 +18,7 @@ /** * The implementation for {@link VirtualMachineOffers}. */ +@LangDefinition class VirtualMachineOffersImpl extends ReadableWrappersImpl implements VirtualMachineOffers { diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublisherImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublisherImpl.java index 0c8cceada269..66c096b45558 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublisherImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublisherImpl.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.compute.implementation; import com.microsoft.azure.management.compute.VirtualMachineExtensionImageTypes; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.VirtualMachineOffers; import com.microsoft.azure.management.compute.VirtualMachinePublisher; import com.microsoft.azure.management.resources.fluentcore.arm.Region; @@ -13,6 +14,7 @@ /** * The implementation for {@link VirtualMachinePublisher}. */ +@LangDefinition class VirtualMachinePublisherImpl implements VirtualMachinePublisher { private final Region location; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublishersImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublishersImpl.java index 96da04818e75..ef4a69c7fc9f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublishersImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinePublishersImpl.java @@ -7,6 +7,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.VirtualMachinePublisher; import com.microsoft.azure.management.compute.VirtualMachinePublishers; import com.microsoft.azure.management.resources.fluentcore.arm.Region; @@ -17,6 +18,7 @@ /** * The implementation for {@link VirtualMachinePublishers}. */ +@LangDefinition class VirtualMachinePublishersImpl extends ReadableWrappersImpl implements VirtualMachinePublishers { diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeImpl.java index fd584b576ea7..2d94cedfb102 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizeImpl.java @@ -5,11 +5,13 @@ */ package com.microsoft.azure.management.compute.implementation; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.VirtualMachineSize; /** * The implementation for {@link VirtualMachineSize}. */ +@LangDefinition class VirtualMachineSizeImpl implements VirtualMachineSize { private VirtualMachineSizeInner innerModel; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesImpl.java index c7303452c773..d4e0fd2d0048 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSizesImpl.java @@ -7,6 +7,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.VirtualMachineSize; import com.microsoft.azure.management.compute.VirtualMachineSizes; import com.microsoft.azure.management.resources.fluentcore.arm.Region; @@ -17,6 +18,7 @@ /** * The implementation for {@link VirtualMachineSizes}. */ +@LangDefinition class VirtualMachineSizesImpl extends ReadableWrappersImpl implements VirtualMachineSizes { diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkuImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkuImpl.java index 0d77c7346dfb..e22ff0f7357c 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkuImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkuImpl.java @@ -2,6 +2,7 @@ import com.microsoft.azure.management.compute.VirtualMachineOffer; import com.microsoft.azure.management.compute.VirtualMachinePublisher; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.Sku; import com.microsoft.azure.management.compute.VirtualMachineImagesInSku; import com.microsoft.azure.management.compute.VirtualMachineSku; @@ -10,6 +11,7 @@ /** * The implementation for {@link Sku}. */ +@LangDefinition class VirtualMachineSkuImpl implements VirtualMachineSku { private final VirtualMachineOffer offer; diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkusImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkusImpl.java index ec8e4e05310f..5f9f8f97a60a 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkusImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineSkusImpl.java @@ -6,6 +6,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.VirtualMachineOffer; import com.microsoft.azure.management.compute.VirtualMachineSkus; import com.microsoft.azure.management.compute.VirtualMachineSku; @@ -17,6 +18,7 @@ /** * The implementation for {@link VirtualMachineSkus}. */ +@LangDefinition class VirtualMachineSkusImpl extends ReadableWrappersImpl implements VirtualMachineSkus { 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 59d54f31347e..813c6d2af303 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 @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.DataDisk; import com.microsoft.azure.management.compute.HardwareProfile; import com.microsoft.azure.management.compute.NetworkProfile; @@ -28,6 +29,7 @@ /** * The implementation for {@link VirtualMachines}. */ +@LangDefinition class VirtualMachinesImpl extends GroupableResourcesImpl< VirtualMachine, diff --git a/azure-mgmt-network/pom.xml b/azure-mgmt-network/pom.xml index 0ea3ecac32d6..e88976a6bdb8 100644 --- a/azure-mgmt-network/pom.xml +++ b/azure-mgmt-network/pom.xml @@ -67,6 +67,11 @@ 1.0.0-SNAPSHOT test + + com.microsoft.azure + api-annotations + 0.0.1-SNAPSHOT + @@ -116,6 +121,24 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + + + com.microsoft.azure.management.apigeneration.LangDefinitionProcessor + + true + true + + true + true + + + + diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java index 6fd254a21191..69501a4a9ac7 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancer.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.implementation.LoadBalancerInner; import com.microsoft.azure.management.network.model.HasLoadBalancingRules; import com.microsoft.azure.management.network.model.HasNetworkInterfaces; @@ -22,6 +23,7 @@ /** * Entry point for load balancer management API in Azure. */ +@LangDefinition() public interface LoadBalancer extends GroupableResource, Refreshable, @@ -68,6 +70,7 @@ public interface LoadBalancer extends /** * The entirety of the load balancer definition. */ + @LangDefinition(ContainerName = "~/LoadBalancer.Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -87,6 +90,7 @@ interface Definition extends /** * Grouping of load balancer definition stages. */ + @LangDefinition(ContainerName = "~/LoadBalancer.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of a load balancer definition. @@ -385,6 +389,7 @@ interface WithInboundNatPool { /** * Grouping of load balancer update stages. */ + @LangDefinition(ContainerName = "~/LoadBalancer.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * The stage of the load balancer update allowing to add or remove backends. @@ -644,6 +649,7 @@ interface WithInboundNatPool { *

* Call {@link Update#apply()} to apply the changes to the resource in Azure. */ + @LangDefinition(ContainerName = "~/LoadBalancer.Update", ContainerFileName = "IUpdate") interface Update extends Appliable, Resource.UpdateWithTags, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancers.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancers.java index 9d4f3ef831a9..d2e27b8b62df 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancers.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancers.java @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -18,6 +19,7 @@ /** * Entry point to load balancer management API in Azure. */ +@LangDefinition() public interface LoadBalancers extends SupportsCreating, SupportsListing, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Network.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Network.java index b08ae013ca88..f17768bea6f8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Network.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Network.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.implementation.VirtualNetworkInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -20,6 +21,7 @@ /** * Entry point for Virtual Network management API in Azure. */ +@LangDefinition() public interface Network extends GroupableResource, Refreshable, @@ -50,6 +52,7 @@ public interface Network extends /** * The entirety of the virtual network definition. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -61,6 +64,7 @@ interface Definition extends /** * Grouping of virtual network definition stages. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of a virtual network definition. @@ -161,6 +165,7 @@ interface WithCreateAndSubnet extends /** * Grouping of virtual network update stages. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * The stage of the virtual network update allowing to add or remove subnets. @@ -246,6 +251,7 @@ interface WithAddressSpace { *

* Call {@link Update#apply()} to apply the changes to the resource in Azure. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate") interface Update extends Appliable, Resource.UpdateWithTags, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java index 88f30cfec376..fc8018ae87fe 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.network; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.implementation.NetworkInterfaceInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -23,6 +24,7 @@ /** * Network interface. */ +@LangDefinition() public interface NetworkInterface extends GroupableResource, Refreshable, @@ -143,6 +145,7 @@ public interface NetworkInterface extends /** * The entirety of the network interface definition. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -155,6 +158,7 @@ interface Definition extends /** * Grouping of network interface definition stages. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of the network interface. @@ -375,6 +379,7 @@ interface WithCreate extends /** * Grouping of network interface update stages. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * The stage of the network interface update allowing to specify subnet. @@ -578,6 +583,7 @@ interface WithIpConfiguration { *

* Call {@link Update#apply()} to apply the changes to the resource in Azure. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate") interface Update extends Appliable, Resource.UpdateWithTags, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java index 96e726f9f406..cdb333ea9108 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java @@ -1,5 +1,6 @@ package com.microsoft.azure.management.network; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -12,6 +13,7 @@ /** * Entry point to network interface management. */ +@LangDefinition() public interface NetworkInterfaces extends SupportsCreating, SupportsListing, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroup.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroup.java index 595782cafc7d..5f4cc42c0643 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroup.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroup.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.implementation.NetworkSecurityGroupInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -21,6 +22,7 @@ /** * Network security group. */ +@LangDefinition() public interface NetworkSecurityGroup extends GroupableResource, Refreshable, @@ -51,6 +53,7 @@ public interface NetworkSecurityGroup extends /** * The entirety of the network security group definition. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -60,6 +63,7 @@ interface Definition extends /** * Grouping of network security group definition stages. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of the definition. @@ -105,6 +109,7 @@ interface WithCreate extends /** * Grouping of network security group update stages. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * The stage of the resource definition allowing to add or remove security rules. @@ -139,6 +144,7 @@ interface WithRule { *

* Call {@link Update#apply()} to apply the changes to the resource in Azure. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate") interface Update extends Appliable, Resource.UpdateWithTags, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java index dd6e6bde8998..d9e824511150 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -18,6 +19,7 @@ /** * Entry point to network security group management. */ +@LangDefinition() public interface NetworkSecurityGroups extends SupportsCreating, SupportsListing, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityRule.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityRule.java index 99ed6d1a3628..086a7926d3ce 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityRule.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityRule.java @@ -5,6 +5,8 @@ */ package com.microsoft.azure.management.network; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion; import com.microsoft.azure.management.network.implementation.SecurityRuleInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; import com.microsoft.azure.management.resources.fluentcore.model.Attachable; @@ -14,6 +16,7 @@ /** * A network security rule in a network security group. */ +@LangDefinition() public interface NetworkSecurityRule extends Wrapper, ChildResource { @@ -70,6 +73,7 @@ public interface NetworkSecurityRule extends * The entirety of a network security rule definition. * @param the return type of the final {@link Attachable#attach()} */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithAttach, @@ -84,6 +88,7 @@ interface Definition extends /** * Grouping of security rule definition stages applicable as part of a network security group creation. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition", IsContainerOnly = true, MethodConversionType = MethodConversion.OnlyMethod) interface DefinitionStages { /** * The first stage of a security rule definition. @@ -277,6 +282,7 @@ interface WithAttach extends /** The entirety of a network security rule definition as part of a network security group update. * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} */ + @LangDefinition(ContainerName = "UpdateDefinition", ContainerFileName = "IUpdateDefinition") interface UpdateDefinition extends UpdateDefinitionStages.Blank, UpdateDefinitionStages.WithDirectionAccess, @@ -291,6 +297,7 @@ interface UpdateDefinition extends /** * Grouping of security rule definition stages applicable as part of a network security group update. */ + @LangDefinition(ContainerName = "UpdateDefinition", ContainerFileName = "IUpdateDefinition", IsContainerOnly = true, MethodConversionType = MethodConversion.OnlyMethod) interface UpdateDefinitionStages { /** * The first stage of a security rule description as part of an update of a networking security group. @@ -469,6 +476,7 @@ interface WithAttach extends Attachable.InUpdate { /** * The entirety of a security rule update as part of a network security group update. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate", MethodConversionType = MethodConversion.OnlyMethod) interface Update extends UpdateStages.WithDirectionAccess, UpdateStages.WithSourceAddress, @@ -497,6 +505,7 @@ interface Update extends /** * Grouping of security rule update stages. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * The stage of the network rule description allowing the direction and the access type to be specified. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Networks.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Networks.java index 6795405c8b5b..cda1a05f1bdd 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Networks.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Networks.java @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -18,6 +19,7 @@ /** * Entry point to virtual network management API in Azure. */ +@LangDefinition() public interface Networks extends SupportsCreating, SupportsListing, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java index 22736f6fbbdf..c03849b10410 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java @@ -1,6 +1,7 @@ package com.microsoft.azure.management.network; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.implementation.NetworkInterfaceIPConfigurationInner; import com.microsoft.azure.management.network.model.HasPrivateIpAddress; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; @@ -14,6 +15,7 @@ /** * An IP configuration in a network interface. */ +@LangDefinition() public interface NicIpConfiguration extends Wrapper, ChildResource, @@ -60,6 +62,7 @@ public interface NicIpConfiguration extends * The entirety of the network interface IP configuration definition. * @param the return type of the final {@link Attachable#attach()} */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithAttach, @@ -72,6 +75,7 @@ interface Definition extends * Grouping of network interface IP configuration definition stages applicable as part of a * network interface update. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of network interface IP configuration definition. @@ -218,6 +222,7 @@ interface WithAttach /** The entirety of a network interface IP configuration definition as part of a network interface update. * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} */ + @LangDefinition(ContainerName = "UpdateDefinition", ContainerFileName = "IUpdateDefinition") interface UpdateDefinition extends UpdateDefinitionStages.Blank, UpdateDefinitionStages.WithAttach, @@ -230,6 +235,7 @@ interface UpdateDefinition extends /** * Grouping of network interface IP configuration definition stages. */ + @LangDefinition(ContainerName = "UpdateDefinition", ContainerFileName = "IUpdateDefinition", IsContainerOnly = true) interface UpdateDefinitionStages { /** * The first stage of network interface IP configuration definition. @@ -376,6 +382,7 @@ interface WithAttach /** * The entirety of a network interface IP configuration update as part of a network interface update. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate") interface Update extends Settable, UpdateStages.WithSubnet, @@ -388,6 +395,7 @@ interface Update extends /** * Grouping of network interface IP configuration update stages. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * The stage of the network interface IP configuration update allowing to specify subnet. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java index cbb5b12a4641..68ec03db56b6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.implementation.PublicIPAddressInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -17,6 +18,7 @@ /** * Public IP address. */ +@LangDefinition() public interface PublicIpAddress extends GroupableResource, Refreshable, @@ -64,6 +66,7 @@ public interface PublicIpAddress extends /** * Container interface for all the definitions. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -73,6 +76,7 @@ interface Definition extends /** * Grouping of public IP address definition stages. */ + @LangDefinition(ContainerName = "Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of a public IP address definition. @@ -186,6 +190,7 @@ interface WithCreate extends *

* Use {@link Update#apply()} to apply the changes to the resource in Azure. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate") interface Update extends Appliable, UpdateStages.WithIpAddress, @@ -198,6 +203,7 @@ interface Update extends /** * Grouping of public IP address update stages. */ + @LangDefinition(ContainerName = "Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * A public IP address update allowing to change the IP allocation method (static or dynamic). diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java index ae434425751c..8be7456b2911 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -18,6 +19,7 @@ /** * Entry point to public IP address management. */ +@LangDefinition() public interface PublicIpAddresses extends SupportsListing, SupportsCreating, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java index 3663685bdfc3..0d78c66fa205 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Subnet.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.network; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.implementation.SubnetInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; import com.microsoft.azure.management.resources.fluentcore.model.Attachable; @@ -17,6 +18,7 @@ /** * An immutable client-side representation of a subnet of a virtual network. */ +@LangDefinition() public interface Subnet extends Wrapper, ChildResource { @@ -39,6 +41,7 @@ public interface Subnet extends /** * Grouping of subnet definition stages. */ + @LangDefinition(ContainerName = "~/Subnet.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of the subnet definition. @@ -95,6 +98,7 @@ interface WithAttach extends /** The entirety of a Subnet definition. * @param the return type of the final {@link DefinitionStages.WithAttach#attach()} */ + @LangDefinition(ContainerName = "~/Subnet.Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithAddressPrefix, @@ -104,6 +108,7 @@ interface Definition extends /** * Grouping of subnet update stages. */ + @LangDefinition(ContainerName = "~/Subnet.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * The stage of the subnet update allowing to change the address space for the subnet. @@ -140,6 +145,7 @@ interface WithNetworkSecurityGroup { /** * The entirety of a subnet update as part of a network update. */ + @LangDefinition(ContainerName = "~/Subnet.Update", ContainerFileName = "IUpdate") interface Update extends UpdateStages.WithAddressPrefix, UpdateStages.WithNetworkSecurityGroup, @@ -149,6 +155,7 @@ interface Update extends /** * Grouping of subnet definition stages applicable as part of a virtual network update. */ + @LangDefinition(ContainerName = "~/Subnet.UpdateDefinition", ContainerFileName = "IUpdateDefinition", IsContainerOnly = true) interface UpdateDefinitionStages { /** * The first stage of the subnet definition. @@ -205,6 +212,7 @@ interface WithAttach extends /** The entirety of a subnet definition as part of a virtual network update. * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} */ + @LangDefinition(ContainerName = "~/Subnet.UpdateDefinition", ContainerFileName = "IUpdateDefinition") interface UpdateDefinition extends UpdateDefinitionStages.Blank, UpdateDefinitionStages.WithAddressPrefix, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java index e47cce47525f..9d64084ff1e8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancerImpl.java @@ -11,6 +11,7 @@ import com.microsoft.azure.management.network.HttpProbe; import com.microsoft.azure.management.network.InboundNatPool; import com.microsoft.azure.management.network.InboundNatRule; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.LoadBalancer; import com.microsoft.azure.management.network.LoadBalancingRule; import com.microsoft.azure.management.network.Network; @@ -39,6 +40,7 @@ /** * Implementation of the LoadBalancer interface. */ +@LangDefinition class LoadBalancerImpl extends GroupableParentResourceImpl< LoadBalancer, @@ -500,7 +502,7 @@ private FrontendImpl defineFrontend(String name) { return new FrontendImpl(inner, this); } else { return (FrontendImpl) frontend; - } + } } @Override diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java index 1017e60977bc..33253d1dfa4b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java @@ -7,6 +7,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.LoadBalancer; import com.microsoft.azure.management.network.LoadBalancers; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; @@ -17,6 +18,7 @@ /** * Implementation for {@link LoadBalancers}. */ +@LangDefinition class LoadBalancersImpl extends GroupableResourcesImpl< LoadBalancer, 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 8f3db154a917..2f59b64bda3f 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 @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.Subnet; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableParentResourceImpl; @@ -19,6 +20,7 @@ /** * Implementation for {@link Network} and its create and update interfaces. */ +@LangDefinition class NetworkImpl extends GroupableParentResourceImpl< Network, 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 fe4cdb84f90f..fa3a62aa490f 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 @@ -8,6 +8,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.IPAllocationMethod; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; @@ -33,6 +34,7 @@ /** * Implementation for {@link NetworkInterface} and its create and update interfaces. */ +@LangDefinition class NetworkInterfaceImpl extends GroupableParentResourceImpl< NetworkInterface, @@ -196,7 +198,7 @@ public NetworkInterfaceImpl withIpForwarding() { return this; } - //TODO: Networking doesn't support this yet, even though it exposes the API; so we have the impl but not exposed via the interface yet. + //TODO: Networking doesn't support this yet, even though it exposes the API; so we have the impl but not exposed via the interface yet. public NetworkInterfaceImpl withoutIpConfiguration(String name) { this.nicIpConfigurations.remove(name); return this; @@ -440,7 +442,7 @@ protected void beforeCreating() { } NicIpConfigurationImpl.ensureConfigurations(this.nicIpConfigurations.values()); - + // Reset and update IP configs this.inner().withIpConfigurations(innersFromWrappers(this.nicIpConfigurations.values())); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java index 4778bba77079..33ee1e3f9637 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java @@ -2,6 +2,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NetworkInterfaceDnsSettings; import com.microsoft.azure.management.network.NetworkInterfaces; @@ -14,6 +15,7 @@ /** * Implementation for {@link NetworkInterfaces}. */ +@LangDefinition class NetworkInterfacesImpl extends GroupableResourcesImpl< NetworkInterface, 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 7696a2e1da4f..24c04d6f4764 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 @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkSecurityRule; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableParentResourceImpl; @@ -19,6 +20,7 @@ /** * Implementation for {@link NetworkSecurityGroup} and its create and update interfaces. */ +@LangDefinition class NetworkSecurityGroupImpl extends GroupableParentResourceImpl< NetworkSecurityGroup, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java index 3e95c6a63ceb..b60be34f07c6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java @@ -7,6 +7,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkSecurityGroups; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; @@ -18,6 +19,7 @@ /** * Implementation for {@link NetworkSecurityGroups}. */ +@LangDefinition class NetworkSecurityGroupsImpl extends GroupableResourcesImpl< NetworkSecurityGroup, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java index 4e15c4d16c08..4e2ba5713706 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkSecurityRule; import com.microsoft.azure.management.network.SecurityRuleAccess; @@ -15,6 +16,7 @@ /** * Implementation for {@link NetworkSecurityRule} and its create and update interfaces. */ +@LangDefinition class NetworkSecurityRuleImpl extends ChildResourceImpl implements diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java index 6e9038a5eb90..30eab4179fb2 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java @@ -7,6 +7,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.AddressSpace; import com.microsoft.azure.management.network.DhcpOptions; import com.microsoft.azure.management.network.Network; @@ -20,6 +21,7 @@ /** * Implementation for {@link Networks}. */ +@LangDefinition class NetworksImpl extends GroupableResourcesImpl< Network, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java index 966afa3ab808..7ac23a2aca97 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java @@ -2,6 +2,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.IPAllocationMethod; import com.microsoft.azure.management.network.LoadBalancer; import com.microsoft.azure.management.network.Network; @@ -20,6 +21,7 @@ /** * Implementation for {@link NicIpConfiguration} and its create and update interfaces. */ +@LangDefinition() class NicIpConfigurationImpl extends ChildResourceImpl 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 12925b631663..213ecd3d2ea8 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 @@ -5,6 +5,7 @@ */ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.IPAllocationMethod; import com.microsoft.azure.management.network.PublicIPAddressDnsSettings; import com.microsoft.azure.management.network.PublicIpAddress; @@ -14,6 +15,7 @@ /** * Implementation for {@link PublicIpAddress} and its create and update interfaces. */ +@LangDefinition class PublicIpAddressImpl extends GroupableResourceImpl< PublicIpAddress, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java index e279eae13039..a7421e734ae3 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java @@ -10,6 +10,7 @@ import com.microsoft.azure.management.network.PublicIPAddressDnsSettings; import com.microsoft.azure.management.network.PublicIpAddress; import com.microsoft.azure.management.network.PublicIpAddresses; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; @@ -18,6 +19,7 @@ /** * Implementation for {@link PublicIpAddresses}. */ +@LangDefinition class PublicIpAddressesImpl extends GroupableResourcesImpl< PublicIpAddress, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java index 712ccc7feeb8..bd584d858b34 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SubnetImpl.java @@ -9,6 +9,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.Subnet; @@ -17,6 +18,7 @@ /** * Implementation for {@link Subnet} and its create and update interfaces. */ +@LangDefinition class SubnetImpl extends ChildResourceImpl implements diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java index e2a1459a079a..cfb0bf322bb2 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/model/HasNetworkInterfaces.java @@ -10,10 +10,12 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.management.network.NetworkInterface; +import com.microsoft.azure.management.apigeneration.LangDefinition; /** * Interface exposing a list of network interfaces. */ +@LangDefinition() public interface HasNetworkInterfaces { /** * Gets the primary network interface. diff --git a/azure-mgmt-resources/pom.xml b/azure-mgmt-resources/pom.xml index 25a82ff5d3f0..a6e693f58c09 100644 --- a/azure-mgmt-resources/pom.xml +++ b/azure-mgmt-resources/pom.xml @@ -66,6 +66,11 @@ 1.0.0-SNAPSHOT test + + com.microsoft.azure + api-annotations + 0.0.1-SNAPSHOT + @@ -108,6 +113,24 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + + + com.microsoft.azure.management.apigeneration.LangDefinitionProcessor + + true + true + + true + true + + + + diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java index e20b35f596e1..f3d409675339 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployment.java @@ -7,6 +7,9 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangMethodDefinition; +import com.microsoft.azure.management.apigeneration.LangMethodDefinition.LangMethodType; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; @@ -23,6 +26,7 @@ /** * An immutable client-side representation of an Azure deployment. */ +@LangDefinition(ContainerName = "~/") public interface Deployment extends Refreshable, Updatable, @@ -97,6 +101,7 @@ public interface Deployment extends /** * @return the operations related to this deployment */ + @LangMethodDefinition(AsType = LangMethodType.Property) DeploymentOperations deploymentOperations(); /** @@ -119,6 +124,7 @@ public interface Deployment extends /** * Container interface for all the deployment definitions. */ + @LangDefinition(ContainerName = "~/Deployment.Definition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -131,6 +137,7 @@ interface Definition extends /** * Grouping of all the deployment definition stages. */ + @LangDefinition(ContainerName = "~/Deployment.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of deployment definition. @@ -244,6 +251,7 @@ interface WithCreate extends Creatable { /** * Grouping of all the deployment updates stages. */ + @LangDefinition(ContainerName = "~/Deployment.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * A deployment update allowing to change the deployment mode. @@ -327,6 +335,7 @@ interface WithParameters { *

* Call {@link Update#apply()} to apply the changes to the deployment in Azure. */ + @LangDefinition(ContainerName = "~/Deployment.Update") interface Update extends Appliable, UpdateStages.WithTemplate, diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java index bf56e858d2dc..e663bbecbcca 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentExportResult.java @@ -6,12 +6,14 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.resources.implementation.DeploymentExportResultInner; /** * An immutable client-side representation of an Azure deployment template export result. */ +@LangDefinition(ContainerName = "~/") public interface DeploymentExportResult extends Wrapper { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java index 8611575768d3..947df7a40693 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/DeploymentOperation.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Refreshable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; @@ -15,6 +16,7 @@ /** * An immutable client-side representation of a deployment operation. */ +@LangDefinition(ContainerName = "~/") public interface DeploymentOperation extends Indexable, Refreshable, 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 065d71b6496c..976e36202502 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 @@ -6,12 +6,14 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** * Entry point to deployment operation management API. */ +@LangDefinition(ContainerName = "~/") public interface DeploymentOperations extends SupportsListing, SupportsGettingById { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java index c1b49302437d..ece9655b657e 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -21,6 +22,7 @@ /** * Entry point to template deployment in Azure. */ +@LangDefinition(ContainerName = "~/") public interface Deployments extends SupportsCreating, SupportsListing, diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java index e0ffd3f3780a..38fd29781e0d 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Feature.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.resources.implementation.FeatureResultInner; @@ -13,6 +14,7 @@ /** * An immutable client-side representation of an Azure feature. */ +@LangDefinition(ContainerName = "~/") public interface Feature extends Indexable, Wrapper { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Features.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Features.java index 38c8fe3a8e1f..0590bbb23f08 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Features.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Features.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; @@ -15,6 +16,7 @@ /** * Entry point to features management API. */ +@LangDefinition(ContainerName = "~/") public interface Features extends SupportsListing { /** @@ -28,6 +30,7 @@ public interface Features extends /** * Entry point to features management API in a specific resource provider. */ + @LangDefinition(ContainerName = "~/Feature") interface InResourceProvider extends SupportsListing, SupportsGettingByName { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java index 3795d7dccae6..c168b0066693 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResource.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; @@ -18,6 +19,7 @@ /** * An immutable client-side representation of an Azure generic resource. */ +@LangDefinition(ContainerName = "~/") public interface GenericResource extends GroupableResource, Refreshable, @@ -56,6 +58,7 @@ public interface GenericResource extends /** * The entirety of the generic resource definition. */ + @LangDefinition(ContainerName = "~/GenericResource.Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -70,6 +73,7 @@ interface Definition extends /** * Grouping of generic resource definition stages. */ + @LangDefinition(ContainerName = "~/GenericResource.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * A generic resource definition allowing region to be specified. @@ -180,6 +184,7 @@ interface WithCreate extends /** * Grouping of generic resource update stages. */ + @LangDefinition(ContainerName = "~/GenericResource.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * A generic resource update allowing to change the resource properties. @@ -247,6 +252,7 @@ interface WithApiVersion { /** * The template for a generic resource update operation, containing all the settings that can be modified. */ + @LangDefinition(ContainerName = "~/GenericResource.Update") interface Update extends Appliable, UpdateStages.WithPlan, diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java index 1a70853b83e4..8d468de589d4 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; @@ -17,6 +18,7 @@ /** * Entry point to generic resources management API. */ +@LangDefinition(ContainerName = "~/") public interface GenericResources extends SupportsListingByGroup, SupportsGettingById, diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java index 568008a30eda..ac4febdc053b 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Location.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.resources.implementation.LocationInner; @@ -13,6 +14,7 @@ /** * An immutable client-side representation of an Azure location. */ +@LangDefinition(ContainerName = "~/") public interface Location extends Indexable, Wrapper { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java index 263c203ec893..5948052af524 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Provider.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.resources.implementation.ProviderInner; @@ -15,6 +16,7 @@ /** * An immutable client-side representation of an Azure resource provider. */ +@LangDefinition(ContainerName = "~/") public interface Provider extends Indexable, Wrapper { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Providers.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Providers.java index 02330ab2384b..5ce042215034 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Providers.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Providers.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; import com.microsoft.rest.ServiceResponse; @@ -16,6 +17,7 @@ /** * Entry point to providers management API. */ +@LangDefinition(ContainerName = "~/") public interface Providers extends SupportsListing, SupportsGettingByName { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceConnector.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceConnector.java index 89156df30a62..181a15bdc755 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceConnector.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceConnector.java @@ -7,12 +7,14 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.RestClient; +import com.microsoft.azure.management.apigeneration.LangDefinition; /** * Defines a connector that connects other resources to a resource group. * Implementations of this class can let users browse resources inside a * specific resource group. */ +@LangDefinition(ContainerName = "~/") public interface ResourceConnector { /** * Implementations of this interface defines how to create a connector. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java index 4307c2d4c2e4..a7f257c653a5 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroup.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; @@ -22,6 +23,7 @@ /** * An immutable client-side representation of an Azure resource group. */ +@LangDefinition(ContainerName = "~/") public interface ResourceGroup extends Indexable, Resource, @@ -55,6 +57,7 @@ public interface ResourceGroup extends /** * Container interface for all the definitions that need to be implemented. */ + @LangDefinition(ContainerName = "~/ResourceGroup.Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithCreate { @@ -63,6 +66,7 @@ interface Definition extends /** * Grouping of all the resource group definition stages. */ + @LangDefinition(ContainerName = "~/ResourceGroup.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * A resource group definition allowing location to be set. @@ -84,6 +88,7 @@ interface WithCreate extends /** * Grouping of all the resource group update stages. */ + @LangDefinition(ContainerName = "~/ResourceGroup.Update", ContainerFileName = "IUpdate") interface UpdateStages { } @@ -92,6 +97,7 @@ interface UpdateStages { *

* Call {@link Update#apply()} to apply the changes to the resource group in Azure. */ + @LangDefinition(ContainerName = "~/ResourceGroup.Update", ContainerFileName = "IUpdate") interface Update extends Appliable, Resource.UpdateWithTags { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java index 98c82e94f2bc..477c9a971712 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroupExportResult.java @@ -6,12 +6,14 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.resources.implementation.ResourceGroupExportResultInner; /** * An immutable client-side representation of an Azure deployment template export result. */ +@LangDefinition(ContainerName = "~/") public interface ResourceGroupExportResult extends Wrapper { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java index a39a0253329b..de60ca3ff124 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.resources; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; @@ -18,6 +19,7 @@ /** * Entry point to resource group management API. */ +@LangDefinition(ContainerName = "~/") public interface ResourceGroups extends SupportsListing, SupportsGettingByName, diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java index 78bc06ca2626..888e21fb404b 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscription.java @@ -8,6 +8,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.resources.implementation.SubscriptionInner; @@ -17,6 +18,7 @@ /** * An immutable client-side representation of an Azure subscription. */ +@LangDefinition(ContainerName = "~/") public interface Subscription extends Indexable, Wrapper { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscriptions.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscriptions.java index 85df43bf9bbb..bc06a07ce2b3 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscriptions.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Subscriptions.java @@ -6,12 +6,14 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** * Entry point to subscription management API. */ +@LangDefinition(ContainerName = "~/") public interface Subscriptions extends SupportsListing, SupportsGettingByName { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenant.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenant.java index a7fcff2de6fe..df518bd530f6 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenant.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenant.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Indexable; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.resources.implementation.TenantIdDescriptionInner; @@ -13,6 +14,7 @@ /** * An immutable client-side representation of an Azure tenant. */ +@LangDefinition(ContainerName = "~/") public interface Tenant extends Indexable, Wrapper { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenants.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenants.java index a6646f3ef984..877736ffe113 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenants.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Tenants.java @@ -6,11 +6,13 @@ package com.microsoft.azure.management.resources; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** * Entry point to tenant management API. */ +@LangDefinition(ContainerName = "~/") public interface Tenants extends SupportsListing { } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByGroup.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByGroup.java index d87908d41f44..c7431e958fc6 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByGroup.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByGroup.java @@ -6,11 +6,15 @@ package com.microsoft.azure.management.resources.fluentcore.arm.collection; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion; + /** * Provides access to deleting a resource from Azure, identifying it by its name and its resource group. * * (Note: this interface is not intended to be implemented by user code) */ +@LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true, MethodConversionType = MethodConversion.OnlyMethod) public interface SupportsDeletingByGroup { /** * Deletes a resource from Azure, identifying it by its name and its resource group. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingByGroup.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingByGroup.java index 164695eb2cea..b3774800bb0b 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingByGroup.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingByGroup.java @@ -7,6 +7,8 @@ package com.microsoft.azure.management.resources.fluentcore.arm.collection; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion; import java.io.IOException; @@ -17,6 +19,7 @@ * * @param the type of the resource to get. */ +@LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true, MethodConversionType = MethodConversion.OnlyMethod) public interface SupportsGettingByGroup { /** * Gets the information about a resource from Azure based on the resource name and the name of its resource group. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingById.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingById.java index f89d1e4530b4..db84ecfb284f 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingById.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingById.java @@ -8,6 +8,8 @@ package com.microsoft.azure.management.resources.fluentcore.arm.collection; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion; import java.io.IOException; @@ -16,6 +18,7 @@ * * @param the type of the resource collection */ +@LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true, MethodConversionType = MethodConversion.OnlyMethod) public interface SupportsGettingById { /** * Gets the information about a resource from Azure based on the resource id. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingByName.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingByName.java index 2744189d2182..ca590d17b3fd 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingByName.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsGettingByName.java @@ -8,6 +8,8 @@ package com.microsoft.azure.management.resources.fluentcore.arm.collection; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion; import java.io.IOException; @@ -16,6 +18,7 @@ * * @param the type of the resource collection */ +@LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true, MethodConversionType = MethodConversion.OnlyMethod) public interface SupportsGettingByName { /** * Gets the information about a resource from Azure based on the resource name within the current resource group. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsListingByGroup.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsListingByGroup.java index b2f950507468..973acc2d694a 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsListingByGroup.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsListingByGroup.java @@ -8,6 +8,8 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion; import java.io.IOException; @@ -18,6 +20,7 @@ * * @param the type of the resources listed. */ +@LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true, MethodConversionType = MethodConversion.OnlyMethod) public interface SupportsListingByGroup { /** * Lists resources of the specified type in the specified resource group. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/ChildResource.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/ChildResource.java index 1fc38f6cdf1d..4086d7f8e136 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/ChildResource.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/ChildResource.java @@ -5,11 +5,13 @@ */ package com.microsoft.azure.management.resources.fluentcore.arm.models; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Indexable; /** * Base interface used by child resources. */ +@LangDefinition() public interface ChildResource extends Indexable { /** * @return the name of the child resource diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/GroupableResource.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/GroupableResource.java index f6afddeac75a..c2afa3836c26 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/GroupableResource.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/GroupableResource.java @@ -6,12 +6,14 @@ package com.microsoft.azure.management.resources.fluentcore.arm.models; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.fluentcore.model.Creatable; /** * Base interface for resources in resource groups. */ +@LangDefinition() public interface GroupableResource extends Resource { /** * @return the name of the resource group @@ -21,6 +23,8 @@ public interface GroupableResource extends Resource { /** * Grouping of all the definition stages. */ + + @LangDefinition(ContainerName = "GroupableResource.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * A resource definition allowing a resource group to be selected. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java index e8c5c0a360f2..35a681c6ee83 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/models/Resource.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.resources.fluentcore.arm.models; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.model.Indexable; @@ -14,6 +15,7 @@ /** * Base interfaces for fluent resources. */ +@LangDefinition() public interface Resource extends Indexable { /** * @return the resource ID string @@ -50,6 +52,7 @@ public interface Resource extends Indexable { * * @param the type of the next stage resource definition */ + @LangDefinition(ContainerName = "Resource.Definition", ContainerFileName = "IDefinition") interface DefinitionWithRegion { /** * Specifies the region for the resource by name. @@ -71,6 +74,7 @@ interface DefinitionWithRegion { * * @param the type of the next stage resource definition */ + @LangDefinition(ContainerName = "Resource.Definition", ContainerFileName = "IDefinition") interface DefinitionWithTags { /** * Specifies tags for the resource as a {@link Map}. @@ -93,6 +97,7 @@ interface DefinitionWithTags { * * @param the type of the next stage resource update */ + @LangDefinition(ContainerName = "Resource.Update", ContainerFileName = "IUpdate") interface UpdateWithTags { /** * Specifies tags for the resource as a {@link Map}. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsCreating.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsCreating.java index eea690334dd2..fa7a586af7d2 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsCreating.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsCreating.java @@ -8,12 +8,15 @@ import com.microsoft.azure.management.resources.fluentcore.model.Creatable; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion; /** * Providing access to creating Azure top level resources. *

* (Note: this interface is not intended to be implemented by user code) * @param the initial blank definition interface */ +@LangDefinition(ContainerName = "CollectionActions", MethodConversionType = MethodConversion.OnlyMethod) public interface SupportsCreating { /** * Begins a definition for a new resource. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeleting.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeleting.java index 9684afbf6308..eb6f36e79b37 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeleting.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeleting.java @@ -6,11 +6,14 @@ package com.microsoft.azure.management.resources.fluentcore.collection; +import com.microsoft.azure.management.apigeneration.LangDefinition; + /** * Provides access to deleting a resource from Azure, identifying it by its resource ID. *

* (Note: this interface is not intended to be implemented by user code) */ +@LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true) public interface SupportsDeleting { /** * Deletes a resource from Azure, identifying it by its resource ID. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsListing.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsListing.java index bb9156b0bd92..df35181f8576 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsListing.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsListing.java @@ -8,6 +8,8 @@ import com.microsoft.azure.PagedList; import com.microsoft.rest.RestException; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion; import java.io.IOException; @@ -18,6 +20,7 @@ * * @param the fluent type of the resource */ +@LangDefinition(ContainerName = "CollectionActions", MethodConversionType = MethodConversion.OnlyMethod) public interface SupportsListing { /** * Lists all the resources of the specified type in the currently selected subscription. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsListingByRegion.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsListingByRegion.java index 1d860a1fc343..1b33427b1126 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsListingByRegion.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsListingByRegion.java @@ -8,6 +8,8 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangDefinition.MethodConversion; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import java.io.IOException; @@ -19,6 +21,7 @@ * * @param the fluent type of the resource */ +@LangDefinition(ContainerName = "CollectionActions", MethodConversionType = MethodConversion.OnlyMethod) public interface SupportsListingByRegion { /** * Lists all the resources of the specified type in the specified region. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Appliable.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Appliable.java index df7662af7fac..14a4b3f6d143 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Appliable.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Appliable.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.resources.fluentcore.model; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import rx.Observable; @@ -15,6 +16,7 @@ * * @param the type of the resource returned from the update. */ +@LangDefinition(ContainerName = "ResourceActions", CreateAsyncMultiThreadMethodParam = true) public interface Appliable extends Indexable { /** * Execute the update request. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Attachable.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Attachable.java index d50cb5fdcd8b..ef105f2a2a60 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Attachable.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Attachable.java @@ -6,11 +6,14 @@ package com.microsoft.azure.management.resources.fluentcore.model; +import com.microsoft.azure.management.apigeneration.LangDefinition; + /** * The final stage of the child object definition, at which it can be attached to the parent, using {@link Attachable#attach()}. * * @param the parent definition {@link Attachable#attach()} returns to */ +@LangDefinition(ContainerName = "ChildResourceActions") public interface Attachable { /** * Attaches this child object's definition to its parent's definition. @@ -22,6 +25,7 @@ public interface Attachable { * The final stage of the child object definition, as which it can be attached to the parent. * @param the parent definition */ + @LangDefinition(ContainerName = "~/Core.ChildResource.Definition", ContainerFileName = "IDefinition") interface InDefinition { /** * Attaches the child definition to the parent resource definiton. @@ -46,6 +50,7 @@ interface InDefinitionAlt { * The final stage of the child object definition, as which it can be attached to the parent. * @param the parent definition */ + @LangDefinition(ContainerName = "~/Core.ChildResource.Update", ContainerFileName = "IUpdate") interface InUpdate { /** * Attaches the child definition to the parent resource update. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Creatable.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Creatable.java index a96712672357..110f2e100883 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Creatable.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Creatable.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.resources.fluentcore.model; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import rx.Observable; @@ -15,6 +16,7 @@ * * @param the fluent type of the resource to be created */ +@LangDefinition(ContainerName = "ResourceActions", CreateAsyncMultiThreadMethodParam = true) public interface Creatable extends Indexable { /** * @return the name of the creatable resource. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Indexable.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Indexable.java index e3d2998f0cb5..92f4b92c453e 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Indexable.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Indexable.java @@ -6,9 +6,12 @@ package com.microsoft.azure.management.resources.fluentcore.model; +import com.microsoft.azure.management.apigeneration.LangDefinition; + /** * Base interface for all models that can be indexed by a key. */ +@LangDefinition(ContainerName = "ResourceActions", CreateAsyncMultiThreadMethodParam = true) public interface Indexable { /** * @return the index key. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Refreshable.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Refreshable.java index 4cfc5175cdf3..c57e34a4983d 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Refreshable.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Refreshable.java @@ -6,11 +6,14 @@ package com.microsoft.azure.management.resources.fluentcore.model; +import com.microsoft.azure.management.apigeneration.LangDefinition; + /** * Base class for resources that can be refreshed to get the latest state. * * @param the fluent type of the resource */ +@LangDefinition(ContainerName = "ResourceActions") public interface Refreshable { /** * Refreshes the resource to sync with Azure. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Settable.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Settable.java index 3c9f7a6e7037..76de599d9540 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Settable.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Settable.java @@ -1,11 +1,14 @@ package com.microsoft.azure.management.resources.fluentcore.model; +import com.microsoft.azure.management.apigeneration.LangDefinition; + /** * The base interface for all template interfaces for child resources that support * update operations. * * @param the parent definition {@link Settable#parent()} returns to */ +@LangDefinition(ContainerName = "ChildResourceActions") public interface Settable { /** * Begins an update for a child resource. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Updatable.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Updatable.java index 0c45d5d071d3..6d274e92c9a2 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Updatable.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Updatable.java @@ -6,11 +6,14 @@ package com.microsoft.azure.management.resources.fluentcore.model; +import com.microsoft.azure.management.apigeneration.LangDefinition; + /** * Base class for resource that can be updated. * * @param the fluent type of the resource */ +@LangDefinition(ContainerName = "ResourceActions") public interface Updatable { /** * Begins an update for a new resource. diff --git a/azure-mgmt-storage/pom.xml b/azure-mgmt-storage/pom.xml index 6cd45c1659db..0ada7eae840b 100644 --- a/azure-mgmt-storage/pom.xml +++ b/azure-mgmt-storage/pom.xml @@ -67,6 +67,11 @@ 1.0.0-SNAPSHOT test + + com.microsoft.azure + api-annotations + 0.0.1-SNAPSHOT + @@ -111,6 +116,24 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + + + com.microsoft.azure.management.apigeneration.LangDefinitionProcessor + + true + true + + true + true + + + + diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java index 15b5e748fb52..0079054677b1 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java @@ -7,6 +7,9 @@ package com.microsoft.azure.management.storage; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.LangMethodDefinition; +import com.microsoft.azure.management.apigeneration.LangMethodDefinition.LangMethodType; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; @@ -24,6 +27,7 @@ /** * An immutable client-side representation of an Azure storage account. */ +@LangDefinition public interface StorageAccount extends GroupableResource, Refreshable, @@ -102,6 +106,7 @@ public interface StorageAccount extends * @throws CloudException exception thrown from REST call * @throws IOException exception thrown from serialization/deserialization */ + @LangMethodDefinition(AsType = LangMethodType.Method) List keys() throws CloudException, IOException; /** @@ -112,6 +117,7 @@ public interface StorageAccount extends * @throws CloudException exception thrown from REST call * @throws IOException exception thrown from serialization/deserialization */ + @LangMethodDefinition(AsType = LangMethodType.Method) List refreshKeys() throws CloudException, IOException; /** @@ -122,6 +128,7 @@ public interface StorageAccount extends * @throws CloudException exception thrown from REST call * @throws IOException exception thrown from serialization/deserialization */ + @LangMethodDefinition(AsType = LangMethodType.Method) List regenerateKey(String keyName) throws CloudException, IOException; /************************************************************** @@ -131,6 +138,7 @@ public interface StorageAccount extends /** * Container interface for all the definitions that need to be implemented. */ + @LangDefinition(ContainerName = "~/StorageAccount.Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -141,6 +149,7 @@ interface Definition extends /** * Grouping of all the storage account definition stages. */ + @LangDefinition(ContainerName = "~/StorageAccount.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of the storage account definition. @@ -274,6 +283,7 @@ interface WithCreateAndAccessTier extends DefinitionStages.WithCreate { /** * Grouping of all the storage account update stages. */ + @LangDefinition(ContainerName = "~/StorageAccount.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * A storage account update stage allowing to change the parameters. @@ -361,6 +371,7 @@ interface WithAccessTier { /** * The template for a storage account update operation, containing all the settings that can be modified. */ + @LangDefinition(ContainerName = "~/StorageAccount.Update", ContainerFileName = "IUpdate") interface Update extends Appliable, UpdateStages.WithSku, diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java index 0e8804e86927..8a521d1e0316 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.storage; import com.microsoft.azure.CloudException; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -21,6 +22,7 @@ /** * Entry point for storage accounts management API. */ +@LangDefinition(ContainerName = "~/") public interface StorageAccounts extends SupportsListing, SupportsCreating, diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java index 4fae8301c132..ebd5c924d9bb 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageUsage.java @@ -6,12 +6,14 @@ package com.microsoft.azure.management.storage; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.storage.implementation.UsageInner; /** * An immutable client-side representation of an Azure storage resource usage info object. */ +@LangDefinition(ContainerName = "~/") public interface StorageUsage extends Wrapper { /** * @return the unit of measurement. Possible values include: 'Count', diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usages.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usages.java index c9c354254a6e..f543747f20ab 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usages.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/Usages.java @@ -6,10 +6,12 @@ package com.microsoft.azure.management.storage; +import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** * Entry point for storage resource usage management API. */ +@LangDefinition(ContainerName = "~/") public interface Usages extends SupportsListing { } diff --git a/pom.xml b/pom.xml index 48c53b03085c..18aa3f5357e8 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,16 @@ always + + azure-public-snapshots + Azure Public Snapshots + http://adxmaven.westus.cloudapp.azure.com/repository/maven-snapshots + default + + true + always + + @@ -98,6 +108,7 @@ 4.12 test + @@ -159,6 +170,27 @@ maven-release-plugin 2.5.3 + + + com.googlecode.addjars-maven-plugin + addjars-maven-plugin + 1.0.5 + + + + add-jars + + + + + ../extlib + + + + + + + @@ -190,6 +222,35 @@ maven-release-plugin 2.5.2 + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + com.googlecode.addjars-maven-plugin + + + addjars-maven-plugin + + [1.0.5,) + + add-jars + + + + + + + + + +