From f30acc91aed00706d91c42368fcf371232cc3a67 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 16 Jul 2019 06:19:13 +0000 Subject: [PATCH 1/2] Generated from d580034b3ab9269cae3f9755862608763f7e8f5a add type for binary type properties --- .../v2018_06_01/BinaryDataset.java | 76 +++++++++++++++++++ .../datafactoryv2/v2018_06_01/BinarySink.java | 47 ++++++++++++ .../v2018_06_01/BinarySource.java | 47 ++++++++++++ .../datafactoryv2/v2018_06_01/CopySink.java | 1 + .../datafactoryv2/v2018_06_01/CopySource.java | 1 + .../implementation/DatasetInner.java | 1 + 6 files changed, 173 insertions(+) create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinaryDataset.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinarySink.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinarySource.java diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinaryDataset.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinaryDataset.java new file mode 100644 index 000000000000..cc1a50f52a41 --- /dev/null +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinaryDataset.java @@ -0,0 +1,76 @@ +/** + * 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.datafactoryv2.v2018_06_01; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.management.datafactoryv2.v2018_06_01.implementation.DatasetInner; + +/** + * Binary dataset. + */ +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeName("Binary") +@JsonFlatten +public class BinaryDataset extends DatasetInner { + /** + * The location of the Binary storage. + */ + @JsonProperty(value = "typeProperties.location", required = true) + private DatasetLocation location; + + /** + * The data compression method used for the binary dataset. + */ + @JsonProperty(value = "typeProperties.compression") + private DatasetCompression compression; + + /** + * Get the location of the Binary storage. + * + * @return the location value + */ + public DatasetLocation location() { + return this.location; + } + + /** + * Set the location of the Binary storage. + * + * @param location the location value to set + * @return the BinaryDataset object itself. + */ + public BinaryDataset withLocation(DatasetLocation location) { + this.location = location; + return this; + } + + /** + * Get the data compression method used for the binary dataset. + * + * @return the compression value + */ + public DatasetCompression compression() { + return this.compression; + } + + /** + * Set the data compression method used for the binary dataset. + * + * @param compression the compression value to set + * @return the BinaryDataset object itself. + */ + public BinaryDataset withCompression(DatasetCompression compression) { + this.compression = compression; + return this; + } + +} diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinarySink.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinarySink.java new file mode 100644 index 000000000000..cb11f3e134d2 --- /dev/null +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinarySink.java @@ -0,0 +1,47 @@ +/** + * 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.datafactoryv2.v2018_06_01; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * A copy activity Binary sink. + */ +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeName("BinarySink") +public class BinarySink extends CopySink { + /** + * Binary store settings. + */ + @JsonProperty(value = "storeSettings") + private StoreReadSettings storeSettings; + + /** + * Get binary store settings. + * + * @return the storeSettings value + */ + public StoreReadSettings storeSettings() { + return this.storeSettings; + } + + /** + * Set binary store settings. + * + * @param storeSettings the storeSettings value to set + * @return the BinarySink object itself. + */ + public BinarySink withStoreSettings(StoreReadSettings storeSettings) { + this.storeSettings = storeSettings; + return this; + } + +} diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinarySource.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinarySource.java new file mode 100644 index 000000000000..1a0ce7eab0b1 --- /dev/null +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/BinarySource.java @@ -0,0 +1,47 @@ +/** + * 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.datafactoryv2.v2018_06_01; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * A copy activity Binary source. + */ +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeName("BinarySource") +public class BinarySource extends CopySource { + /** + * Binary store settings. + */ + @JsonProperty(value = "storeSettings") + private StoreReadSettings storeSettings; + + /** + * Get binary store settings. + * + * @return the storeSettings value + */ + public StoreReadSettings storeSettings() { + return this.storeSettings; + } + + /** + * Set binary store settings. + * + * @param storeSettings the storeSettings value to set + * @return the BinarySource object itself. + */ + public BinarySource withStoreSettings(StoreReadSettings storeSettings) { + this.storeSettings = storeSettings; + return this; + } + +} diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySink.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySink.java index 79a24adba9e5..2ea7dc3ad3c4 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySink.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySink.java @@ -39,6 +39,7 @@ @JsonSubTypes.Type(name = "DocumentDbCollectionSink", value = DocumentDbCollectionSink.class), @JsonSubTypes.Type(name = "FileSystemSink", value = FileSystemSink.class), @JsonSubTypes.Type(name = "BlobSink", value = BlobSink.class), + @JsonSubTypes.Type(name = "BinarySink", value = BinarySink.class), @JsonSubTypes.Type(name = "ParquetSink", value = ParquetSink.class), @JsonSubTypes.Type(name = "AzureTableSink", value = AzureTableSink.class), @JsonSubTypes.Type(name = "AzureQueueSink", value = AzureQueueSink.class), diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySource.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySource.java index a2be62544476..c7cee4e5dfe5 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySource.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySource.java @@ -87,6 +87,7 @@ @JsonSubTypes.Type(name = "DocumentDbCollectionSource", value = DocumentDbCollectionSource.class), @JsonSubTypes.Type(name = "BlobSource", value = BlobSource.class), @JsonSubTypes.Type(name = "AzureTableSource", value = AzureTableSource.class), + @JsonSubTypes.Type(name = "BinarySource", value = BinarySource.class), @JsonSubTypes.Type(name = "DelimitedTextSource", value = DelimitedTextSource.class), @JsonSubTypes.Type(name = "ParquetSource", value = ParquetSource.class) }) diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/DatasetInner.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/DatasetInner.java index 6c2d8ee3b425..c52b3d3ee5ad 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/DatasetInner.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/DatasetInner.java @@ -92,6 +92,7 @@ @JsonSubTypes.Type(name = "AzureSqlTable", value = AzureSqlTableDataset.class), @JsonSubTypes.Type(name = "AzureTable", value = AzureTableDataset.class), @JsonSubTypes.Type(name = "AzureBlob", value = AzureBlobDataset.class), + @JsonSubTypes.Type(name = "Binary", value = BinaryDataset.class), @JsonSubTypes.Type(name = "DelimitedText", value = DelimitedTextDataset.class), @JsonSubTypes.Type(name = "Parquet", value = ParquetDataset.class), @JsonSubTypes.Type(name = "AmazonS3Object", value = AmazonS3Dataset.class) From 0de8d769eb4bd483682cbb6b7c4f7df38e14519c Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 18 Jul 2019 17:29:54 +0000 Subject: [PATCH 2/2] Generated from d580034b3ab9269cae3f9755862608763f7e8f5a add type for binary type properties --- .../ExecuteSSISPackageActivity.java | 26 +++ .../SSISAccessCredential.java | 95 +++++++++ .../v2017_09_01_preview/SSISLogLocation.java | 134 +++++++++++++ .../SSISPackageLocation.java | 108 ++++++++++ .../SsisPackageLocationType.java | 41 ++++ .../datafactoryv2/v2018_06_01/CopySink.java | 3 + .../datafactoryv2/v2018_06_01/CopySource.java | 4 + .../ExecuteSSISPackageActivity.java | 26 +++ .../v2018_06_01/InformixLinkedService.java | 188 ++++++++++++++++++ .../v2018_06_01/InformixSink.java | 48 +++++ .../v2018_06_01/InformixSource.java | 47 +++++ .../v2018_06_01/InformixTableDataset.java | 51 +++++ .../MicrosoftAccessLinkedService.java | 188 ++++++++++++++++++ .../v2018_06_01/MicrosoftAccessSink.java | 48 +++++ .../v2018_06_01/MicrosoftAccessSource.java | 47 +++++ .../MicrosoftAccessTableDataset.java | 51 +++++ .../v2018_06_01/SSISAccessCredential.java | 95 +++++++++ .../v2018_06_01/SSISLogLocation.java | 134 +++++++++++++ .../v2018_06_01/SSISPackageLocation.java | 108 ++++++++++ .../SalesforceServiceCloudLinkedService.java | 188 ++++++++++++++++++ .../SalesforceServiceCloudObjectDataset.java | 51 +++++ .../SalesforceServiceCloudSink.java | 108 ++++++++++ .../SalesforceServiceCloudSource.java | 74 +++++++ .../v2018_06_01/SsisPackageLocationType.java | 41 ++++ .../v2018_06_01/TeradataLinkedService.java | 29 ++- .../v2018_06_01/TeradataPartitionOption.java | 44 ++++ .../TeradataPartitionSettings.java | 9 +- .../v2018_06_01/TeradataSource.java | 11 +- .../implementation/DatasetInner.java | 4 + .../implementation/LinkedServiceInner.java | 3 + 30 files changed, 1993 insertions(+), 11 deletions(-) create mode 100644 datafactoryv2/resource-manager/v2017_09_01_preview/src/main/java/com/microsoft/azure/management/datafactoryv2/v2017_09_01_preview/SSISAccessCredential.java create mode 100644 datafactoryv2/resource-manager/v2017_09_01_preview/src/main/java/com/microsoft/azure/management/datafactoryv2/v2017_09_01_preview/SSISLogLocation.java create mode 100644 datafactoryv2/resource-manager/v2017_09_01_preview/src/main/java/com/microsoft/azure/management/datafactoryv2/v2017_09_01_preview/SsisPackageLocationType.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/InformixLinkedService.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/InformixSink.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/InformixSource.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/InformixTableDataset.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/MicrosoftAccessLinkedService.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/MicrosoftAccessSink.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/MicrosoftAccessSource.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/MicrosoftAccessTableDataset.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/SSISAccessCredential.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/SSISLogLocation.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/SalesforceServiceCloudLinkedService.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/SalesforceServiceCloudObjectDataset.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/SalesforceServiceCloudSink.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/SalesforceServiceCloudSource.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/SsisPackageLocationType.java create mode 100644 datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataPartitionOption.java diff --git a/datafactoryv2/resource-manager/v2017_09_01_preview/src/main/java/com/microsoft/azure/management/datafactoryv2/v2017_09_01_preview/ExecuteSSISPackageActivity.java b/datafactoryv2/resource-manager/v2017_09_01_preview/src/main/java/com/microsoft/azure/management/datafactoryv2/v2017_09_01_preview/ExecuteSSISPackageActivity.java index e27d3f538640..26526919f63d 100644 --- a/datafactoryv2/resource-manager/v2017_09_01_preview/src/main/java/com/microsoft/azure/management/datafactoryv2/v2017_09_01_preview/ExecuteSSISPackageActivity.java +++ b/datafactoryv2/resource-manager/v2017_09_01_preview/src/main/java/com/microsoft/azure/management/datafactoryv2/v2017_09_01_preview/ExecuteSSISPackageActivity.java @@ -90,6 +90,12 @@ public class ExecuteSSISPackageActivity extends ExecutionActivity { @JsonProperty(value = "typeProperties.propertyOverrides") private Map propertyOverrides; + /** + * SSIS package execution log location. + */ + @JsonProperty(value = "typeProperties.logLocation") + private SSISLogLocation logLocation; + /** * Get sSIS package location. * @@ -310,4 +316,24 @@ public ExecuteSSISPackageActivity withPropertyOverrides(Map { + /** Static value SSISDB for SsisPackageLocationType. */ + public static final SsisPackageLocationType SSISDB = fromString("SSISDB"); + + /** Static value File for SsisPackageLocationType. */ + public static final SsisPackageLocationType FILE = fromString("File"); + + /** + * Creates or finds a SsisPackageLocationType from its string representation. + * @param name a name to look for + * @return the corresponding SsisPackageLocationType + */ + @JsonCreator + public static SsisPackageLocationType fromString(String name) { + return fromString(name, SsisPackageLocationType.class); + } + + /** + * @return known SsisPackageLocationType values + */ + public static Collection values() { + return values(SsisPackageLocationType.class); + } +} diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySink.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySink.java index 2ea7dc3ad3c4..c2db217b53ce 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySink.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySink.java @@ -21,11 +21,14 @@ @JsonTypeName("CopySink") @JsonSubTypes({ @JsonSubTypes.Type(name = "CosmosDbMongoDbApiSink", value = CosmosDbMongoDbApiSink.class), + @JsonSubTypes.Type(name = "SalesforceServiceCloudSink", value = SalesforceServiceCloudSink.class), @JsonSubTypes.Type(name = "SalesforceSink", value = SalesforceSink.class), @JsonSubTypes.Type(name = "AzureDataExplorerSink", value = AzureDataExplorerSink.class), @JsonSubTypes.Type(name = "CommonDataServiceForAppsSink", value = CommonDataServiceForAppsSink.class), @JsonSubTypes.Type(name = "DynamicsCrmSink", value = DynamicsCrmSink.class), @JsonSubTypes.Type(name = "DynamicsSink", value = DynamicsSink.class), + @JsonSubTypes.Type(name = "MicrosoftAccessSink", value = MicrosoftAccessSink.class), + @JsonSubTypes.Type(name = "InformixSink", value = InformixSink.class), @JsonSubTypes.Type(name = "OdbcSink", value = OdbcSink.class), @JsonSubTypes.Type(name = "AzureSearchIndexSink", value = AzureSearchIndexSink.class), @JsonSubTypes.Type(name = "AzureBlobFSSink", value = AzureBlobFSSink.class), diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySource.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySource.java index c7cee4e5dfe5..c9a310de3127 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySource.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/CopySource.java @@ -63,6 +63,7 @@ @JsonSubTypes.Type(name = "MongoDbSource", value = MongoDbSource.class), @JsonSubTypes.Type(name = "CassandraSource", value = CassandraSource.class), @JsonSubTypes.Type(name = "WebSource", value = WebSource.class), + @JsonSubTypes.Type(name = "TeradataSource", value = TeradataSource.class), @JsonSubTypes.Type(name = "OracleSource", value = OracleSource.class), @JsonSubTypes.Type(name = "AzureDataExplorerSource", value = AzureDataExplorerSource.class), @JsonSubTypes.Type(name = "AzureMySqlSource", value = AzureMySqlSource.class), @@ -79,7 +80,10 @@ @JsonSubTypes.Type(name = "SapHanaSource", value = SapHanaSource.class), @JsonSubTypes.Type(name = "SapEccSource", value = SapEccSource.class), @JsonSubTypes.Type(name = "SapCloudForCustomerSource", value = SapCloudForCustomerSource.class), + @JsonSubTypes.Type(name = "SalesforceServiceCloudSource", value = SalesforceServiceCloudSource.class), @JsonSubTypes.Type(name = "SalesforceSource", value = SalesforceSource.class), + @JsonSubTypes.Type(name = "MicrosoftAccessSource", value = MicrosoftAccessSource.class), + @JsonSubTypes.Type(name = "InformixSource", value = InformixSource.class), @JsonSubTypes.Type(name = "RelationalSource", value = RelationalSource.class), @JsonSubTypes.Type(name = "CommonDataServiceForAppsSource", value = CommonDataServiceForAppsSource.class), @JsonSubTypes.Type(name = "DynamicsCrmSource", value = DynamicsCrmSource.class), diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/ExecuteSSISPackageActivity.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/ExecuteSSISPackageActivity.java index c415a5ff6a5e..f53d38242e9b 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/ExecuteSSISPackageActivity.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/ExecuteSSISPackageActivity.java @@ -90,6 +90,12 @@ public class ExecuteSSISPackageActivity extends ExecutionActivity { @JsonProperty(value = "typeProperties.propertyOverrides") private Map propertyOverrides; + /** + * SSIS package execution log location. + */ + @JsonProperty(value = "typeProperties.logLocation") + private SSISLogLocation logLocation; + /** * Get sSIS package location. * @@ -310,4 +316,24 @@ public ExecuteSSISPackageActivity withPropertyOverrides(Map { + /** Static value SSISDB for SsisPackageLocationType. */ + public static final SsisPackageLocationType SSISDB = fromString("SSISDB"); + + /** Static value File for SsisPackageLocationType. */ + public static final SsisPackageLocationType FILE = fromString("File"); + + /** + * Creates or finds a SsisPackageLocationType from its string representation. + * @param name a name to look for + * @return the corresponding SsisPackageLocationType + */ + @JsonCreator + public static SsisPackageLocationType fromString(String name) { + return fromString(name, SsisPackageLocationType.class); + } + + /** + * @return known SsisPackageLocationType values + */ + public static Collection values() { + return values(SsisPackageLocationType.class); + } +} diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataLinkedService.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataLinkedService.java index 867981b1aa04..63329652e79e 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataLinkedService.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataLinkedService.java @@ -21,11 +21,18 @@ @JsonTypeName("Teradata") @JsonFlatten public class TeradataLinkedService extends LinkedServiceInner { + /** + * Teradata ODBC connection string. Type: string, SecureString or + * AzureKeyVaultSecretReference. + */ + @JsonProperty(value = "typeProperties.connectionString") + private Object connectionString; + /** * Server name for connection. Type: string (or Expression with resultType * string). */ - @JsonProperty(value = "typeProperties.server", required = true) + @JsonProperty(value = "typeProperties.server") private Object server; /** @@ -56,6 +63,26 @@ public class TeradataLinkedService extends LinkedServiceInner { @JsonProperty(value = "typeProperties.encryptedCredential") private Object encryptedCredential; + /** + * Get teradata ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. + * + * @return the connectionString value + */ + public Object connectionString() { + return this.connectionString; + } + + /** + * Set teradata ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference. + * + * @param connectionString the connectionString value to set + * @return the TeradataLinkedService object itself. + */ + public TeradataLinkedService withConnectionString(Object connectionString) { + this.connectionString = connectionString; + return this; + } + /** * Get server name for connection. Type: string (or Expression with resultType string). * diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataPartitionOption.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataPartitionOption.java new file mode 100644 index 000000000000..bfffebed1cf2 --- /dev/null +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataPartitionOption.java @@ -0,0 +1,44 @@ +/** + * 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.datafactoryv2.v2018_06_01; + +import java.util.Collection; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.microsoft.rest.ExpandableStringEnum; + +/** + * Defines values for TeradataPartitionOption. + */ +public final class TeradataPartitionOption extends ExpandableStringEnum { + /** Static value None for TeradataPartitionOption. */ + public static final TeradataPartitionOption NONE = fromString("None"); + + /** Static value Hash for TeradataPartitionOption. */ + public static final TeradataPartitionOption HASH = fromString("Hash"); + + /** Static value DynamicRange for TeradataPartitionOption. */ + public static final TeradataPartitionOption DYNAMIC_RANGE = fromString("DynamicRange"); + + /** + * Creates or finds a TeradataPartitionOption from its string representation. + * @param name a name to look for + * @return the corresponding TeradataPartitionOption + */ + @JsonCreator + public static TeradataPartitionOption fromString(String name) { + return fromString(name, TeradataPartitionOption.class); + } + + /** + * @return known TeradataPartitionOption values + */ + public static Collection values() { + return values(TeradataPartitionOption.class); + } +} diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataPartitionSettings.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataPartitionSettings.java index 6ef533218c43..5618e3322d20 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataPartitionSettings.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataPartitionSettings.java @@ -15,9 +15,8 @@ */ public class TeradataPartitionSettings { /** - * The name of the column in integer type that will be used for proceeding - * range or hash partitioning. Type: string (or Expression with resultType - * string). + * The name of the column that will be used for proceeding range or hash + * partitioning. Type: string (or Expression with resultType string). */ @JsonProperty(value = "partitionColumnName") private Object partitionColumnName; @@ -39,7 +38,7 @@ public class TeradataPartitionSettings { private Object partitionLowerBound; /** - * Get the name of the column in integer type that will be used for proceeding range or hash partitioning. Type: string (or Expression with resultType string). + * Get the name of the column that will be used for proceeding range or hash partitioning. Type: string (or Expression with resultType string). * * @return the partitionColumnName value */ @@ -48,7 +47,7 @@ public Object partitionColumnName() { } /** - * Set the name of the column in integer type that will be used for proceeding range or hash partitioning. Type: string (or Expression with resultType string). + * Set the name of the column that will be used for proceeding range or hash partitioning. Type: string (or Expression with resultType string). * * @param partitionColumnName the partitionColumnName value to set * @return the TeradataPartitionSettings object itself. diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataSource.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataSource.java index 8181405803e6..bece393bcd9a 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataSource.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/TeradataSource.java @@ -26,9 +26,10 @@ public class TeradataSource extends CopySource { /** * The partition mechanism that will be used for teradata read in parallel. + * Possible values include: 'None', 'Hash', 'DynamicRange'. */ @JsonProperty(value = "partitionOption") - private Object partitionOption; + private TeradataPartitionOption partitionOption; /** * The settings that will be leveraged for teradata source partitioning. @@ -57,21 +58,21 @@ public TeradataSource withQuery(Object query) { } /** - * Get the partition mechanism that will be used for teradata read in parallel. + * Get the partition mechanism that will be used for teradata read in parallel. Possible values include: 'None', 'Hash', 'DynamicRange'. * * @return the partitionOption value */ - public Object partitionOption() { + public TeradataPartitionOption partitionOption() { return this.partitionOption; } /** - * Set the partition mechanism that will be used for teradata read in parallel. + * Set the partition mechanism that will be used for teradata read in parallel. Possible values include: 'None', 'Hash', 'DynamicRange'. * * @param partitionOption the partitionOption value to set * @return the TeradataSource object itself. */ - public TeradataSource withPartitionOption(Object partitionOption) { + public TeradataSource withPartitionOption(TeradataPartitionOption partitionOption) { this.partitionOption = partitionOption; return this; } diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/DatasetInner.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/DatasetInner.java index c52b3d3ee5ad..153d62cbaab3 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/DatasetInner.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/DatasetInner.java @@ -69,9 +69,13 @@ @JsonSubTypes.Type(name = "SapHanaTable", value = SapHanaTableDataset.class), @JsonSubTypes.Type(name = "SapEccResource", value = SapEccResourceDataset.class), @JsonSubTypes.Type(name = "SapCloudForCustomerResource", value = SapCloudForCustomerResourceDataset.class), + @JsonSubTypes.Type(name = "SalesforceServiceCloudObject", value = SalesforceServiceCloudObjectDataset.class), @JsonSubTypes.Type(name = "SalesforceObject", value = SalesforceObjectDataset.class), + @JsonSubTypes.Type(name = "MicrosoftAccessTable", value = MicrosoftAccessTableDataset.class), + @JsonSubTypes.Type(name = "InformixTable", value = InformixTableDataset.class), @JsonSubTypes.Type(name = "RelationalTable", value = RelationalTableDataset.class), @JsonSubTypes.Type(name = "AzureMySqlTable", value = AzureMySqlTableDataset.class), + @JsonSubTypes.Type(name = "TeradataTable", value = TeradataTableDataset.class), @JsonSubTypes.Type(name = "OracleTable", value = OracleTableDataset.class), @JsonSubTypes.Type(name = "ODataResource", value = ODataResourceDataset.class), @JsonSubTypes.Type(name = "CosmosDbMongoDbApiCollection", value = CosmosDbMongoDbApiCollectionDataset.class), diff --git a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/LinkedServiceInner.java b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/LinkedServiceInner.java index 8a513d7a950e..ffd8604cf121 100644 --- a/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/LinkedServiceInner.java +++ b/datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/implementation/LinkedServiceInner.java @@ -77,6 +77,7 @@ @JsonSubTypes.Type(name = "SapOpenHub", value = SapOpenHubLinkedService.class), @JsonSubTypes.Type(name = "SapEcc", value = SapEccLinkedService.class), @JsonSubTypes.Type(name = "SapCloudForCustomer", value = SapCloudForCustomerLinkedService.class), + @JsonSubTypes.Type(name = "SalesforceServiceCloud", value = SalesforceServiceCloudLinkedService.class), @JsonSubTypes.Type(name = "Salesforce", value = SalesforceLinkedService.class), @JsonSubTypes.Type(name = "Office365", value = Office365LinkedService.class), @JsonSubTypes.Type(name = "AzureBlobFS", value = AzureBlobFSLinkedService.class), @@ -88,6 +89,8 @@ @JsonSubTypes.Type(name = "Web", value = WebLinkedService.class), @JsonSubTypes.Type(name = "OData", value = ODataLinkedService.class), @JsonSubTypes.Type(name = "Hdfs", value = HdfsLinkedService.class), + @JsonSubTypes.Type(name = "MicrosoftAccess", value = MicrosoftAccessLinkedService.class), + @JsonSubTypes.Type(name = "Informix", value = InformixLinkedService.class), @JsonSubTypes.Type(name = "Odbc", value = OdbcLinkedService.class), @JsonSubTypes.Type(name = "AzureML", value = AzureMLLinkedService.class), @JsonSubTypes.Type(name = "Teradata", value = TeradataLinkedService.class),