Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Data Factory]Add property prefix to Azure Blob source #9037

Merged
merged 5 commits into from
Dec 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ AutoRest installed successfully.
Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk
2019-12-06 06:36:05 UTC
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=C:\azure-sdk-for-net\sdk
2019-12-10 09:55:33 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: a6f20ec7547f17a355aafee2ec2ad7a4fa78412a
Commit: 84ab02cad8cb3d3c97118e989815dbe5c7d5b529
AutoRest information
Requested version: latest
Bootstrapper version: autorest@2.0.4407
Original file line number Diff line number Diff line change
Expand Up @@ -469,10 +469,18 @@ private void Initialize()
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DatasetCompression>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<DatasetStorageFormat>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DatasetStorageFormat>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<DatasetLocation>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DatasetLocation>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<StoreReadSettings>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<StoreReadSettings>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<FormatReadSettings>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<FormatReadSettings>("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<FormatWriteSettings>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<FormatWriteSettings>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<CopySink>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<CopySink>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<LinkedIntegrationRuntimeType>("authorizationType"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public AmazonS3Location()
/// <summary>
/// Initializes a new instance of the AmazonS3Location class.
/// </summary>
/// <param name="type">Type of dataset storage location.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="folderPath">Specify the folder path of dataset. Type:
Expand All @@ -42,8 +41,8 @@ public AmazonS3Location()
/// string (or Expression with resultType string)</param>
/// <param name="version">Specify the version of amazon S3. Type:
/// string (or Expression with resultType string).</param>
public AmazonS3Location(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object folderPath = default(object), object fileName = default(object), object bucketName = default(object), object version = default(object))
: base(type, additionalProperties, folderPath, fileName)
public AmazonS3Location(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object folderPath = default(object), object fileName = default(object), object bucketName = default(object), object version = default(object))
: base(additionalProperties, folderPath, fileName)
{
BucketName = bucketName;
Version = version;
Expand All @@ -69,15 +68,5 @@ public AmazonS3Location()
[JsonProperty(PropertyName = "version")]
public object Version { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public AmazonS3ReadSettings()
/// <summary>
/// Initializes a new instance of the AmazonS3ReadSettings class.
/// </summary>
/// <param name="type">The read setting type.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="maxConcurrentConnections">The maximum concurrent
Expand All @@ -54,8 +53,8 @@ public AmazonS3ReadSettings()
/// <param name="modifiedDatetimeEnd">The end of file's modified
/// datetime. Type: string (or Expression with resultType
/// string).</param>
public AmazonS3ReadSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object))
: base(type, additionalProperties, maxConcurrentConnections)
public AmazonS3ReadSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object))
: base(additionalProperties, maxConcurrentConnections)
{
Recursive = recursive;
WildcardFolderPath = wildcardFolderPath;
Expand Down Expand Up @@ -121,15 +120,5 @@ public AmazonS3ReadSettings()
[JsonProperty(PropertyName = "modifiedDatetimeEnd")]
public object ModifiedDatetimeEnd { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@ public override void Validate()
{
throw new ValidationException(ValidationRules.CannotBeNull, "Location");
}
if (Location != null)
{
Location.Validate();
}
if (AvroCompressionLevel > 9)
{
throw new ValidationException(ValidationRules.InclusiveMaximum, "AvroCompressionLevel", 9);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,5 @@ public AvroSource()
[JsonProperty(PropertyName = "storeSettings")]
public StoreReadSettings 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();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@ public AvroWriteSettings()
/// <summary>
/// Initializes a new instance of the AvroWriteSettings 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="recordName">Top level record name in write result,
/// which is required in AVRO spec.</param>
/// <param name="recordNamespace">Record namespace in the write
/// result.</param>
public AvroWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), string recordName = default(string), string recordNamespace = default(string))
: base(type, additionalProperties)
public AvroWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), string recordName = default(string), string recordNamespace = default(string))
: base(additionalProperties)
{
RecordName = recordName;
RecordNamespace = recordNamespace;
Expand All @@ -64,15 +63,5 @@ public AvroWriteSettings()
[JsonProperty(PropertyName = "recordNamespace")]
public string RecordNamespace { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public AzureBlobFSLocation()
/// <summary>
/// Initializes a new instance of the AzureBlobFSLocation class.
/// </summary>
/// <param name="type">Type of dataset storage location.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="folderPath">Specify the folder path of dataset. Type:
Expand All @@ -40,8 +39,8 @@ public AzureBlobFSLocation()
/// string (or Expression with resultType string).</param>
/// <param name="fileSystem">Specify the fileSystem of azure blobFS.
/// Type: string (or Expression with resultType string).</param>
public AzureBlobFSLocation(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object folderPath = default(object), object fileName = default(object), object fileSystem = default(object))
: base(type, additionalProperties, folderPath, fileName)
public AzureBlobFSLocation(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object folderPath = default(object), object fileName = default(object), object fileSystem = default(object))
: base(additionalProperties, folderPath, fileName)
{
FileSystem = fileSystem;
CustomInit();
Expand All @@ -59,15 +58,5 @@ public AzureBlobFSLocation()
[JsonProperty(PropertyName = "fileSystem")]
public object FileSystem { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public AzureBlobFSReadSettings()
/// <summary>
/// Initializes a new instance of the AzureBlobFSReadSettings class.
/// </summary>
/// <param name="type">The read setting type.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="maxConcurrentConnections">The maximum concurrent
Expand All @@ -52,8 +51,8 @@ public AzureBlobFSReadSettings()
/// <param name="modifiedDatetimeEnd">The end of file's modified
/// datetime. Type: string (or Expression with resultType
/// string).</param>
public AzureBlobFSReadSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object))
: base(type, additionalProperties, maxConcurrentConnections)
public AzureBlobFSReadSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object))
: base(additionalProperties, maxConcurrentConnections)
{
Recursive = recursive;
WildcardFolderPath = wildcardFolderPath;
Expand Down Expand Up @@ -111,15 +110,5 @@ public AzureBlobFSReadSettings()
[JsonProperty(PropertyName = "modifiedDatetimeEnd")]
public object ModifiedDatetimeEnd { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public AzureBlobStorageLocation()
/// <summary>
/// Initializes a new instance of the AzureBlobStorageLocation class.
/// </summary>
/// <param name="type">Type of dataset storage location.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="folderPath">Specify the folder path of dataset. Type:
Expand All @@ -40,8 +39,8 @@ public AzureBlobStorageLocation()
/// string (or Expression with resultType string).</param>
/// <param name="container">Specify the container of azure blob. Type:
/// string (or Expression with resultType string).</param>
public AzureBlobStorageLocation(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object folderPath = default(object), object fileName = default(object), object container = default(object))
: base(type, additionalProperties, folderPath, fileName)
public AzureBlobStorageLocation(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object folderPath = default(object), object fileName = default(object), object container = default(object))
: base(additionalProperties, folderPath, fileName)
{
Container = container;
CustomInit();
Expand All @@ -59,15 +58,5 @@ public AzureBlobStorageLocation()
[JsonProperty(PropertyName = "container")]
public object Container { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public AzureBlobStorageReadSettings()
/// Initializes a new instance of the AzureBlobStorageReadSettings
/// class.
/// </summary>
/// <param name="type">The read setting type.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="maxConcurrentConnections">The maximum concurrent
Expand All @@ -46,6 +45,8 @@ public AzureBlobStorageReadSettings()
/// Type: string (or Expression with resultType string).</param>
/// <param name="wildcardFileName">Azure blob wildcardFileName. Type:
/// string (or Expression with resultType string).</param>
/// <param name="prefix">The prefix filter for the Azure Blob name.
/// Type: string (or Expression with resultType string).</param>
/// <param name="enablePartitionDiscovery">Indicates whether to enable
/// partition discovery.</param>
/// <param name="modifiedDatetimeStart">The start of file's modified
Expand All @@ -54,12 +55,13 @@ public AzureBlobStorageReadSettings()
/// <param name="modifiedDatetimeEnd">The end of file's modified
/// datetime. Type: string (or Expression with resultType
/// string).</param>
public AzureBlobStorageReadSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object))
: base(type, additionalProperties, maxConcurrentConnections)
public AzureBlobStorageReadSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object))
: base(additionalProperties, maxConcurrentConnections)
{
Recursive = recursive;
WildcardFolderPath = wildcardFolderPath;
WildcardFileName = wildcardFileName;
Prefix = prefix;
EnablePartitionDiscovery = enablePartitionDiscovery;
ModifiedDatetimeStart = modifiedDatetimeStart;
ModifiedDatetimeEnd = modifiedDatetimeEnd;
Expand Down Expand Up @@ -93,6 +95,13 @@ public AzureBlobStorageReadSettings()
[JsonProperty(PropertyName = "wildcardFileName")]
public object WildcardFileName { get; set; }

/// <summary>
/// Gets or sets the prefix filter for the Azure Blob name. Type:
/// string (or Expression with resultType string).
/// </summary>
[JsonProperty(PropertyName = "prefix")]
public object Prefix { get; set; }

/// <summary>
/// Gets or sets indicates whether to enable partition discovery.
/// </summary>
Expand All @@ -113,15 +122,5 @@ public AzureBlobStorageReadSettings()
[JsonProperty(PropertyName = "modifiedDatetimeEnd")]
public object ModifiedDatetimeEnd { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Loading