From f94dabc3565d5d4aa37f1932590beb68868497e8 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 02:10:37 +0000 Subject: [PATCH] [AutoPR Microsoft.Azure.Management.DataFactory] [Datafactory] Add a new 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 --- .../Generated/DataFactoryManagementClient.cs | 2 -- .../src/Generated/Models/AvroSink.cs | 17 +++++++++++++ .../Models/AzureBlobFSWriteSettings.cs | 23 +++++++++--------- .../Models/AzureBlobStorageWriteSettings.cs | 23 +++++++++--------- .../Models/AzureDataLakeStoreWriteSettings.cs | 15 ++++++++++-- .../src/Generated/Models/BinarySink.cs | 13 ++++++++++ .../src/Generated/Models/DelimitedTextSink.cs | 4 ++++ .../Models/FileServerWriteSettings.cs | 15 ++++++++++-- .../src/Generated/Models/JsonSink.cs | 17 +++++++++++++ .../src/Generated/Models/Office365Source.cs | 18 ++++++++++++-- .../src/Generated/Models/ParquetSink.cs | 13 ++++++++++ .../Generated/Models/StoreWriteSettings.cs | 24 ++++++++++++++++++- 12 files changed, 151 insertions(+), 33 deletions(-) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs index e33e68d2d6aa9..9766686b44bad 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs @@ -457,8 +457,6 @@ private void Initialize() DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); - SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); - DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("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 index 971fe631c2e14..674850039188b 100644 --- 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; } + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (StoreSettings != null) + { + StoreSettings.Validate(); + } + if (FormatSettings != null) + { + FormatSettings.Validate(); + } + } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSWriteSettings.cs index a4190a133de4e..b80df367637ac 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSWriteSettings.cs +++ b/sdk/datafactory/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,6 +30,7 @@ public AzureBlobFSWriteSettings() /// /// Initializes a new instance of the AzureBlobFSWriteSettings class. /// + /// The write setting type. /// Unmatched properties from the /// message are deserialized this collection /// The maximum concurrent @@ -38,13 +38,9 @@ public AzureBlobFSWriteSettings() /// Expression with resultType integer). /// The type of copy behavior for copy /// sink. - /// Indicates the block size(MB) when - /// writing data to blob. Type: integer (or Expression with resultType - /// integer). - public AzureBlobFSWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object blockSizeInMB = default(object)) - : base(additionalProperties, maxConcurrentConnections, copyBehavior) + public AzureBlobFSWriteSettings(string type, IDictionary additionalProperties = default(IDictionary), 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(); /// - /// Gets or sets indicates the block size(MB) when writing data to - /// blob. Type: integer (or Expression with resultType integer). + /// Validate the object. /// - [JsonProperty(PropertyName = "blockSizeInMB")] - public object BlockSizeInMB { get; set; } - + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageWriteSettings.cs index 5abe50e082e20..b40c03973a83b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageWriteSettings.cs +++ b/sdk/datafactory/Microsoft.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,6 +32,7 @@ public AzureBlobStorageWriteSettings() /// Initializes a new instance of the AzureBlobStorageWriteSettings /// class. /// + /// The write setting type. /// Unmatched properties from the /// message are deserialized this collection /// The maximum concurrent @@ -40,13 +40,9 @@ public AzureBlobStorageWriteSettings() /// Expression with resultType integer). /// The type of copy behavior for copy /// sink. - /// Indicates the block size(MB) when - /// writing data to blob. Type: integer (or Expression with resultType - /// integer). - public AzureBlobStorageWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object blockSizeInMB = default(object)) - : base(additionalProperties, maxConcurrentConnections, copyBehavior) + public AzureBlobStorageWriteSettings(string type, IDictionary additionalProperties = default(IDictionary), 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(); /// - /// Gets or sets indicates the block size(MB) when writing data to - /// blob. Type: integer (or Expression with resultType integer). + /// Validate the object. /// - [JsonProperty(PropertyName = "blockSizeInMB")] - public object BlockSizeInMB { get; set; } - + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs index 6a3e6a6958a75..5d10b8f5583d6 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs @@ -32,6 +32,7 @@ public AzureDataLakeStoreWriteSettings() /// Initializes a new instance of the AzureDataLakeStoreWriteSettings /// class. /// + /// The write setting type. /// Unmatched properties from the /// message are deserialized this collection /// The maximum concurrent @@ -39,8 +40,8 @@ public AzureDataLakeStoreWriteSettings() /// Expression with resultType integer). /// The type of copy behavior for copy /// sink. - public AzureDataLakeStoreWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object)) - : base(additionalProperties, maxConcurrentConnections, copyBehavior) + public AzureDataLakeStoreWriteSettings(string type, IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object)) + : base(type, additionalProperties, maxConcurrentConnections, copyBehavior) { CustomInit(); } @@ -50,5 +51,15 @@ public AzureDataLakeStoreWriteSettings() /// partial void CustomInit(); + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + 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 index 5fec652f67054..ecfd2b0709156 100644 --- 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; } + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (StoreSettings != null) + { + StoreSettings.Validate(); + } + } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSink.cs index d6c268d8b94fd..48aa6c4a5e6de 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSink.cs @@ -81,6 +81,10 @@ public DelimitedTextSink() /// public virtual void Validate() { + if (StoreSettings != null) + { + StoreSettings.Validate(); + } if (FormatSettings != null) { FormatSettings.Validate(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerWriteSettings.cs index b89b89c40ba28..c7f5984e798de 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerWriteSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerWriteSettings.cs @@ -30,6 +30,7 @@ public FileServerWriteSettings() /// /// Initializes a new instance of the FileServerWriteSettings class. /// + /// The write setting type. /// Unmatched properties from the /// message are deserialized this collection /// The maximum concurrent @@ -37,8 +38,8 @@ public FileServerWriteSettings() /// Expression with resultType integer). /// The type of copy behavior for copy /// sink. - public FileServerWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object)) - : base(additionalProperties, maxConcurrentConnections, copyBehavior) + public FileServerWriteSettings(string type, IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object)) + : base(type, additionalProperties, maxConcurrentConnections, copyBehavior) { CustomInit(); } @@ -48,5 +49,15 @@ public FileServerWriteSettings() /// partial void CustomInit(); + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + 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 index 703c9718ea8c8..9017df04eaad5 100644 --- 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; } + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (StoreSettings != null) + { + StoreSettings.Validate(); + } + if (FormatSettings != null) + { + FormatSettings.Validate(); + } + } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Office365Source.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Office365Source.cs index 1116608ddbf4d..a76dbc6d10045 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Office365Source.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Office365Source.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// A copy activity source for an Office365 service. + /// A copy activity source for an Office 365 service. /// public partial class Office365Source : CopySource { @@ -55,7 +55,11 @@ public Office365Source() /// End time of the requested range for this /// dataset. Type: string (or Expression with resultType /// string). - public Office365Source(IDictionary additionalProperties = default(IDictionary), 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)) + /// 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" } ] + public Office365Source(IDictionary additionalProperties = default(IDictionary), 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; @@ -63,6 +67,7 @@ public Office365Source() DateFilterColumn = dateFilterColumn; StartTime = startTime; EndTime = endTime; + OutputColumns = outputColumns; CustomInit(); } @@ -108,5 +113,14 @@ public Office365Source() [JsonProperty(PropertyName = "endTime")] public object EndTime { get; set; } + /// + /// 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" + /// } ] + /// + [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 index 67b95379fe09b..73efe2afcdf0a 100644 --- 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; } + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (StoreSettings != null) + { + StoreSettings.Validate(); + } + } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/StoreWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/StoreWriteSettings.cs index 0346d5e0d099a..a2865e56f7764 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/StoreWriteSettings.cs +++ b/sdk/datafactory/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,6 +32,7 @@ public StoreWriteSettings() /// /// Initializes a new instance of the StoreWriteSettings class. /// + /// The write setting type. /// Unmatched properties from the /// message are deserialized this collection /// The maximum concurrent @@ -38,9 +40,10 @@ public StoreWriteSettings() /// Expression with resultType integer). /// The type of copy behavior for copy /// sink. - public StoreWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object)) + public StoreWriteSettings(string type, IDictionary additionalProperties = default(IDictionary), 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 AdditionalProperties { get; set; } + /// + /// Gets or sets the write setting type. + /// + [JsonProperty(PropertyName = "type")] + public string Type { get; set; } + /// /// 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; } + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Type == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Type"); + } + } } }