Generated from 0685b742be63183ba8ac12ae7890938af436ad6d

Merge remote-tracking branch 'upstream/master' into kantao/GlobalParametersAndWaitActivityParameterUpdate

sdk/datafactory/mgmt-v2018_06_01/pom.xml

@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.3.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-datafactory</artifactId>
-    <version>1.0.0-beta-1</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for DataFactory Management</name>
     <description>This package contains Microsoft DataFactory Management SDK.</description>

sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/AmazonS3ReadSettings.java

@@ -60,6 +60,13 @@ public class AmazonS3ReadSettings extends StoreReadSettings {
     @JsonProperty(value = "enablePartitionDiscovery")
     private Boolean enablePartitionDiscovery;
 
+    /**
+     * Specify the root path where partition discovery starts from. Type:
+     * string (or Expression with resultType string).
+     */
+    @JsonProperty(value = "partitionRootPath")
+    private Object partitionRootPath;
+
     /**
      * The start of file's modified datetime. Type: string (or Expression with
      * resultType string).
@@ -194,6 +201,26 @@ public AmazonS3ReadSettings withEnablePartitionDiscovery(Boolean enablePartition
         return this;
     }
 
+    /**
+     * Get specify the root path where partition discovery starts from. Type: string (or Expression with resultType string).
+     *
+     * @return the partitionRootPath value
+     */
+    public Object partitionRootPath() {
+        return this.partitionRootPath;
+    }
+
+    /**
+     * Set specify the root path where partition discovery starts from. Type: string (or Expression with resultType string).
+     *
+     * @param partitionRootPath the partitionRootPath value to set
+     * @return the AmazonS3ReadSettings object itself.
+     */
+    public AmazonS3ReadSettings withPartitionRootPath(Object partitionRootPath) {
+        this.partitionRootPath = partitionRootPath;
+        return this;
+    }
+
     /**
      * Get the start of file's modified datetime. Type: string (or Expression with resultType string).
      *

sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/AzureBlobFSReadSettings.java

@@ -53,6 +53,13 @@ public class AzureBlobFSReadSettings extends StoreReadSettings {
     @JsonProperty(value = "enablePartitionDiscovery")
     private Boolean enablePartitionDiscovery;
 
+    /**
+     * Specify the root path where partition discovery starts from. Type:
+     * string (or Expression with resultType string).
+     */
+    @JsonProperty(value = "partitionRootPath")
+    private Object partitionRootPath;
+
     /**
      * The start of file's modified datetime. Type: string (or Expression with
      * resultType string).
@@ -167,6 +174,26 @@ public AzureBlobFSReadSettings withEnablePartitionDiscovery(Boolean enablePartit
         return this;
     }
 
+    /**
+     * Get specify the root path where partition discovery starts from. Type: string (or Expression with resultType string).
+     *
+     * @return the partitionRootPath value
+     */
+    public Object partitionRootPath() {
+        return this.partitionRootPath;
+    }
+
+    /**
+     * Set specify the root path where partition discovery starts from. Type: string (or Expression with resultType string).
+     *
+     * @param partitionRootPath the partitionRootPath value to set
+     * @return the AzureBlobFSReadSettings object itself.
+     */
+    public AzureBlobFSReadSettings withPartitionRootPath(Object partitionRootPath) {
+        this.partitionRootPath = partitionRootPath;
+        return this;
+    }
+
     /**
      * Get the start of file's modified datetime. Type: string (or Expression with resultType string).
      *

sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/AzureBlobStorageReadSettings.java

@@ -60,6 +60,13 @@ public class AzureBlobStorageReadSettings extends StoreReadSettings {
     @JsonProperty(value = "enablePartitionDiscovery")
     private Boolean enablePartitionDiscovery;
 
+    /**
+     * Specify the root path where partition discovery starts from. Type:
+     * string (or Expression with resultType string).
+     */
+    @JsonProperty(value = "partitionRootPath")
+    private Object partitionRootPath;
+
     /**
      * The start of file's modified datetime. Type: string (or Expression with
      * resultType string).
@@ -194,6 +201,26 @@ public AzureBlobStorageReadSettings withEnablePartitionDiscovery(Boolean enableP
         return this;
     }
 
+    /**
+     * Get specify the root path where partition discovery starts from. Type: string (or Expression with resultType string).
+     *
+     * @return the partitionRootPath value
+     */
+    public Object partitionRootPath() {
+        return this.partitionRootPath;
+    }
+
+    /**
+     * Set specify the root path where partition discovery starts from. Type: string (or Expression with resultType string).
+     *
+     * @param partitionRootPath the partitionRootPath value to set
+     * @return the AzureBlobStorageReadSettings object itself.
+     */
+    public AzureBlobStorageReadSettings withPartitionRootPath(Object partitionRootPath) {
+        this.partitionRootPath = partitionRootPath;
+        return this;
+    }
+
     /**
      * Get the start of file's modified datetime. Type: string (or Expression with resultType string).
      *

sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/AzureDataLakeStoreReadSettings.java

@@ -53,6 +53,13 @@ public class AzureDataLakeStoreReadSettings extends StoreReadSettings {
     @JsonProperty(value = "enablePartitionDiscovery")
     private Boolean enablePartitionDiscovery;
 
+    /**
+     * Specify the root path where partition discovery starts from. Type:
+     * string (or Expression with resultType string).
+     */
+    @JsonProperty(value = "partitionRootPath")
+    private Object partitionRootPath;
+
     /**
      * The start of file's modified datetime. Type: string (or Expression with
      * resultType string).
@@ -167,6 +174,26 @@ public AzureDataLakeStoreReadSettings withEnablePartitionDiscovery(Boolean enabl
         return this;
     }
 
+    /**
+     * Get specify the root path where partition discovery starts from. Type: string (or Expression with resultType string).
+     *
+     * @return the partitionRootPath value
+     */
+    public Object partitionRootPath() {
+        return this.partitionRootPath;
+    }
+
+    /**
+     * Set specify the root path where partition discovery starts from. Type: string (or Expression with resultType string).
+     *
+     * @param partitionRootPath the partitionRootPath value to set
+     * @return the AzureDataLakeStoreReadSettings object itself.
+     */
+    public AzureDataLakeStoreReadSettings withPartitionRootPath(Object partitionRootPath) {
+        this.partitionRootPath = partitionRootPath;
+        return this;
+    }
+
     /**
      * Get the start of file's modified datetime. Type: string (or Expression with resultType string).
      *

sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/AzureFileStorageLinkedService.java

@@ -25,7 +25,7 @@ public class AzureFileStorageLinkedService extends LinkedServiceInner {
      * Host name of the server. Type: string (or Expression with resultType
      * string).
      */
-    @JsonProperty(value = "typeProperties.host", required = true)
+    @JsonProperty(value = "typeProperties.host")
     private Object host;
 
     /**
@@ -41,6 +41,41 @@ public class AzureFileStorageLinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.password")
     private SecretBase password;
 
+    /**
+     * The connection string. It is mutually exclusive with sasUri property.
+     * Type: string, SecureString or AzureKeyVaultSecretReference.
+     */
+    @JsonProperty(value = "typeProperties.connectionString")
+    private Object connectionString;
+
+    /**
+     * The Azure key vault secret reference of accountKey in connection string.
+     */
+    @JsonProperty(value = "typeProperties.accountKey")
+    private AzureKeyVaultSecretReference accountKey;
+
+    /**
+     * SAS URI of the Azure File resource. It is mutually exclusive with
+     * connectionString property. Type: string, SecureString or
+     * AzureKeyVaultSecretReference.
+     */
+    @JsonProperty(value = "typeProperties.sasUri")
+    private Object sasUri;
+
+    /**
+     * The Azure key vault secret reference of sasToken in sas uri.
+     */
+    @JsonProperty(value = "typeProperties.sasToken")
+    private AzureKeyVaultSecretReference sasToken;
+
+    /**
+     * The azure file share name. It is required when auth with
+     * accountKey/sasToken. Type: string (or Expression with resultType
+     * string).
+     */
+    @JsonProperty(value = "typeProperties.fileShare")
+    private Object fileShare;
+
     /**
      * The encrypted credential used for authentication. Credentials are
      * encrypted using the integration runtime credential manager. Type: string
@@ -109,6 +144,106 @@ public AzureFileStorageLinkedService withPassword(SecretBase password) {
         return this;
     }
 
+    /**
+     * Get the connection string. It is mutually exclusive with sasUri property. Type: string, SecureString or AzureKeyVaultSecretReference.
+     *
+     * @return the connectionString value
+     */
+    public Object connectionString() {
+        return this.connectionString;
+    }
+
+    /**
+     * Set the connection string. It is mutually exclusive with sasUri property. Type: string, SecureString or AzureKeyVaultSecretReference.
+     *
+     * @param connectionString the connectionString value to set
+     * @return the AzureFileStorageLinkedService object itself.
+     */
+    public AzureFileStorageLinkedService withConnectionString(Object connectionString) {
+        this.connectionString = connectionString;
+        return this;
+    }
+
+    /**
+     * Get the Azure key vault secret reference of accountKey in connection string.
+     *
+     * @return the accountKey value
+     */
+    public AzureKeyVaultSecretReference accountKey() {
+        return this.accountKey;
+    }
+
+    /**
+     * Set the Azure key vault secret reference of accountKey in connection string.
+     *
+     * @param accountKey the accountKey value to set
+     * @return the AzureFileStorageLinkedService object itself.
+     */
+    public AzureFileStorageLinkedService withAccountKey(AzureKeyVaultSecretReference accountKey) {
+        this.accountKey = accountKey;
+        return this;
+    }
+
+    /**
+     * Get sAS URI of the Azure File resource. It is mutually exclusive with connectionString property. Type: string, SecureString or AzureKeyVaultSecretReference.
+     *
+     * @return the sasUri value
+     */
+    public Object sasUri() {
+        return this.sasUri;
+    }
+
+    /**
+     * Set sAS URI of the Azure File resource. It is mutually exclusive with connectionString property. Type: string, SecureString or AzureKeyVaultSecretReference.
+     *
+     * @param sasUri the sasUri value to set
+     * @return the AzureFileStorageLinkedService object itself.
+     */
+    public AzureFileStorageLinkedService withSasUri(Object sasUri) {
+        this.sasUri = sasUri;
+        return this;
+    }
+
+    /**
+     * Get the Azure key vault secret reference of sasToken in sas uri.
+     *
+     * @return the sasToken value
+     */
+    public AzureKeyVaultSecretReference sasToken() {
+        return this.sasToken;
+    }
+
+    /**
+     * Set the Azure key vault secret reference of sasToken in sas uri.
+     *
+     * @param sasToken the sasToken value to set
+     * @return the AzureFileStorageLinkedService object itself.
+     */
+    public AzureFileStorageLinkedService withSasToken(AzureKeyVaultSecretReference sasToken) {
+        this.sasToken = sasToken;
+        return this;
+    }
+
+    /**
+     * Get the azure file share name. It is required when auth with accountKey/sasToken. Type: string (or Expression with resultType string).
+     *
+     * @return the fileShare value
+     */
+    public Object fileShare() {
+        return this.fileShare;
+    }
+
+    /**
+     * Set the azure file share name. It is required when auth with accountKey/sasToken. Type: string (or Expression with resultType string).
+     *
+     * @param fileShare the fileShare value to set
+     * @return the AzureFileStorageLinkedService object itself.
+     */
+    public AzureFileStorageLinkedService withFileShare(Object fileShare) {
+        this.fileShare = fileShare;
+        return this;
+    }
+
     /**
      * Get the encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).
      *