Generated from dce1dcc93c2fc9d5fecc6382fd8afbe14626469a

commit merge

sdk/resources/mgmt-v2019_06_01/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-resources</artifactId>

sdk/resources/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/resources/v2019_06_01/TenantCategory.java

@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.resources.v2019_06_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for TenantCategory.
+ */
+public enum TenantCategory {
+    /** Enum value Home. */
+    HOME("Home"),
+
+    /** Enum value ProjectedBy. */
+    PROJECTED_BY("ProjectedBy"),
+
+    /** Enum value ManagedBy. */
+    MANAGED_BY("ManagedBy");
+
+    /** The actual serialized value for a TenantCategory instance. */
+    private String value;
+
+    TenantCategory(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a TenantCategory instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed TenantCategory object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static TenantCategory fromString(String value) {
+        TenantCategory[] items = TenantCategory.values();
+        for (TenantCategory item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}

sdk/resources/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/resources/v2019_06_01/TenantIdDescription.java

@@ -12,16 +12,42 @@
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.resources.v2019_06_01.implementation.ResourcesManager;
 import com.microsoft.azure.management.resources.v2019_06_01.implementation.TenantIdDescriptionInner;
+import java.util.List;
 
 /**
  * Type representing TenantIdDescription.
  */
 public interface TenantIdDescription extends HasInner<TenantIdDescriptionInner>, HasManager<ResourcesManager> {
+    /**
+     * @return the country value.
+     */
+    String country();
+
+    /**
+     * @return the countryCode value.
+     */
+    String countryCode();
+
+    /**
+     * @return the displayName value.
+     */
+    String displayName();
+
+    /**
+     * @return the domains value.
+     */
+    List<String> domains();
+
     /**
      * @return the id value.
      */
     String id();
 
+    /**
+     * @return the tenantCategory value.
+     */
+    TenantCategory tenantCategory();
+
     /**
      * @return the tenantId value.
      */

sdk/resources/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/resources/v2019_06_01/implementation/TenantIdDescriptionImpl.java

@@ -10,6 +10,8 @@
 
 import com.microsoft.azure.management.resources.v2019_06_01.TenantIdDescription;
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.resources.v2019_06_01.TenantCategory;
 
 class TenantIdDescriptionImpl extends WrapperImpl<TenantIdDescriptionInner> implements TenantIdDescription {
     private final ResourcesManager manager;
@@ -23,11 +25,36 @@ public ResourcesManager manager() {
         return this.manager;
     }
 
+    @Override
+    public String country() {
+        return this.inner().country();
+    }
+
+    @Override
+    public String countryCode() {
+        return this.inner().countryCode();
+    }
+
+    @Override
+    public String displayName() {
+        return this.inner().displayName();
+    }
+
+    @Override
+    public List<String> domains() {
+        return this.inner().domains();
+    }
+
     @Override
     public String id() {
         return this.inner().id();
     }
 
+    @Override
+    public TenantCategory tenantCategory() {
+        return this.inner().tenantCategory();
+    }
+
     @Override
     public String tenantId() {
         return this.inner().tenantId();

sdk/resources/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/resources/v2019_06_01/implementation/TenantIdDescriptionInner.java

@@ -8,6 +8,8 @@
 
 package com.microsoft.azure.management.resources.v2019_06_01.implementation;
 
+import com.microsoft.azure.management.resources.v2019_06_01.TenantCategory;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -27,6 +29,37 @@ public class TenantIdDescriptionInner {
     @JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY)
     private String tenantId;
 
+    /**
+     * The tenant category. Possible values include: 'Home', 'ProjectedBy',
+     * 'ManagedBy'.
+     */
+    @JsonProperty(value = "tenantCategory", access = JsonProperty.Access.WRITE_ONLY)
+    private TenantCategory tenantCategory;
+
+    /**
+     * Country/region name of the address for the tenant.
+     */
+    @JsonProperty(value = "country", access = JsonProperty.Access.WRITE_ONLY)
+    private String country;
+
+    /**
+     * Country/region abbreviation for the tenant.
+     */
+    @JsonProperty(value = "countryCode", access = JsonProperty.Access.WRITE_ONLY)
+    private String countryCode;
+
+    /**
+     * The display name of the tenant.
+     */
+    @JsonProperty(value = "displayName", access = JsonProperty.Access.WRITE_ONLY)
+    private String displayName;
+
+    /**
+     * The list of domains for the tenant.
+     */
+    @JsonProperty(value = "domains", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> domains;
+
     /**
      * Get the fully qualified ID of the tenant. For example, /tenants/00000000-0000-0000-0000-000000000000.
      *
@@ -45,4 +78,49 @@ public String tenantId() {
         return this.tenantId;
     }
 
+    /**
+     * Get the tenant category. Possible values include: 'Home', 'ProjectedBy', 'ManagedBy'.
+     *
+     * @return the tenantCategory value
+     */
+    public TenantCategory tenantCategory() {
+        return this.tenantCategory;
+    }
+
+    /**
+     * Get country/region name of the address for the tenant.
+     *
+     * @return the country value
+     */
+    public String country() {
+        return this.country;
+    }
+
+    /**
+     * Get country/region abbreviation for the tenant.
+     *
+     * @return the countryCode value
+     */
+    public String countryCode() {
+        return this.countryCode;
+    }
+
+    /**
+     * Get the display name of the tenant.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Get the list of domains for the tenant.
+     *
+     * @return the domains value
+     */
+    public List<String> domains() {
+        return this.domains;
+    }
+
 }