Update from master

Author: SDK Automation

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.2</version>
-        <relativePath>../../parents/azure-arm-parent/pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-datafactory</artifactId>
-    <version>1.0.0-beta-3</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/AzureBlobFSLinkedService.java

@@ -57,6 +57,15 @@ public class AzureBlobFSLinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.tenant")
     private Object tenant;
 
+    /**
+     * Indicates the azure cloud type of the service principle auth. Allowed
+     * values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany.
+     * Default value is the data factory regions’ cloud type. Type: string (or
+     * Expression with resultType string).
+     */
+    @JsonProperty(value = "typeProperties.azureCloudType")
+    private Object azureCloudType;
+
     /**
      * The encrypted credential used for authentication. Credentials are
      * encrypted using the integration runtime credential manager. Type: string
@@ -165,6 +174,26 @@ public AzureBlobFSLinkedService withTenant(Object tenant) {
         return this;
     }
 
+    /**
+     * Get indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @return the azureCloudType value
+     */
+    public Object azureCloudType() {
+        return this.azureCloudType;
+    }
+
+    /**
+     * Set indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @param azureCloudType the azureCloudType value to set
+     * @return the AzureBlobFSLinkedService object itself.
+     */
+    public AzureBlobFSLinkedService withAzureCloudType(Object azureCloudType) {
+        this.azureCloudType = azureCloudType;
+        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).
      *

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

@@ -77,6 +77,15 @@ public class AzureBlobStorageLinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.tenant")
     private Object tenant;
 
+    /**
+     * Indicates the azure cloud type of the service principle auth. Allowed
+     * values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany.
+     * Default value is the data factory regions’ cloud type. Type: string (or
+     * Expression with resultType string).
+     */
+    @JsonProperty(value = "typeProperties.azureCloudType")
+    private Object azureCloudType;
+
     /**
      * The encrypted credential used for authentication. Credentials are
      * encrypted using the integration runtime credential manager. Type: string
@@ -245,6 +254,26 @@ public AzureBlobStorageLinkedService withTenant(Object tenant) {
         return this;
     }
 
+    /**
+     * Get indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @return the azureCloudType value
+     */
+    public Object azureCloudType() {
+        return this.azureCloudType;
+    }
+
+    /**
+     * Set indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @param azureCloudType the azureCloudType value to set
+     * @return the AzureBlobStorageLinkedService object itself.
+     */
+    public AzureBlobStorageLinkedService withAzureCloudType(Object azureCloudType) {
+        this.azureCloudType = azureCloudType;
+        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).
      *

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

@@ -49,6 +49,15 @@ public class AzureDataLakeStoreLinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.tenant")
     private Object tenant;
 
+    /**
+     * Indicates the azure cloud type of the service principle auth. Allowed
+     * values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany.
+     * Default value is the data factory regions’ cloud type. Type: string (or
+     * Expression with resultType string).
+     */
+    @JsonProperty(value = "typeProperties.azureCloudType")
+    private Object azureCloudType;
+
     /**
      * Data Lake Store account name. Type: string (or Expression with
      * resultType string).
@@ -158,6 +167,26 @@ public AzureDataLakeStoreLinkedService withTenant(Object tenant) {
         return this;
     }
 
+    /**
+     * Get indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @return the azureCloudType value
+     */
+    public Object azureCloudType() {
+        return this.azureCloudType;
+    }
+
+    /**
+     * Set indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @param azureCloudType the azureCloudType value to set
+     * @return the AzureDataLakeStoreLinkedService object itself.
+     */
+    public AzureDataLakeStoreLinkedService withAzureCloudType(Object azureCloudType) {
+        this.azureCloudType = azureCloudType;
+        return this;
+    }
+
     /**
      * Get data Lake Store account name. 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

@@ -76,6 +76,13 @@ public class AzureFileStorageLinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.fileShare")
     private Object fileShare;
 
+    /**
+     * The azure file share snapshot version. Type: string (or Expression with
+     * resultType string).
+     */
+    @JsonProperty(value = "typeProperties.snapshot")
+    private Object snapshot;
+
     /**
      * The encrypted credential used for authentication. Credentials are
      * encrypted using the integration runtime credential manager. Type: string
@@ -244,6 +251,26 @@ public AzureFileStorageLinkedService withFileShare(Object fileShare) {
         return this;
     }
 
+    /**
+     * Get the azure file share snapshot version. Type: string (or Expression with resultType string).
+     *
+     * @return the snapshot value
+     */
+    public Object snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * Set the azure file share snapshot version. Type: string (or Expression with resultType string).
+     *
+     * @param snapshot the snapshot value to set
+     * @return the AzureFileStorageLinkedService object itself.
+     */
+    public AzureFileStorageLinkedService withSnapshot(Object snapshot) {
+        this.snapshot = snapshot;
+        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).
      *

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

@@ -56,6 +56,15 @@ public class AzureSqlDWLinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.tenant")
     private Object tenant;
 
+    /**
+     * Indicates the azure cloud type of the service principle auth. Allowed
+     * values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany.
+     * Default value is the data factory regions’ cloud type. Type: string (or
+     * Expression with resultType string).
+     */
+    @JsonProperty(value = "typeProperties.azureCloudType")
+    private Object azureCloudType;
+
     /**
      * The encrypted credential used for authentication. Credentials are
      * encrypted using the integration runtime credential manager. Type: string
@@ -164,6 +173,26 @@ public AzureSqlDWLinkedService withTenant(Object tenant) {
         return this;
     }
 
+    /**
+     * Get indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @return the azureCloudType value
+     */
+    public Object azureCloudType() {
+        return this.azureCloudType;
+    }
+
+    /**
+     * Set indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @param azureCloudType the azureCloudType value to set
+     * @return the AzureSqlDWLinkedService object itself.
+     */
+    public AzureSqlDWLinkedService withAzureCloudType(Object azureCloudType) {
+        this.azureCloudType = azureCloudType;
+        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).
      *

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

@@ -55,6 +55,15 @@ public class AzureSqlDatabaseLinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.tenant")
     private Object tenant;
 
+    /**
+     * Indicates the azure cloud type of the service principle auth. Allowed
+     * values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany.
+     * Default value is the data factory regions’ cloud type. Type: string (or
+     * Expression with resultType string).
+     */
+    @JsonProperty(value = "typeProperties.azureCloudType")
+    private Object azureCloudType;
+
     /**
      * The encrypted credential used for authentication. Credentials are
      * encrypted using the integration runtime credential manager. Type: string
@@ -163,6 +172,26 @@ public AzureSqlDatabaseLinkedService withTenant(Object tenant) {
         return this;
     }
 
+    /**
+     * Get indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @return the azureCloudType value
+     */
+    public Object azureCloudType() {
+        return this.azureCloudType;
+    }
+
+    /**
+     * Set indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @param azureCloudType the azureCloudType value to set
+     * @return the AzureSqlDatabaseLinkedService object itself.
+     */
+    public AzureSqlDatabaseLinkedService withAzureCloudType(Object azureCloudType) {
+        this.azureCloudType = azureCloudType;
+        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).
      *

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

@@ -55,6 +55,15 @@ public class AzureSqlMILinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.tenant")
     private Object tenant;
 
+    /**
+     * Indicates the azure cloud type of the service principle auth. Allowed
+     * values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany.
+     * Default value is the data factory regions’ cloud type. Type: string (or
+     * Expression with resultType string).
+     */
+    @JsonProperty(value = "typeProperties.azureCloudType")
+    private Object azureCloudType;
+
     /**
      * The encrypted credential used for authentication. Credentials are
      * encrypted using the integration runtime credential manager. Type: string
@@ -163,6 +172,26 @@ public AzureSqlMILinkedService withTenant(Object tenant) {
         return this;
     }
 
+    /**
+     * Get indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @return the azureCloudType value
+     */
+    public Object azureCloudType() {
+        return this.azureCloudType;
+    }
+
+    /**
+     * Set indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string).
+     *
+     * @param azureCloudType the azureCloudType value to set
+     * @return the AzureSqlMILinkedService object itself.
+     */
+    public AzureSqlMILinkedService withAzureCloudType(Object azureCloudType) {
+        this.azureCloudType = azureCloudType;
+        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).
      *

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

@@ -32,6 +32,12 @@ public class DataFlowSink extends Transformation {
     @JsonProperty(value = "schemaLinkedService")
     private LinkedServiceReference schemaLinkedService;
 
+    /**
+     * Staging info for execute data flow activity.
+     */
+    @JsonProperty(value = "staging")
+    private DataFlowStagingInfo staging;
+
     /**
      * Get dataset reference.
      *
@@ -92,4 +98,24 @@ public DataFlowSink withSchemaLinkedService(LinkedServiceReference schemaLinkedS
         return this;
     }
 
+    /**
+     * Get staging info for execute data flow activity.
+     *
+     * @return the staging value
+     */
+    public DataFlowStagingInfo staging() {
+        return this.staging;
+    }
+
+    /**
+     * Set staging info for execute data flow activity.
+     *
+     * @param staging the staging value to set
+     * @return the DataFlowSink object itself.
+     */
+    public DataFlowSink withStaging(DataFlowStagingInfo staging) {
+        this.staging = staging;
+        return this;
+    }
+
 }

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

@@ -32,6 +32,12 @@ public class DataFlowSource extends Transformation {
     @JsonProperty(value = "schemaLinkedService")
     private LinkedServiceReference schemaLinkedService;
 
+    /**
+     * Staging info for execute data flow activity.
+     */
+    @JsonProperty(value = "staging")
+    private DataFlowStagingInfo staging;
+
     /**
      * Get dataset reference.
      *
@@ -92,4 +98,24 @@ public DataFlowSource withSchemaLinkedService(LinkedServiceReference schemaLinke
         return this;
     }
 
+    /**
+     * Get staging info for execute data flow activity.
+     *
+     * @return the staging value
+     */
+    public DataFlowStagingInfo staging() {
+        return this.staging;
+    }
+
+    /**
+     * Set staging info for execute data flow activity.
+     *
+     * @param staging the staging value to set
+     * @return the DataFlowSource object itself.
+     */
+    public DataFlowSource withStaging(DataFlowStagingInfo staging) {
+        this.staging = staging;
+        return this;
+    }
+
 }