[AutoPR Microsoft.Azure.Management.DataFactory] [Do Not Merge][Data Factory]Add property 'queryTimeout' for tabular sources

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs

@@ -457,6 +457,8 @@ private void Initialize()
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DatasetStorageFormat>("type"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<CopySource>("type"));
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<CopySource>("type"));
+            SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<StoreWriteSettings>("type"));
+            DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<StoreWriteSettings>("type"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<CopySink>("type"));
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<CopySink>("type"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<LinkedIntegrationRuntimeType>("authorizationType"));

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonMWSSource.cs

@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models
     /// <summary>
     /// A copy activity Amazon Marketplace Web Service source.
     /// </summary>
-    public partial class AmazonMWSSource : CopySource
+    public partial class AmazonMWSSource : TabularSource
     {
         /// <summary>
         /// Initializes a new instance of the AmazonMWSSource class.
@@ -41,10 +41,13 @@ public AmazonMWSSource()
         /// <param name="maxConcurrentConnections">The maximum concurrent
         /// connection count for the source data store. Type: integer (or
         /// Expression with resultType integer).</param>
+        /// <param name="queryTimeout">Query timeout. Type: string (or
+        /// Expression with resultType string), pattern:
+        /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).</param>
         /// <param name="query">A query to retrieve data from source. Type:
         /// string (or Expression with resultType string).</param>
-        public AmazonMWSSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object))
-            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections)
+        public AmazonMWSSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object))
+            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout)
         {
             Query = query;
             CustomInit();

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRedshiftSource.cs

@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models
     /// <summary>
     /// A copy activity source for Amazon Redshift Source.
     /// </summary>
-    public partial class AmazonRedshiftSource : CopySource
+    public partial class AmazonRedshiftSource : TabularSource
     {
         /// <summary>
         /// Initializes a new instance of the AmazonRedshiftSource class.
@@ -41,15 +41,18 @@ public AmazonRedshiftSource()
         /// <param name="maxConcurrentConnections">The maximum concurrent
         /// connection count for the source data store. Type: integer (or
         /// Expression with resultType integer).</param>
+        /// <param name="queryTimeout">Query timeout. Type: string (or
+        /// Expression with resultType string), pattern:
+        /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).</param>
         /// <param name="query">Database query. Type: string (or Expression
         /// with resultType string).</param>
         /// <param name="redshiftUnloadSettings">The Amazon S3 settings needed
         /// for the interim Amazon S3 when copying from Amazon Redshift with
         /// unload. With this, data from Amazon Redshift source will be
         /// unloaded into S3 first and then copied into the targeted sink from
         /// the interim S3.</param>
-        public AmazonRedshiftSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), RedshiftUnloadSettings redshiftUnloadSettings = default(RedshiftUnloadSettings))
-            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections)
+        public AmazonRedshiftSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object), RedshiftUnloadSettings redshiftUnloadSettings = default(RedshiftUnloadSettings))
+            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout)
         {
             Query = query;
             RedshiftUnloadSettings = redshiftUnloadSettings;

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroSink.cs

@@ -73,22 +73,5 @@ public AvroSink()
         [JsonProperty(PropertyName = "formatSettings")]
         public AvroWriteSettings FormatSettings { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="Rest.ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (StoreSettings != null)
-            {
-                StoreSettings.Validate();
-            }
-            if (FormatSettings != null)
-            {
-                FormatSettings.Validate();
-            }
-        }
     }
 }

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSWriteSettings.cs

@@ -10,6 +10,7 @@
 
 namespace Microsoft.Azure.Management.DataFactory.Models
 {
+    using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
@@ -30,17 +31,20 @@ public AzureBlobFSWriteSettings()
         /// <summary>
         /// Initializes a new instance of the AzureBlobFSWriteSettings class.
         /// </summary>
-        /// <param name="type">The write setting type.</param>
         /// <param name="additionalProperties">Unmatched properties from the
         /// message are deserialized this collection</param>
         /// <param name="maxConcurrentConnections">The maximum concurrent
         /// connection count for the source data store. Type: integer (or
         /// Expression with resultType integer).</param>
         /// <param name="copyBehavior">The type of copy behavior for copy
         /// sink.</param>
-        public AzureBlobFSWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
-            : base(type, additionalProperties, maxConcurrentConnections, copyBehavior)
+        /// <param name="blockSizeInMB">Indicates the block size(MB) when
+        /// writing data to blob. Type: integer (or Expression with resultType
+        /// integer).</param>
+        public AzureBlobFSWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object blockSizeInMB = default(object))
+            : base(additionalProperties, maxConcurrentConnections, copyBehavior)
         {
+            BlockSizeInMB = blockSizeInMB;
             CustomInit();
         }
 
@@ -50,14 +54,11 @@ public AzureBlobFSWriteSettings()
         partial void CustomInit();
 
         /// <summary>
-        /// Validate the object.
+        /// Gets or sets indicates the block size(MB) when writing data to
+        /// blob. Type: integer (or Expression with resultType integer).
         /// </summary>
-        /// <exception cref="Rest.ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public override void Validate()
-        {
-            base.Validate();
-        }
+        [JsonProperty(PropertyName = "blockSizeInMB")]
+        public object BlockSizeInMB { get; set; }
+
     }
 }

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageWriteSettings.cs

@@ -10,6 +10,7 @@
 
 namespace Microsoft.Azure.Management.DataFactory.Models
 {
+    using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
@@ -32,17 +33,20 @@ public AzureBlobStorageWriteSettings()
         /// Initializes a new instance of the AzureBlobStorageWriteSettings
         /// class.
         /// </summary>
-        /// <param name="type">The write setting type.</param>
         /// <param name="additionalProperties">Unmatched properties from the
         /// message are deserialized this collection</param>
         /// <param name="maxConcurrentConnections">The maximum concurrent
         /// connection count for the source data store. Type: integer (or
         /// Expression with resultType integer).</param>
         /// <param name="copyBehavior">The type of copy behavior for copy
         /// sink.</param>
-        public AzureBlobStorageWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
-            : base(type, additionalProperties, maxConcurrentConnections, copyBehavior)
+        /// <param name="blockSizeInMB">Indicates the block size(MB) when
+        /// writing data to blob. Type: integer (or Expression with resultType
+        /// integer).</param>
+        public AzureBlobStorageWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object blockSizeInMB = default(object))
+            : base(additionalProperties, maxConcurrentConnections, copyBehavior)
         {
+            BlockSizeInMB = blockSizeInMB;
             CustomInit();
         }
 
@@ -52,14 +56,11 @@ public AzureBlobStorageWriteSettings()
         partial void CustomInit();
 
         /// <summary>
-        /// Validate the object.
+        /// Gets or sets indicates the block size(MB) when writing data to
+        /// blob. Type: integer (or Expression with resultType integer).
         /// </summary>
-        /// <exception cref="Rest.ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public override void Validate()
-        {
-            base.Validate();
-        }
+        [JsonProperty(PropertyName = "blockSizeInMB")]
+        public object BlockSizeInMB { get; set; }
+
     }
 }

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs

@@ -32,16 +32,15 @@ public AzureDataLakeStoreWriteSettings()
         /// Initializes a new instance of the AzureDataLakeStoreWriteSettings
         /// class.
         /// </summary>
-        /// <param name="type">The write setting type.</param>
         /// <param name="additionalProperties">Unmatched properties from the
         /// message are deserialized this collection</param>
         /// <param name="maxConcurrentConnections">The maximum concurrent
         /// connection count for the source data store. Type: integer (or
         /// Expression with resultType integer).</param>
         /// <param name="copyBehavior">The type of copy behavior for copy
         /// sink.</param>
-        public AzureDataLakeStoreWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
-            : base(type, additionalProperties, maxConcurrentConnections, copyBehavior)
+        public AzureDataLakeStoreWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
+            : base(additionalProperties, maxConcurrentConnections, copyBehavior)
         {
             CustomInit();
         }
@@ -51,15 +50,5 @@ public AzureDataLakeStoreWriteSettings()
         /// </summary>
         partial void CustomInit();
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="Rest.ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public override void Validate()
-        {
-            base.Validate();
-        }
     }
 }

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMariaDBSource.cs

@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models
     /// <summary>
     /// A copy activity Azure MariaDB source.
     /// </summary>
-    public partial class AzureMariaDBSource : CopySource
+    public partial class AzureMariaDBSource : TabularSource
     {
         /// <summary>
         /// Initializes a new instance of the AzureMariaDBSource class.
@@ -41,10 +41,13 @@ public AzureMariaDBSource()
         /// <param name="maxConcurrentConnections">The maximum concurrent
         /// connection count for the source data store. Type: integer (or
         /// Expression with resultType integer).</param>
+        /// <param name="queryTimeout">Query timeout. Type: string (or
+        /// Expression with resultType string), pattern:
+        /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).</param>
         /// <param name="query">A query to retrieve data from source. Type:
         /// string (or Expression with resultType string).</param>
-        public AzureMariaDBSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object))
-            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections)
+        public AzureMariaDBSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object))
+            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout)
         {
             Query = query;
             CustomInit();

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMySqlSource.cs

@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models
     /// <summary>
     /// A copy activity Azure MySQL source.
     /// </summary>
-    public partial class AzureMySqlSource : CopySource
+    public partial class AzureMySqlSource : TabularSource
     {
         /// <summary>
         /// Initializes a new instance of the AzureMySqlSource class.
@@ -41,10 +41,13 @@ public AzureMySqlSource()
         /// <param name="maxConcurrentConnections">The maximum concurrent
         /// connection count for the source data store. Type: integer (or
         /// Expression with resultType integer).</param>
+        /// <param name="queryTimeout">Query timeout. Type: string (or
+        /// Expression with resultType string), pattern:
+        /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).</param>
         /// <param name="query">Database query. Type: string (or Expression
         /// with resultType string).</param>
-        public AzureMySqlSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object))
-            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections)
+        public AzureMySqlSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object))
+            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout)
         {
             Query = query;
             CustomInit();

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzurePostgreSqlSource.cs

@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models
     /// <summary>
     /// A copy activity Azure PostgreSQL source.
     /// </summary>
-    public partial class AzurePostgreSqlSource : CopySource
+    public partial class AzurePostgreSqlSource : TabularSource
     {
         /// <summary>
         /// Initializes a new instance of the AzurePostgreSqlSource class.
@@ -41,10 +41,13 @@ public AzurePostgreSqlSource()
         /// <param name="maxConcurrentConnections">The maximum concurrent
         /// connection count for the source data store. Type: integer (or
         /// Expression with resultType integer).</param>
+        /// <param name="queryTimeout">Query timeout. Type: string (or
+        /// Expression with resultType string), pattern:
+        /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).</param>
         /// <param name="query">A query to retrieve data from source. Type:
         /// string (or Expression with resultType string).</param>
-        public AzurePostgreSqlSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object))
-            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections)
+        public AzurePostgreSqlSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object))
+            : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout)
         {
             Query = query;
             CustomInit();