[AutoPR mgmt-v2018_06_01] Change PartitionOption to object

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-5</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/AmazonS3LinkedService.java

@@ -21,6 +21,14 @@
 @JsonTypeName("AmazonS3")
 @JsonFlatten
 public class AmazonS3LinkedService extends LinkedServiceInner {
+    /**
+     * The authentication type of S3. Allowed value: AccessKey (default) or
+     * TemporarySecurityCredentials. Type: string (or Expression with
+     * resultType string).
+     */
+    @JsonProperty(value = "typeProperties.authenticationType")
+    private Object authenticationType;
+
     /**
      * The access key identifier of the Amazon S3 Identity and Access
      * Management (IAM) user. Type: string (or Expression with resultType
@@ -45,6 +53,12 @@ public class AmazonS3LinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.serviceUrl")
     private Object serviceUrl;
 
+    /**
+     * The session token for the S3 temporary security credential.
+     */
+    @JsonProperty(value = "typeProperties.sessionToken")
+    private SecretBase sessionToken;
+
     /**
      * The encrypted credential used for authentication. Credentials are
      * encrypted using the integration runtime credential manager. Type: string
@@ -53,6 +67,26 @@ public class AmazonS3LinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.encryptedCredential")
     private Object encryptedCredential;
 
+    /**
+     * Get the authentication type of S3. Allowed value: AccessKey (default) or TemporarySecurityCredentials. Type: string (or Expression with resultType string).
+     *
+     * @return the authenticationType value
+     */
+    public Object authenticationType() {
+        return this.authenticationType;
+    }
+
+    /**
+     * Set the authentication type of S3. Allowed value: AccessKey (default) or TemporarySecurityCredentials. Type: string (or Expression with resultType string).
+     *
+     * @param authenticationType the authenticationType value to set
+     * @return the AmazonS3LinkedService object itself.
+     */
+    public AmazonS3LinkedService withAuthenticationType(Object authenticationType) {
+        this.authenticationType = authenticationType;
+        return this;
+    }
+
     /**
      * Get the access key identifier of the Amazon S3 Identity and Access Management (IAM) user. Type: string (or Expression with resultType string).
      *
@@ -113,6 +147,26 @@ public AmazonS3LinkedService withServiceUrl(Object serviceUrl) {
         return this;
     }
 
+    /**
+     * Get the session token for the S3 temporary security credential.
+     *
+     * @return the sessionToken value
+     */
+    public SecretBase sessionToken() {
+        return this.sessionToken;
+    }
+
+    /**
+     * Set the session token for the S3 temporary security credential.
+     *
+     * @param sessionToken the sessionToken value to set
+     * @return the AmazonS3LinkedService object itself.
+     */
+    public AmazonS3LinkedService withSessionToken(SecretBase sessionToken) {
+        this.sessionToken = sessionToken;
+        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/AzureSqlSource.java

@@ -48,11 +48,11 @@ public class AzureSqlSource extends TabularSource {
 
     /**
      * The partition mechanism that will be used for Sql read in parallel.
-     * Possible values include: 'None', 'PhysicalPartitionsOfTable',
-     * 'DynamicRange'.
+     * Possible values include: "None", "PhysicalPartitionsOfTable",
+     * "DynamicRange".
      */
     @JsonProperty(value = "partitionOption")
-    private SqlPartitionOption partitionOption;
+    private Object partitionOption;
 
     /**
      * The settings that will be leveraged for Sql source partitioning.
@@ -141,21 +141,21 @@ public AzureSqlSource withProduceAdditionalTypes(Object produceAdditionalTypes)
     }
 
     /**
-     * Get the partition mechanism that will be used for Sql read in parallel. Possible values include: 'None', 'PhysicalPartitionsOfTable', 'DynamicRange'.
+     * Get the partition mechanism that will be used for Sql read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "DynamicRange".
      *
      * @return the partitionOption value
      */
-    public SqlPartitionOption partitionOption() {
+    public Object partitionOption() {
         return this.partitionOption;
     }
 
     /**
-     * Set the partition mechanism that will be used for Sql read in parallel. Possible values include: 'None', 'PhysicalPartitionsOfTable', 'DynamicRange'.
+     * Set the partition mechanism that will be used for Sql read in parallel. Possible values include: "None", "PhysicalPartitionsOfTable", "DynamicRange".
      *
      * @param partitionOption the partitionOption value to set
      * @return the AzureSqlSource object itself.
      */
-    public AzureSqlSource withPartitionOption(SqlPartitionOption partitionOption) {
+    public AzureSqlSource withPartitionOption(Object partitionOption) {
         this.partitionOption = partitionOption;
         return this;
     }

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

@@ -21,6 +21,13 @@
 @JsonTypeName("Concur")
 @JsonFlatten
 public class ConcurLinkedService extends LinkedServiceInner {
+    /**
+     * Properties used to connect to Concur. It is mutually exclusive with any
+     * other properties in the linked service. Type: object.
+     */
+    @JsonProperty(value = "typeProperties.connectionProperties")
+    private Object connectionProperties;
+
     /**
      * Application client_id supplied by Concur App Management.
      */
@@ -70,6 +77,26 @@ public class ConcurLinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.encryptedCredential")
     private Object encryptedCredential;
 
+    /**
+     * Get properties used to connect to Concur. It is mutually exclusive with any other properties in the linked service. Type: object.
+     *
+     * @return the connectionProperties value
+     */
+    public Object connectionProperties() {
+        return this.connectionProperties;
+    }
+
+    /**
+     * Set properties used to connect to Concur. It is mutually exclusive with any other properties in the linked service. Type: object.
+     *
+     * @param connectionProperties the connectionProperties value to set
+     * @return the ConcurLinkedService object itself.
+     */
+    public ConcurLinkedService withConnectionProperties(Object connectionProperties) {
+        this.connectionProperties = connectionProperties;
+        return this;
+    }
+
     /**
      * Get application client_id supplied by Concur App Management.
      *

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

@@ -83,11 +83,18 @@ public class CopyActivity extends ExecutionActivity {
     private RedirectIncompatibleRowSettings redirectIncompatibleRowSettings;
 
     /**
-     * Log storage settings customer need to provide when enabling session log.
+     * (Deprecated. Please use LogSettings) Log storage settings customer need
+     * to provide when enabling session log.
      */
     @JsonProperty(value = "typeProperties.logStorageSettings")
     private LogStorageSettings logStorageSettings;
 
+    /**
+     * Log settings customer needs provide when enabling log.
+     */
+    @JsonProperty(value = "typeProperties.logSettings")
+    private LogSettings logSettings;
+
     /**
      * Preserve Rules.
      */
@@ -306,7 +313,7 @@ public CopyActivity withRedirectIncompatibleRowSettings(RedirectIncompatibleRowS
     }
 
     /**
-     * Get log storage settings customer need to provide when enabling session log.
+     * Get (Deprecated. Please use LogSettings) Log storage settings customer need to provide when enabling session log.
      *
      * @return the logStorageSettings value
      */
@@ -315,7 +322,7 @@ public LogStorageSettings logStorageSettings() {
     }
 
     /**
-     * Set log storage settings customer need to provide when enabling session log.
+     * Set (Deprecated. Please use LogSettings) Log storage settings customer need to provide when enabling session log.
      *
      * @param logStorageSettings the logStorageSettings value to set
      * @return the CopyActivity object itself.
@@ -325,6 +332,26 @@ public CopyActivity withLogStorageSettings(LogStorageSettings logStorageSettings
         return this;
     }
 
+    /**
+     * Get log settings customer needs provide when enabling log.
+     *
+     * @return the logSettings value
+     */
+    public LogSettings logSettings() {
+        return this.logSettings;
+    }
+
+    /**
+     * Set log settings customer needs provide when enabling log.
+     *
+     * @param logSettings the logSettings value to set
+     * @return the CopyActivity object itself.
+     */
+    public CopyActivity withLogSettings(LogSettings logSettings) {
+        this.logSettings = logSettings;
+        return this;
+    }
+
     /**
      * Get preserve Rules.
      *

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

@@ -0,0 +1,71 @@
+/**
+ * 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.datafactory.v2018_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Settings for copy activity log.
+ */
+public class CopyActivityLogSettings {
+    /**
+     * Gets or sets the log level, support: Info, Warning. Type: string (or
+     * Expression with resultType string).
+     */
+    @JsonProperty(value = "logLevel")
+    private Object logLevel;
+
+    /**
+     * Specifies whether to enable reliable logging. Type: boolean (or
+     * Expression with resultType boolean).
+     */
+    @JsonProperty(value = "enableReliableLogging")
+    private Object enableReliableLogging;
+
+    /**
+     * Get gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string).
+     *
+     * @return the logLevel value
+     */
+    public Object logLevel() {
+        return this.logLevel;
+    }
+
+    /**
+     * Set gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string).
+     *
+     * @param logLevel the logLevel value to set
+     * @return the CopyActivityLogSettings object itself.
+     */
+    public CopyActivityLogSettings withLogLevel(Object logLevel) {
+        this.logLevel = logLevel;
+        return this;
+    }
+
+    /**
+     * Get specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean).
+     *
+     * @return the enableReliableLogging value
+     */
+    public Object enableReliableLogging() {
+        return this.enableReliableLogging;
+    }
+
+    /**
+     * Set specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean).
+     *
+     * @param enableReliableLogging the enableReliableLogging value to set
+     * @return the CopyActivityLogSettings object itself.
+     */
+    public CopyActivityLogSettings withEnableReliableLogging(Object enableReliableLogging) {
+        this.enableReliableLogging = enableReliableLogging;
+        return this;
+    }
+
+}

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

@@ -16,54 +16,56 @@
 public class ExecuteDataFlowActivityTypePropertiesCompute {
     /**
      * Compute type of the cluster which will execute data flow job. Possible
-     * values include: 'General', 'MemoryOptimized', 'ComputeOptimized'.
+     * values include: 'General', 'MemoryOptimized', 'ComputeOptimized'. Type:
+     * string (or Expression with resultType string).
      */
     @JsonProperty(value = "computeType")
-    private DataFlowComputeType computeType;
+    private Object computeType;
 
     /**
      * Core count of the cluster which will execute data flow job. Supported
-     * values are: 8, 16, 32, 48, 80, 144 and 272.
+     * values are: 8, 16, 32, 48, 80, 144 and 272. Type: integer (or Expression
+     * with resultType integer).
      */
     @JsonProperty(value = "coreCount")
-    private Integer coreCount;
+    private Object coreCount;
 
     /**
-     * Get compute type of the cluster which will execute data flow job. Possible values include: 'General', 'MemoryOptimized', 'ComputeOptimized'.
+     * Get compute type of the cluster which will execute data flow job. Possible values include: 'General', 'MemoryOptimized', 'ComputeOptimized'. Type: string (or Expression with resultType string).
      *
      * @return the computeType value
      */
-    public DataFlowComputeType computeType() {
+    public Object computeType() {
         return this.computeType;
     }
 
     /**
-     * Set compute type of the cluster which will execute data flow job. Possible values include: 'General', 'MemoryOptimized', 'ComputeOptimized'.
+     * Set compute type of the cluster which will execute data flow job. Possible values include: 'General', 'MemoryOptimized', 'ComputeOptimized'. Type: string (or Expression with resultType string).
      *
      * @param computeType the computeType value to set
      * @return the ExecuteDataFlowActivityTypePropertiesCompute object itself.
      */
-    public ExecuteDataFlowActivityTypePropertiesCompute withComputeType(DataFlowComputeType computeType) {
+    public ExecuteDataFlowActivityTypePropertiesCompute withComputeType(Object computeType) {
         this.computeType = computeType;
         return this;
     }
 
     /**
-     * Get core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32, 48, 80, 144 and 272.
+     * Get core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32, 48, 80, 144 and 272. Type: integer (or Expression with resultType integer).
      *
      * @return the coreCount value
      */
-    public Integer coreCount() {
+    public Object coreCount() {
         return this.coreCount;
     }
 
     /**
-     * Set core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32, 48, 80, 144 and 272.
+     * Set core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32, 48, 80, 144 and 272. Type: integer (or Expression with resultType integer).
      *
      * @param coreCount the coreCount value to set
      * @return the ExecuteDataFlowActivityTypePropertiesCompute object itself.
      */
-    public ExecuteDataFlowActivityTypePropertiesCompute withCoreCount(Integer coreCount) {
+    public ExecuteDataFlowActivityTypePropertiesCompute withCoreCount(Object coreCount) {
         this.coreCount = coreCount;
         return this;
     }