Merge remote-tracking branch 'upstream/master' into martin-networking

anumjs · Dec 14, 2016 · 3027567 · 3027567
2 parents 93695ec + 26d82ae
commit 3027567
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 1 deletion.
diff --git a/azure-mgmt-cdn/src/main/java/com/microsoft/azure/management/cdn/CdnEndpoint.java b/azure-mgmt-cdn/src/main/java/com/microsoft/azure/management/cdn/CdnEndpoint.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.management.cdn;
 
 import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.Method;
 import com.microsoft.azure.management.cdn.implementation.EndpointInner;
 import com.microsoft.azure.management.resources.fluentcore.arm.CountryISOCode;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.ExternalChildResource;
@@ -389,6 +390,7 @@ interface WithPremiumAttach<ParentT>
          * @param <ParentT> the parent definition {@link AttachableStandard#attach()} returns to
          */
         interface AttachableStandard<ParentT> {
+            @Method
             ParentT attach();
         }
 
@@ -398,6 +400,7 @@ interface AttachableStandard<ParentT> {
          * @param <ParentT> the parent definition {@link AttachableStandard#attach()} returns to
          */
         interface AttachablePremium<ParentT> {
+            @Method
             ParentT attach();
         }
     }
@@ -656,6 +659,7 @@ interface WithPremiumAttach<ParentT>
          * @param <ParentT> the parent definition {@link AttachableStandard#attach()} returns to
          */
         interface AttachableStandard<ParentT> {
+            @Method
             ParentT attach();
         }
 
@@ -665,6 +669,7 @@ interface AttachableStandard<ParentT> {
          * @param <ParentT> the parent definition {@link AttachableStandard#attach()} returns to
          */
         interface AttachablePremium<ParentT> {
+            @Method
             ParentT attach();
         }
     }

diff --git a/azure-mgmt-cdn/src/main/java/com/microsoft/azure/management/cdn/CdnProfile.java b/azure-mgmt-cdn/src/main/java/com/microsoft/azure/management/cdn/CdnProfile.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.management.cdn;
 
 import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.Method;
 import com.microsoft.azure.management.cdn.implementation.ProfileInner;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
@@ -49,6 +50,7 @@ public interface CdnProfile extends
      *
      * @return URI used to login to third party web portal.
      */
+    @Method
     String generateSsoUri();
 
     /**

diff --git a/...gmt-cdn/src/main/java/com/microsoft/azure/management/cdn/CheckNameAvailabilityResult.java b/...gmt-cdn/src/main/java/com/microsoft/azure/management/cdn/CheckNameAvailabilityResult.java
@@ -7,6 +7,8 @@
 package com.microsoft.azure.management.cdn;
 
 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.cdn.implementation.CheckNameAvailabilityOutputInner;
 
 /**
@@ -30,6 +32,7 @@ public CheckNameAvailabilityResult(CheckNameAvailabilityOutputInner inner) {
      *
      * @return the nameAvailable value
      */
+    @LangMethodDefinition(AsType = LangMethodType.Property)
     public boolean nameAvailable() {
         return this.inner.nameAvailable();
     }
@@ -39,6 +42,7 @@ public boolean nameAvailable() {
      *
      * @return the reason value
      */
+    @LangMethodDefinition(AsType = LangMethodType.Property)
     public String reason() {
         return this.inner.reason();
     }
@@ -48,6 +52,7 @@ public String reason() {
      *
      * @return the message value
      */
+    @LangMethodDefinition(AsType = LangMethodType.Property)
     public String message() {
         return this.inner.message();
     }

diff --git a/...mt-cdn/src/main/java/com/microsoft/azure/management/cdn/CustomDomainValidationResult.java b/...mt-cdn/src/main/java/com/microsoft/azure/management/cdn/CustomDomainValidationResult.java
@@ -6,8 +6,8 @@
 
 package com.microsoft.azure.management.cdn;
 
-
 import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
 import com.microsoft.azure.management.cdn.implementation.ValidateCustomDomainOutputInner;
 
 /**
@@ -31,6 +31,7 @@ public CustomDomainValidationResult(ValidateCustomDomainOutputInner inner) {
      *
      * @return the customDomainValidated value
      */
+    @LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property)
     public boolean customDomainValidated() {
         return this.inner.customDomainValidated();
     }
@@ -40,6 +41,7 @@ public boolean customDomainValidated() {
      *
      * @return the reason value
      */
+    @LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property)
     public String reason() {
         return this.inner.reason();
     }
@@ -49,6 +51,7 @@ public String reason() {
      *
      * @return the message value
      */
+    @LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property)
     public String message() {
         return this.inner.message();
     }

diff --git a/azure-mgmt-cdn/src/main/java/com/microsoft/azure/management/cdn/Operation.java b/azure-mgmt-cdn/src/main/java/com/microsoft/azure/management/cdn/Operation.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.management.cdn;
 
 import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
 import com.microsoft.azure.management.cdn.implementation.OperationInner;
 
 /**
@@ -30,6 +31,7 @@ public Operation(OperationInner inner) {
      *
      * @return the name value
      */
+    @LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property)
     public String name() {
         return this.inner.name();
     }
@@ -39,6 +41,7 @@ public String name() {
      *
      * @return the provider value
      */
+    @LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property)
     public String provider() {
         if (this.inner.display() == null) {
             return null;
@@ -51,6 +54,7 @@ public String provider() {
      *
      * @return the resource value
      */
+    @LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property)
     public String resource() {
         if (this.inner.display() == null) {
             return null;
@@ -63,6 +67,7 @@ public String resource() {
      *
      * @return the operation value
      */
+    @LangMethodDefinition(AsType = LangMethodDefinition.LangMethodType.Property)
     public String type() {
         if (this.inner.display() == null) {
             return null;

diff --git a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCache.java b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCache.java
@@ -34,6 +34,7 @@ public interface RedisCache extends
     /**
      * @return exposes features available only to Premium Sku Redis Cache instances.
      */
+    @Method
     RedisCachePremium asPremium();
 
     /**

diff --git a/...rc/main/java/com/microsoft/azure/management/redis/implementation/RedisAccessKeysImpl.java b/...rc/main/java/com/microsoft/azure/management/redis/implementation/RedisAccessKeysImpl.java
@@ -6,12 +6,14 @@
 
 package com.microsoft.azure.management.redis.implementation;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.redis.RedisAccessKeys;
 import com.microsoft.azure.management.redis.RedisCache;
 
 /**
  * The {@link RedisCache#keys} action result.
  */
+@LangDefinition
 class RedisAccessKeysImpl implements RedisAccessKeys {
     private RedisAccessKeysInner inner;
 

diff --git a/...dis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCacheImpl.java b/...dis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCacheImpl.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.management.redis.implementation;
 
 import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Method;
 import com.microsoft.azure.management.redis.DayOfWeek;
 import com.microsoft.azure.management.redis.RebootType;
 import com.microsoft.azure.management.redis.RedisAccessKeys;
@@ -119,6 +120,7 @@ public Map<String, String> redisConfiguration() {
     }
 
     @Override
+    @Method
     public RedisCachePremium asPremium() {
         if (this.isPremium()) {
             return (RedisCachePremium) this;
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ public interface RedisCache extends @@
         /**
          * @return exposes features available only to Premium Sku Redis Cache instances.
          */
+        @Method
         RedisCachePremium asPremium();
         /**
@@ Expand Down @@