[AutoPR storage/resource-manager] [Do not merge] [SRP] Fix existing errors in Storage swagger

storage/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/AzureFilesIdentityBasedAuthentication.java

@@ -0,0 +1,44 @@
+/**
+ * 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.storage.v2019_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Settings for Azure Files identity based authentication.
+ */
+public class AzureFilesIdentityBasedAuthentication {
+    /**
+     * Indicates the directory service used. Possible values include: 'None',
+     * 'AADDS'.
+     */
+    @JsonProperty(value = "directoryServiceOptions", required = true)
+    private DirectoryServiceOptions directoryServiceOptions;
+
+    /**
+     * Get indicates the directory service used. Possible values include: 'None', 'AADDS'.
+     *
+     * @return the directoryServiceOptions value
+     */
+    public DirectoryServiceOptions directoryServiceOptions() {
+        return this.directoryServiceOptions;
+    }
+
+    /**
+     * Set indicates the directory service used. Possible values include: 'None', 'AADDS'.
+     *
+     * @param directoryServiceOptions the directoryServiceOptions value to set
+     * @return the AzureFilesIdentityBasedAuthentication object itself.
+     */
+    public AzureFilesIdentityBasedAuthentication withDirectoryServiceOptions(DirectoryServiceOptions directoryServiceOptions) {
+        this.directoryServiceOptions = directoryServiceOptions;
+        return this;
+    }
+
+}

storage/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/BlobContainers.java

@@ -38,7 +38,7 @@ public interface BlobContainers {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<ListContainerItems> listAsync(String resourceGroupName, String accountName);
+    Observable<ListContainerItem> listAsync(final String resourceGroupName, final String accountName);
 
     /**
      * Gets properties of a specified container.

storage/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/DirectoryServiceOptions.java

@@ -0,0 +1,41 @@
+/**
+ * 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.storage.v2019_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for DirectoryServiceOptions.
+ */
+public final class DirectoryServiceOptions extends ExpandableStringEnum<DirectoryServiceOptions> {
+    /** Static value None for DirectoryServiceOptions. */
+    public static final DirectoryServiceOptions NONE = fromString("None");
+
+    /** Static value AADDS for DirectoryServiceOptions. */
+    public static final DirectoryServiceOptions AADDS = fromString("AADDS");
+
+    /**
+     * Creates or finds a DirectoryServiceOptions from its string representation.
+     * @param name a name to look for
+     * @return the corresponding DirectoryServiceOptions
+     */
+    @JsonCreator
+    public static DirectoryServiceOptions fromString(String name) {
+        return fromString(name, DirectoryServiceOptions.class);
+    }
+
+    /**
+     * @return known DirectoryServiceOptions values
+     */
+    public static Collection<DirectoryServiceOptions> values() {
+        return values(DirectoryServiceOptions.class);
+    }
+}

storage/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/ListContainerItem.java

@@ -8,198 +8,85 @@
 
 package com.microsoft.azure.management.storage.v2019_04_01;
 
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.storage.v2019_04_01.implementation.StorageManager;
+import com.microsoft.azure.management.storage.v2019_04_01.implementation.ListContainerItemInner;
 import org.joda.time.DateTime;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.microsoft.rest.serializer.JsonFlatten;
 
 /**
- * The blob container properties be listed out.
+ * Type representing ListContainerItem.
  */
-@JsonFlatten
-public class ListContainerItem extends AzureEntityResource {
+public interface ListContainerItem extends HasInner<ListContainerItemInner>, HasManager<StorageManager> {
     /**
-     * Specifies whether data in the container may be accessed publicly and the
-     * level of access. Possible values include: 'Container', 'Blob', 'None'.
+     * @return the etag value.
      */
-    @JsonProperty(value = "properties.publicAccess")
-    private PublicAccess publicAccess;
+    String etag();
 
     /**
-     * Returns the date and time the container was last modified.
+     * @return the hasImmutabilityPolicy value.
      */
-    @JsonProperty(value = "properties.lastModifiedTime", access = JsonProperty.Access.WRITE_ONLY)
-    private DateTime lastModifiedTime;
+    Boolean hasImmutabilityPolicy();
 
     /**
-     * The lease status of the container. Possible values include: 'Locked',
-     * 'Unlocked'.
+     * @return the hasLegalHold value.
      */
-    @JsonProperty(value = "properties.leaseStatus", access = JsonProperty.Access.WRITE_ONLY)
-    private LeaseStatus leaseStatus;
+    Boolean hasLegalHold();
 
     /**
-     * Lease state of the container. Possible values include: 'Available',
-     * 'Leased', 'Expired', 'Breaking', 'Broken'.
+     * @return the id value.
      */
-    @JsonProperty(value = "properties.leaseState", access = JsonProperty.Access.WRITE_ONLY)
-    private LeaseState leaseState;
+    String id();
 
     /**
-     * Specifies whether the lease on a container is of infinite or fixed
-     * duration, only when the container is leased. Possible values include:
-     * 'Infinite', 'Fixed'.
+     * @return the immutabilityPolicy value.
      */
-    @JsonProperty(value = "properties.leaseDuration", access = JsonProperty.Access.WRITE_ONLY)
-    private LeaseDuration leaseDuration;
+    ImmutabilityPolicyProperties immutabilityPolicy();
 
     /**
-     * A name-value pair to associate with the container as metadata.
+     * @return the lastModifiedTime value.
      */
-    @JsonProperty(value = "properties.metadata")
-    private Map<String, String> metadata;
+    DateTime lastModifiedTime();
 
     /**
-     * The ImmutabilityPolicy property of the container.
+     * @return the leaseDuration value.
      */
-    @JsonProperty(value = "properties.immutabilityPolicy", access = JsonProperty.Access.WRITE_ONLY)
-    private ImmutabilityPolicyProperties immutabilityPolicy;
+    LeaseDuration leaseDuration();
 
     /**
-     * The LegalHold property of the container.
+     * @return the leaseState value.
      */
-    @JsonProperty(value = "properties.legalHold", access = JsonProperty.Access.WRITE_ONLY)
-    private LegalHoldProperties legalHold;
+    LeaseState leaseState();
 
     /**
-     * The hasLegalHold public property is set to true by SRP if there are at
-     * least one existing tag. The hasLegalHold public property is set to false
-     * by SRP if all existing legal hold tags are cleared out. There can be a
-     * maximum of 1000 blob containers with hasLegalHold=true for a given
-     * account.
+     * @return the leaseStatus value.
      */
-    @JsonProperty(value = "properties.hasLegalHold", access = JsonProperty.Access.WRITE_ONLY)
-    private Boolean hasLegalHold;
+    LeaseStatus leaseStatus();
 
     /**
-     * The hasImmutabilityPolicy public property is set to true by SRP if
-     * ImmutabilityPolicy has been created for this container. The
-     * hasImmutabilityPolicy public property is set to false by SRP if
-     * ImmutabilityPolicy has not been created for this container.
+     * @return the legalHold value.
      */
-    @JsonProperty(value = "properties.hasImmutabilityPolicy", access = JsonProperty.Access.WRITE_ONLY)
-    private Boolean hasImmutabilityPolicy;
+    LegalHoldProperties legalHold();
 
     /**
-     * Get specifies whether data in the container may be accessed publicly and the level of access. Possible values include: 'Container', 'Blob', 'None'.
-     *
-     * @return the publicAccess value
+     * @return the metadata value.
      */
-    public PublicAccess publicAccess() {
-        return this.publicAccess;
-    }
+    Map<String, String> metadata();
 
     /**
-     * Set specifies whether data in the container may be accessed publicly and the level of access. Possible values include: 'Container', 'Blob', 'None'.
-     *
-     * @param publicAccess the publicAccess value to set
-     * @return the ListContainerItem object itself.
+     * @return the name value.
      */
-    public ListContainerItem withPublicAccess(PublicAccess publicAccess) {
-        this.publicAccess = publicAccess;
-        return this;
-    }
+    String name();
 
     /**
-     * Get returns the date and time the container was last modified.
-     *
-     * @return the lastModifiedTime value
+     * @return the publicAccess value.
      */
-    public DateTime lastModifiedTime() {
-        return this.lastModifiedTime;
-    }
+    PublicAccess publicAccess();
 
     /**
-     * Get the lease status of the container. Possible values include: 'Locked', 'Unlocked'.
-     *
-     * @return the leaseStatus value
+     * @return the type value.
      */
-    public LeaseStatus leaseStatus() {
-        return this.leaseStatus;
-    }
-
-    /**
-     * Get lease state of the container. Possible values include: 'Available', 'Leased', 'Expired', 'Breaking', 'Broken'.
-     *
-     * @return the leaseState value
-     */
-    public LeaseState leaseState() {
-        return this.leaseState;
-    }
-
-    /**
-     * Get specifies whether the lease on a container is of infinite or fixed duration, only when the container is leased. Possible values include: 'Infinite', 'Fixed'.
-     *
-     * @return the leaseDuration value
-     */
-    public LeaseDuration leaseDuration() {
-        return this.leaseDuration;
-    }
-
-    /**
-     * Get a name-value pair to associate with the container as metadata.
-     *
-     * @return the metadata value
-     */
-    public Map<String, String> metadata() {
-        return this.metadata;
-    }
-
-    /**
-     * Set a name-value pair to associate with the container as metadata.
-     *
-     * @param metadata the metadata value to set
-     * @return the ListContainerItem object itself.
-     */
-    public ListContainerItem withMetadata(Map<String, String> metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    /**
-     * Get the ImmutabilityPolicy property of the container.
-     *
-     * @return the immutabilityPolicy value
-     */
-    public ImmutabilityPolicyProperties immutabilityPolicy() {
-        return this.immutabilityPolicy;
-    }
-
-    /**
-     * Get the LegalHold property of the container.
-     *
-     * @return the legalHold value
-     */
-    public LegalHoldProperties legalHold() {
-        return this.legalHold;
-    }
-
-    /**
-     * Get the hasLegalHold public property is set to true by SRP if there are at least one existing tag. The hasLegalHold public property is set to false by SRP if all existing legal hold tags are cleared out. There can be a maximum of 1000 blob containers with hasLegalHold=true for a given account.
-     *
-     * @return the hasLegalHold value
-     */
-    public Boolean hasLegalHold() {
-        return this.hasLegalHold;
-    }
-
-    /**
-     * Get the hasImmutabilityPolicy public property is set to true by SRP if ImmutabilityPolicy has been created for this container. The hasImmutabilityPolicy public property is set to false by SRP if ImmutabilityPolicy has not been created for this container.
-     *
-     * @return the hasImmutabilityPolicy value
-     */
-    public Boolean hasImmutabilityPolicy() {
-        return this.hasImmutabilityPolicy;
-    }
+    String type();
 
 }