[AutoPR Microsoft.Azure.Management.DataFactory] [Datafactory] Add a n…

…ew property in Office365 connector (#166) * Generated from cce264ba7c751076c58518d67e19b9e469832c0c (#136) Update ListLegacyPeerings.json * Generated from 92006e420d65cb70e4b93bc5850af575da4efb78 (#162) Mark "provisioningState" as read-only * [AutoPR Microsoft.Azure.Management.HealthcareApis] Move to stable version (#134) * Generated from cce264ba7c751076c58518d67e19b9e469832c0c (#136) Update ListLegacyPeerings.json * Generated from 98f6703f2854ce61a22c8ba99a243a3ecb85ec8c Updated the way we retrieve version parameter * [AutoPR Microsoft.Azure.Management.DataFactory] Chainingtrigger (#163) * Generated from cce264ba7c751076c58518d67e19b9e469832c0c (#136) Update ListLegacyPeerings.json * Generated from 92006e420d65cb70e4b93bc5850af575da4efb78 (#162) Mark "provisioningState" as read-only * Generated from 5e1bb35d5c3314d8f4fead76c3d69a2522be026b Update review comments * [AutoPR Microsoft.Azure.Management.EventHub] Eventhub: added NetworkRuleSets list API (#155) * Generated from cce264ba7c751076c58518d67e19b9e469832c0c (#136) Update ListLegacyPeerings.json * Generated from 92006e420d65cb70e4b93bc5850af575da4efb78 (#162) Mark "provisioningState" as read-only * Generated from 8bc2a7edfeebb1a6bb30abbbb03d08bf1f8a8dbc update * Generated from eb6cdadb1aa229489cd5d7108cf02ba799416f40 Resovle comments
test-repo-billy · Sep 4, 2019 · 0aff06c · 0aff06c
1 parent 5129357
commit 0aff06c
Show file tree

Hide file tree

Showing 12 changed files with 151 additions and 33 deletions.
diff --git a/...ctory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs b/...ctory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs
@@ -457,8 +457,6 @@ 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"));

diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroSink.cs
@@ -73,5 +73,22 @@ 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();
+            }
+        }
     }
 }
diff --git a/...y/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSWriteSettings.cs b/...y/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSWriteSettings.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.DataFactory.Models
 {
-    using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
@@ -31,20 +30,17 @@ 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>
-        /// <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)
+        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)
         {
-            BlockSizeInMB = blockSizeInMB;
             CustomInit();
         }
 
@@ -54,11 +50,14 @@ public AzureBlobFSWriteSettings()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets indicates the block size(MB) when writing data to
-        /// blob. Type: integer (or Expression with resultType integer).
+        /// Validate the object.
         /// </summary>
-        [JsonProperty(PropertyName = "blockSizeInMB")]
-        public object BlockSizeInMB { get; set; }
-
+        /// <exception cref="Rest.ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public override void Validate()
+        {
+            base.Validate();
+        }
     }
 }
diff --git a/...rosoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageWriteSettings.cs b/...rosoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageWriteSettings.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.DataFactory.Models
 {
-    using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
@@ -33,20 +32,17 @@ 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>
-        /// <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)
+        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)
         {
-            BlockSizeInMB = blockSizeInMB;
             CustomInit();
         }
 
@@ -56,11 +52,14 @@ public AzureBlobStorageWriteSettings()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets indicates the block size(MB) when writing data to
-        /// blob. Type: integer (or Expression with resultType integer).
+        /// Validate the object.
         /// </summary>
-        [JsonProperty(PropertyName = "blockSizeInMB")]
-        public object BlockSizeInMB { get; set; }
-
+        /// <exception cref="Rest.ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public override void Validate()
+        {
+            base.Validate();
+        }
     }
 }
diff --git a/...soft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs b/...soft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs
@@ -32,15 +32,16 @@ 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(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
-            : base(additionalProperties, maxConcurrentConnections, copyBehavior)
+        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)
         {
             CustomInit();
         }
@@ -50,5 +51,15 @@ 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();
+        }
     }
 }
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/BinarySink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/BinarySink.cs
@@ -65,5 +65,18 @@ public BinarySink()
         [JsonProperty(PropertyName = "storeSettings")]
         public StoreWriteSettings StoreSettings { 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();
+            }
+        }
     }
 }
diff --git a/...afactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSink.cs b/...afactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSink.cs
@@ -81,6 +81,10 @@ public DelimitedTextSink()
         /// </exception>
         public virtual void Validate()
         {
+            if (StoreSettings != null)
+            {
+                StoreSettings.Validate();
+            }
             if (FormatSettings != null)
             {
                 FormatSettings.Validate();

diff --git a/...ry/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerWriteSettings.cs b/...ry/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerWriteSettings.cs
@@ -30,15 +30,16 @@ public FileServerWriteSettings()
         /// <summary>
         /// Initializes a new instance of the FileServerWriteSettings 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 FileServerWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
-            : base(additionalProperties, maxConcurrentConnections, copyBehavior)
+        public FileServerWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
+            : base(type, additionalProperties, maxConcurrentConnections, copyBehavior)
         {
             CustomInit();
         }
@@ -48,5 +49,15 @@ public FileServerWriteSettings()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="Rest.ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public override void Validate()
+        {
+            base.Validate();
+        }
     }
 }
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonSink.cs
@@ -73,5 +73,22 @@ public JsonSink()
         [JsonProperty(PropertyName = "formatSettings")]
         public JsonWriteSettings 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();
+            }
+        }
     }
 }
diff --git a/...atafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Office365Source.cs b/...atafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Office365Source.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models
     using System.Linq;
 
     /// <summary>
-    /// A copy activity source for an Office365 service.
+    /// A copy activity source for an Office 365 service.
     /// </summary>
     public partial class Office365Source : CopySource
     {
@@ -55,14 +55,19 @@ public Office365Source()
         /// <param name="endTime">End time of the requested range for this
         /// dataset. Type: string (or Expression with resultType
         /// string).</param>
-        public Office365Source(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object allowedGroups = default(object), object userScopeFilterUri = default(object), object dateFilterColumn = default(object), object startTime = default(object), object endTime = default(object))
+        /// <param name="outputColumns">The columns to be read out from the
+        /// Office 365 table. Type: array of objects (or Expression with
+        /// resultType array of objects). Example: [ { "name": "Id" }, {
+        /// "name": "CreatedDateTime" } ]</param>
+        public Office365Source(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object allowedGroups = default(object), object userScopeFilterUri = default(object), object dateFilterColumn = default(object), object startTime = default(object), object endTime = default(object), object outputColumns = default(object))
             : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections)
         {
             AllowedGroups = allowedGroups;
             UserScopeFilterUri = userScopeFilterUri;
             DateFilterColumn = dateFilterColumn;
             StartTime = startTime;
             EndTime = endTime;
+            OutputColumns = outputColumns;
             CustomInit();
         }
 
@@ -108,5 +113,14 @@ public Office365Source()
         [JsonProperty(PropertyName = "endTime")]
         public object EndTime { get; set; }
 
+        /// <summary>
+        /// Gets or sets the columns to be read out from the Office 365 table.
+        /// Type: array of objects (or Expression with resultType array of
+        /// objects). Example: [ { "name": "Id" }, { "name": "CreatedDateTime"
+        /// } ]
+        /// </summary>
+        [JsonProperty(PropertyName = "outputColumns")]
+        public object OutputColumns { get; set; }
+
     }
 }
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSink.cs
@@ -65,5 +65,18 @@ public ParquetSink()
         [JsonProperty(PropertyName = "storeSettings")]
         public StoreWriteSettings StoreSettings { 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();
+            }
+        }
     }
 }
diff --git a/...factory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/StoreWriteSettings.cs b/...factory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/StoreWriteSettings.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Azure.Management.DataFactory.Models
 {
+    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
@@ -31,16 +32,18 @@ public StoreWriteSettings()
         /// <summary>
         /// Initializes a new instance of the StoreWriteSettings 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 StoreWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
+        public StoreWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
         {
             AdditionalProperties = additionalProperties;
+            Type = type;
             MaxConcurrentConnections = maxConcurrentConnections;
             CopyBehavior = copyBehavior;
             CustomInit();
@@ -58,6 +61,12 @@ public StoreWriteSettings()
         [JsonExtensionData]
         public IDictionary<string, object> AdditionalProperties { get; set; }
 
+        /// <summary>
+        /// Gets or sets the write setting type.
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+
         /// <summary>
         /// Gets or sets the maximum concurrent connection count for the source
         /// data store. Type: integer (or Expression with resultType integer).
@@ -71,5 +80,18 @@ public StoreWriteSettings()
         [JsonProperty(PropertyName = "copyBehavior")]
         public object CopyBehavior { get; set; }
 
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (Type == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "Type");
+            }
+        }
     }
 }