diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/CHANGELOG.md b/sdk/datafactory/azure-resourcemanager-datafactory/CHANGELOG.md
index fa3cd3a29e51..2660e0371d2a 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/CHANGELOG.md
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/CHANGELOG.md
@@ -1,6 +1,8 @@
# Release History
-## 1.0.0-beta.9 (Unreleased)
+## 1.0.0-beta.1 (2021-11-30)
+
+- Azure Resource Manager DataFactory client library for Java. This package contains Microsoft Azure SDK for DataFactory Management SDK. The Azure Data Factory V2 management API provides a RESTful set of web services that interact with Azure Data Factory V2 services. Package tag package-2018-06. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
### Features Added
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/README.md b/sdk/datafactory/azure-resourcemanager-datafactory/README.md
index 1ed10ca36e80..e86823e69e79 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/README.md
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
com.azure.resourcemanager
azure-resourcemanager-datafactory
- 1.0.0-beta.8
+ 1.0.0-beta.9
```
[//]: # ({x-version-update-end})
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/DataFactoryManager.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/DataFactoryManager.java
index 0ed9be2fa2c6..8eed8312d398 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/DataFactoryManager.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/DataFactoryManager.java
@@ -251,7 +251,7 @@ public DataFactoryManager authenticate(TokenCredential credential, AzureProfile
.append("-")
.append("com.azure.resourcemanager.datafactory")
.append("/")
- .append("1.0.0-beta.8");
+ .append("1.0.0-beta.1");
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
userAgentBuilder
.append(" (")
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/ExecutePowerQueryActivityTypeProperties.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/ExecutePowerQueryActivityTypeProperties.java
index 83165b1a3afe..42fc84ab19b1 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/ExecutePowerQueryActivityTypeProperties.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/ExecutePowerQueryActivityTypeProperties.java
@@ -11,11 +11,9 @@
import com.azure.resourcemanager.datafactory.models.ExecuteDataFlowActivityTypePropertiesCompute;
import com.azure.resourcemanager.datafactory.models.IntegrationRuntimeReference;
import com.azure.resourcemanager.datafactory.models.PowerQuerySink;
-import com.azure.resourcemanager.datafactory.models.PowerQuerySinkMapping;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
import java.util.Map;
/** Execute power query data flow activity properties. */
@@ -24,22 +22,14 @@ public final class ExecutePowerQueryActivityTypeProperties extends ExecuteDataFl
@JsonIgnore private final ClientLogger logger = new ClientLogger(ExecutePowerQueryActivityTypeProperties.class);
/*
- * (Deprecated. Please use Queries). List of Power Query activity sinks
- * mapped to a queryName.
+ * List of Power Query activity sinks mapped to a queryName.
*/
@JsonProperty(value = "sinks")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
private Map sinks;
- /*
- * List of mapping for Power Query mashup query to sink dataset(s).
- */
- @JsonProperty(value = "queries")
- private List queries;
-
/**
- * Get the sinks property: (Deprecated. Please use Queries). List of Power Query activity sinks mapped to a
- * queryName.
+ * Get the sinks property: List of Power Query activity sinks mapped to a queryName.
*
* @return the sinks value.
*/
@@ -48,8 +38,7 @@ public Map sinks() {
}
/**
- * Set the sinks property: (Deprecated. Please use Queries). List of Power Query activity sinks mapped to a
- * queryName.
+ * Set the sinks property: List of Power Query activity sinks mapped to a queryName.
*
* @param sinks the sinks value to set.
* @return the ExecutePowerQueryActivityTypeProperties object itself.
@@ -59,26 +48,6 @@ public ExecutePowerQueryActivityTypeProperties withSinks(Map queries() {
- return this.queries;
- }
-
- /**
- * Set the queries property: List of mapping for Power Query mashup query to sink dataset(s).
- *
- * @param queries the queries value to set.
- * @return the ExecutePowerQueryActivityTypeProperties object itself.
- */
- public ExecutePowerQueryActivityTypeProperties withQueries(List queries) {
- this.queries = queries;
- return this;
- }
-
/** {@inheritDoc} */
@Override
public ExecutePowerQueryActivityTypeProperties withDataFlow(DataFlowReference dataFlow) {
@@ -147,8 +116,5 @@ public void validate() {
}
});
}
- if (queries() != null) {
- queries().forEach(e -> e.validate());
- }
}
}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/FlowletTypeProperties.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/FlowletTypeProperties.java
deleted file mode 100644
index 6483dd144db9..000000000000
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/FlowletTypeProperties.java
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.resourcemanager.datafactory.fluent.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.datafactory.models.DataFlowSink;
-import com.azure.resourcemanager.datafactory.models.DataFlowSource;
-import com.azure.resourcemanager.datafactory.models.Transformation;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
-
-/** Flowlet type properties. */
-@Fluent
-public final class FlowletTypeProperties {
- @JsonIgnore private final ClientLogger logger = new ClientLogger(FlowletTypeProperties.class);
-
- /*
- * List of sources in Flowlet.
- */
- @JsonProperty(value = "sources")
- private List sources;
-
- /*
- * List of sinks in Flowlet.
- */
- @JsonProperty(value = "sinks")
- private List sinks;
-
- /*
- * List of transformations in Flowlet.
- */
- @JsonProperty(value = "transformations")
- private List transformations;
-
- /*
- * Flowlet script.
- */
- @JsonProperty(value = "script")
- private String script;
-
- /*
- * Flowlet script lines.
- */
- @JsonProperty(value = "scriptLines")
- private List scriptLines;
-
- /**
- * Get the sources property: List of sources in Flowlet.
- *
- * @return the sources value.
- */
- public List sources() {
- return this.sources;
- }
-
- /**
- * Set the sources property: List of sources in Flowlet.
- *
- * @param sources the sources value to set.
- * @return the FlowletTypeProperties object itself.
- */
- public FlowletTypeProperties withSources(List sources) {
- this.sources = sources;
- return this;
- }
-
- /**
- * Get the sinks property: List of sinks in Flowlet.
- *
- * @return the sinks value.
- */
- public List sinks() {
- return this.sinks;
- }
-
- /**
- * Set the sinks property: List of sinks in Flowlet.
- *
- * @param sinks the sinks value to set.
- * @return the FlowletTypeProperties object itself.
- */
- public FlowletTypeProperties withSinks(List sinks) {
- this.sinks = sinks;
- return this;
- }
-
- /**
- * Get the transformations property: List of transformations in Flowlet.
- *
- * @return the transformations value.
- */
- public List transformations() {
- return this.transformations;
- }
-
- /**
- * Set the transformations property: List of transformations in Flowlet.
- *
- * @param transformations the transformations value to set.
- * @return the FlowletTypeProperties object itself.
- */
- public FlowletTypeProperties withTransformations(List transformations) {
- this.transformations = transformations;
- return this;
- }
-
- /**
- * Get the script property: Flowlet script.
- *
- * @return the script value.
- */
- public String script() {
- return this.script;
- }
-
- /**
- * Set the script property: Flowlet script.
- *
- * @param script the script value to set.
- * @return the FlowletTypeProperties object itself.
- */
- public FlowletTypeProperties withScript(String script) {
- this.script = script;
- return this;
- }
-
- /**
- * Get the scriptLines property: Flowlet script lines.
- *
- * @return the scriptLines value.
- */
- public List scriptLines() {
- return this.scriptLines;
- }
-
- /**
- * Set the scriptLines property: Flowlet script lines.
- *
- * @param scriptLines the scriptLines value to set.
- * @return the FlowletTypeProperties object itself.
- */
- public FlowletTypeProperties withScriptLines(List scriptLines) {
- this.scriptLines = scriptLines;
- return this;
- }
-
- /**
- * Validates the instance.
- *
- * @throws IllegalArgumentException thrown if the instance is not valid.
- */
- public void validate() {
- if (sources() != null) {
- sources().forEach(e -> e.validate());
- }
- if (sinks() != null) {
- sinks().forEach(e -> e.validate());
- }
- if (transformations() != null) {
- transformations().forEach(e -> e.validate());
- }
- }
-}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/MappingDataFlowTypeProperties.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/MappingDataFlowTypeProperties.java
index 85fb658d581f..555f061d9142 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/MappingDataFlowTypeProperties.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/MappingDataFlowTypeProperties.java
@@ -42,12 +42,6 @@ public final class MappingDataFlowTypeProperties {
@JsonProperty(value = "script")
private String script;
- /*
- * Data flow script lines.
- */
- @JsonProperty(value = "scriptLines")
- private List scriptLines;
-
/**
* Get the sources property: List of sources in data flow.
*
@@ -128,26 +122,6 @@ public MappingDataFlowTypeProperties withScript(String script) {
return this;
}
- /**
- * Get the scriptLines property: Data flow script lines.
- *
- * @return the scriptLines value.
- */
- public List scriptLines() {
- return this.scriptLines;
- }
-
- /**
- * Set the scriptLines property: Data flow script lines.
- *
- * @param scriptLines the scriptLines value to set.
- * @return the MappingDataFlowTypeProperties object itself.
- */
- public MappingDataFlowTypeProperties withScriptLines(List scriptLines) {
- this.scriptLines = scriptLines;
- return this;
- }
-
/**
* Validates the instance.
*
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/PipelineRunInner.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/PipelineRunInner.java
index d12dc3cc4677..07bfa3bbec33 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/PipelineRunInner.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/PipelineRunInner.java
@@ -91,8 +91,7 @@ public final class PipelineRunInner {
private Integer durationInMs;
/*
- * The status of a pipeline run. Possible values: Queued, InProgress,
- * Succeeded, Failed, Canceling, Cancelled
+ * The status of a pipeline run.
*/
@JsonProperty(value = "status", access = JsonProperty.Access.WRITE_ONLY)
private String status;
@@ -208,8 +207,7 @@ public Integer durationInMs() {
}
/**
- * Get the status property: The status of a pipeline run. Possible values: Queued, InProgress, Succeeded, Failed,
- * Canceling, Cancelled.
+ * Get the status property: The status of a pipeline run.
*
* @return the status value.
*/
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/PowerQueryTypeProperties.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/PowerQueryTypeProperties.java
index 6f124d5aaf58..4e6395a81700 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/PowerQueryTypeProperties.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/PowerQueryTypeProperties.java
@@ -28,12 +28,6 @@ public final class PowerQueryTypeProperties {
@JsonProperty(value = "script")
private String script;
- /*
- * Locale of the Power query mashup document.
- */
- @JsonProperty(value = "documentLocale")
- private String documentLocale;
-
/**
* Get the sources property: List of sources in Power Query.
*
@@ -74,26 +68,6 @@ public PowerQueryTypeProperties withScript(String script) {
return this;
}
- /**
- * Get the documentLocale property: Locale of the Power query mashup document.
- *
- * @return the documentLocale value.
- */
- public String documentLocale() {
- return this.documentLocale;
- }
-
- /**
- * Set the documentLocale property: Locale of the Power query mashup document.
- *
- * @param documentLocale the documentLocale value to set.
- * @return the PowerQueryTypeProperties object itself.
- */
- public PowerQueryTypeProperties withDocumentLocale(String documentLocale) {
- this.documentLocale = documentLocale;
- return this;
- }
-
/**
* Validates the instance.
*
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlow.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlow.java
index cceda40c1bf5..20ebcbeea48c 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlow.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlow.java
@@ -22,7 +22,6 @@
@JsonTypeName("DataFlow")
@JsonSubTypes({
@JsonSubTypes.Type(name = "MappingDataFlow", value = MappingDataFlow.class),
- @JsonSubTypes.Type(name = "Flowlet", value = Flowlet.class),
@JsonSubTypes.Type(name = "WranglingDataFlow", value = WranglingDataFlow.class)
})
@Fluent
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowDebugPackage.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowDebugPackage.java
index 49aa50d5ab3b..87521ba07a1a 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowDebugPackage.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowDebugPackage.java
@@ -31,12 +31,6 @@ public final class DataFlowDebugPackage {
@JsonProperty(value = "dataFlow")
private DataFlowDebugResource dataFlow;
- /*
- * List of Data flows
- */
- @JsonProperty(value = "dataFlows")
- private List dataFlows;
-
/*
* List of datasets.
*/
@@ -106,26 +100,6 @@ public DataFlowDebugPackage withDataFlow(DataFlowDebugResource dataFlow) {
return this;
}
- /**
- * Get the dataFlows property: List of Data flows.
- *
- * @return the dataFlows value.
- */
- public List dataFlows() {
- return this.dataFlows;
- }
-
- /**
- * Set the dataFlows property: List of Data flows.
- *
- * @param dataFlows the dataFlows value to set.
- * @return the DataFlowDebugPackage object itself.
- */
- public DataFlowDebugPackage withDataFlows(List dataFlows) {
- this.dataFlows = dataFlows;
- return this;
- }
-
/**
* Get the datasets property: List of datasets.
*
@@ -244,9 +218,6 @@ public void validate() {
if (dataFlow() != null) {
dataFlow().validate();
}
- if (dataFlows() != null) {
- dataFlows().forEach(e -> e.validate());
- }
if (datasets() != null) {
datasets().forEach(e -> e.validate());
}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowReference.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowReference.java
index d3027b8e2872..66615e0b742b 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowReference.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowReference.java
@@ -9,7 +9,6 @@
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.HashMap;
import java.util.Map;
@@ -37,13 +36,6 @@ public final class DataFlowReference {
@JsonProperty(value = "datasetParameters")
private Object datasetParameters;
- /*
- * Data flow parameters
- */
- @JsonProperty(value = "parameters")
- @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
- private Map parameters;
-
/*
* Data flow reference type.
*/
@@ -114,26 +106,6 @@ public DataFlowReference withDatasetParameters(Object datasetParameters) {
return this;
}
- /**
- * Get the parameters property: Data flow parameters.
- *
- * @return the parameters value.
- */
- public Map parameters() {
- return this.parameters;
- }
-
- /**
- * Set the parameters property: Data flow parameters.
- *
- * @param parameters the parameters value to set.
- * @return the DataFlowReference object itself.
- */
- public DataFlowReference withParameters(Map parameters) {
- this.parameters = parameters;
- return this;
- }
-
/**
* Get the additionalProperties property: Data flow reference type.
*
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowSink.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowSink.java
index 8a73b2bca27e..8e336a3c3419 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowSink.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowSink.java
@@ -14,12 +14,64 @@
public class DataFlowSink extends Transformation {
@JsonIgnore private final ClientLogger logger = new ClientLogger(DataFlowSink.class);
+ /*
+ * Dataset reference.
+ */
+ @JsonProperty(value = "dataset")
+ private DatasetReference dataset;
+
+ /*
+ * Linked service reference.
+ */
+ @JsonProperty(value = "linkedService")
+ private LinkedServiceReference linkedService;
+
/*
* Schema linked service reference.
*/
@JsonProperty(value = "schemaLinkedService")
private LinkedServiceReference schemaLinkedService;
+ /**
+ * Get the dataset property: Dataset reference.
+ *
+ * @return the dataset value.
+ */
+ public DatasetReference dataset() {
+ return this.dataset;
+ }
+
+ /**
+ * Set the dataset property: Dataset reference.
+ *
+ * @param dataset the dataset value to set.
+ * @return the DataFlowSink object itself.
+ */
+ public DataFlowSink withDataset(DatasetReference dataset) {
+ this.dataset = dataset;
+ return this;
+ }
+
+ /**
+ * Get the linkedService property: Linked service reference.
+ *
+ * @return the linkedService value.
+ */
+ public LinkedServiceReference linkedService() {
+ return this.linkedService;
+ }
+
+ /**
+ * Set the linkedService property: Linked service reference.
+ *
+ * @param linkedService the linkedService value to set.
+ * @return the DataFlowSink object itself.
+ */
+ public DataFlowSink withLinkedService(LinkedServiceReference linkedService) {
+ this.linkedService = linkedService;
+ return this;
+ }
+
/**
* Get the schemaLinkedService property: Schema linked service reference.
*
@@ -54,27 +106,6 @@ public DataFlowSink withDescription(String description) {
return this;
}
- /** {@inheritDoc} */
- @Override
- public DataFlowSink withDataset(DatasetReference dataset) {
- super.withDataset(dataset);
- return this;
- }
-
- /** {@inheritDoc} */
- @Override
- public DataFlowSink withLinkedService(LinkedServiceReference linkedService) {
- super.withLinkedService(linkedService);
- return this;
- }
-
- /** {@inheritDoc} */
- @Override
- public DataFlowSink withFlowlet(DataFlowReference flowlet) {
- super.withFlowlet(flowlet);
- return this;
- }
-
/**
* Validates the instance.
*
@@ -83,6 +114,12 @@ public DataFlowSink withFlowlet(DataFlowReference flowlet) {
@Override
public void validate() {
super.validate();
+ if (dataset() != null) {
+ dataset().validate();
+ }
+ if (linkedService() != null) {
+ linkedService().validate();
+ }
if (schemaLinkedService() != null) {
schemaLinkedService().validate();
}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowSource.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowSource.java
index 975f6ec65af2..14df3a146e38 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowSource.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DataFlowSource.java
@@ -14,12 +14,64 @@
public class DataFlowSource extends Transformation {
@JsonIgnore private final ClientLogger logger = new ClientLogger(DataFlowSource.class);
+ /*
+ * Dataset reference.
+ */
+ @JsonProperty(value = "dataset")
+ private DatasetReference dataset;
+
+ /*
+ * Linked service reference.
+ */
+ @JsonProperty(value = "linkedService")
+ private LinkedServiceReference linkedService;
+
/*
* Schema linked service reference.
*/
@JsonProperty(value = "schemaLinkedService")
private LinkedServiceReference schemaLinkedService;
+ /**
+ * Get the dataset property: Dataset reference.
+ *
+ * @return the dataset value.
+ */
+ public DatasetReference dataset() {
+ return this.dataset;
+ }
+
+ /**
+ * Set the dataset property: Dataset reference.
+ *
+ * @param dataset the dataset value to set.
+ * @return the DataFlowSource object itself.
+ */
+ public DataFlowSource withDataset(DatasetReference dataset) {
+ this.dataset = dataset;
+ return this;
+ }
+
+ /**
+ * Get the linkedService property: Linked service reference.
+ *
+ * @return the linkedService value.
+ */
+ public LinkedServiceReference linkedService() {
+ return this.linkedService;
+ }
+
+ /**
+ * Set the linkedService property: Linked service reference.
+ *
+ * @param linkedService the linkedService value to set.
+ * @return the DataFlowSource object itself.
+ */
+ public DataFlowSource withLinkedService(LinkedServiceReference linkedService) {
+ this.linkedService = linkedService;
+ return this;
+ }
+
/**
* Get the schemaLinkedService property: Schema linked service reference.
*
@@ -54,27 +106,6 @@ public DataFlowSource withDescription(String description) {
return this;
}
- /** {@inheritDoc} */
- @Override
- public DataFlowSource withDataset(DatasetReference dataset) {
- super.withDataset(dataset);
- return this;
- }
-
- /** {@inheritDoc} */
- @Override
- public DataFlowSource withLinkedService(LinkedServiceReference linkedService) {
- super.withLinkedService(linkedService);
- return this;
- }
-
- /** {@inheritDoc} */
- @Override
- public DataFlowSource withFlowlet(DataFlowReference flowlet) {
- super.withFlowlet(flowlet);
- return this;
- }
-
/**
* Validates the instance.
*
@@ -83,6 +114,12 @@ public DataFlowSource withFlowlet(DataFlowReference flowlet) {
@Override
public void validate() {
super.validate();
+ if (dataset() != null) {
+ dataset().validate();
+ }
+ if (linkedService() != null) {
+ linkedService().validate();
+ }
if (schemaLinkedService() != null) {
schemaLinkedService().validate();
}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetBZip2Compression.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetBZip2Compression.java
new file mode 100644
index 000000000000..f03a2346e78c
--- /dev/null
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetBZip2Compression.java
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.datafactory.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.util.logging.ClientLogger;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/** The BZip2 compression method used on a dataset. */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("BZip2")
+@Immutable
+public final class DatasetBZip2Compression extends DatasetCompression {
+ @JsonIgnore private final ClientLogger logger = new ClientLogger(DatasetBZip2Compression.class);
+
+ /**
+ * Validates the instance.
+ *
+ * @throws IllegalArgumentException thrown if the instance is not valid.
+ */
+ @Override
+ public void validate() {
+ super.validate();
+ }
+}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetCompression.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetCompression.java
index 2fab3a82492c..551b2bdbb941 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetCompression.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetCompression.java
@@ -9,74 +9,36 @@
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
import java.util.HashMap;
import java.util.Map;
/** The compression method used on a dataset. */
+@JsonTypeInfo(
+ use = JsonTypeInfo.Id.NAME,
+ include = JsonTypeInfo.As.PROPERTY,
+ property = "type",
+ defaultImpl = DatasetCompression.class)
+@JsonTypeName("DatasetCompression")
+@JsonSubTypes({
+ @JsonSubTypes.Type(name = "BZip2", value = DatasetBZip2Compression.class),
+ @JsonSubTypes.Type(name = "GZip", value = DatasetGZipCompression.class),
+ @JsonSubTypes.Type(name = "Deflate", value = DatasetDeflateCompression.class),
+ @JsonSubTypes.Type(name = "ZipDeflate", value = DatasetZipDeflateCompression.class),
+ @JsonSubTypes.Type(name = "Tar", value = DatasetTarCompression.class),
+ @JsonSubTypes.Type(name = "TarGZip", value = DatasetTarGZipCompression.class)
+})
@Fluent
-public final class DatasetCompression {
+public class DatasetCompression {
@JsonIgnore private final ClientLogger logger = new ClientLogger(DatasetCompression.class);
- /*
- * Type of dataset compression. Type: string (or Expression with resultType
- * string).
- */
- @JsonProperty(value = "type", required = true)
- private Object type;
-
- /*
- * The dataset compression level. Type: string (or Expression with
- * resultType string).
- */
- @JsonProperty(value = "level")
- private Object level;
-
/*
* The compression method used on a dataset.
*/
@JsonIgnore private Map additionalProperties;
- /**
- * Get the type property: Type of dataset compression. Type: string (or Expression with resultType string).
- *
- * @return the type value.
- */
- public Object type() {
- return this.type;
- }
-
- /**
- * Set the type property: Type of dataset compression. Type: string (or Expression with resultType string).
- *
- * @param type the type value to set.
- * @return the DatasetCompression object itself.
- */
- public DatasetCompression withType(Object type) {
- this.type = type;
- return this;
- }
-
- /**
- * Get the level property: The dataset compression level. Type: string (or Expression with resultType string).
- *
- * @return the level value.
- */
- public Object level() {
- return this.level;
- }
-
- /**
- * Set the level property: The dataset compression level. Type: string (or Expression with resultType string).
- *
- * @param level the level value to set.
- * @return the DatasetCompression object itself.
- */
- public DatasetCompression withLevel(Object level) {
- this.level = level;
- return this;
- }
-
/**
* Get the additionalProperties property: The compression method used on a dataset.
*
@@ -112,10 +74,5 @@ void withAdditionalProperties(String key, Object value) {
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {
- if (type() == null) {
- throw logger
- .logExceptionAsError(
- new IllegalArgumentException("Missing required property type in model DatasetCompression"));
- }
}
}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetDeflateCompression.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetDeflateCompression.java
new file mode 100644
index 000000000000..195ce6f69c51
--- /dev/null
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetDeflateCompression.java
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.datafactory.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/** The Deflate compression method used on a dataset. */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("Deflate")
+@Fluent
+public final class DatasetDeflateCompression extends DatasetCompression {
+ @JsonIgnore private final ClientLogger logger = new ClientLogger(DatasetDeflateCompression.class);
+
+ /*
+ * The Deflate compression level.
+ */
+ @JsonProperty(value = "level")
+ private Object level;
+
+ /**
+ * Get the level property: The Deflate compression level.
+ *
+ * @return the level value.
+ */
+ public Object level() {
+ return this.level;
+ }
+
+ /**
+ * Set the level property: The Deflate compression level.
+ *
+ * @param level the level value to set.
+ * @return the DatasetDeflateCompression object itself.
+ */
+ public DatasetDeflateCompression withLevel(Object level) {
+ this.level = level;
+ return this;
+ }
+
+ /**
+ * Validates the instance.
+ *
+ * @throws IllegalArgumentException thrown if the instance is not valid.
+ */
+ @Override
+ public void validate() {
+ super.validate();
+ }
+}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetGZipCompression.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetGZipCompression.java
new file mode 100644
index 000000000000..d009549fc9bc
--- /dev/null
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetGZipCompression.java
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.datafactory.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/** The GZip compression method used on a dataset. */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("GZip")
+@Fluent
+public final class DatasetGZipCompression extends DatasetCompression {
+ @JsonIgnore private final ClientLogger logger = new ClientLogger(DatasetGZipCompression.class);
+
+ /*
+ * The GZip compression level.
+ */
+ @JsonProperty(value = "level")
+ private Object level;
+
+ /**
+ * Get the level property: The GZip compression level.
+ *
+ * @return the level value.
+ */
+ public Object level() {
+ return this.level;
+ }
+
+ /**
+ * Set the level property: The GZip compression level.
+ *
+ * @param level the level value to set.
+ * @return the DatasetGZipCompression object itself.
+ */
+ public DatasetGZipCompression withLevel(Object level) {
+ this.level = level;
+ return this;
+ }
+
+ /**
+ * Validates the instance.
+ *
+ * @throws IllegalArgumentException thrown if the instance is not valid.
+ */
+ @Override
+ public void validate() {
+ super.validate();
+ }
+}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetTarCompression.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetTarCompression.java
new file mode 100644
index 000000000000..183661172874
--- /dev/null
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetTarCompression.java
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.datafactory.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.util.logging.ClientLogger;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/** The Tar archive method used on a dataset. */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("Tar")
+@Immutable
+public final class DatasetTarCompression extends DatasetCompression {
+ @JsonIgnore private final ClientLogger logger = new ClientLogger(DatasetTarCompression.class);
+
+ /**
+ * Validates the instance.
+ *
+ * @throws IllegalArgumentException thrown if the instance is not valid.
+ */
+ @Override
+ public void validate() {
+ super.validate();
+ }
+}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetTarGZipCompression.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetTarGZipCompression.java
new file mode 100644
index 000000000000..18531ac560c7
--- /dev/null
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetTarGZipCompression.java
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.datafactory.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/** The TarGZip compression method used on a dataset. */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("TarGZip")
+@Fluent
+public final class DatasetTarGZipCompression extends DatasetCompression {
+ @JsonIgnore private final ClientLogger logger = new ClientLogger(DatasetTarGZipCompression.class);
+
+ /*
+ * The TarGZip compression level.
+ */
+ @JsonProperty(value = "level")
+ private Object level;
+
+ /**
+ * Get the level property: The TarGZip compression level.
+ *
+ * @return the level value.
+ */
+ public Object level() {
+ return this.level;
+ }
+
+ /**
+ * Set the level property: The TarGZip compression level.
+ *
+ * @param level the level value to set.
+ * @return the DatasetTarGZipCompression object itself.
+ */
+ public DatasetTarGZipCompression withLevel(Object level) {
+ this.level = level;
+ return this;
+ }
+
+ /**
+ * Validates the instance.
+ *
+ * @throws IllegalArgumentException thrown if the instance is not valid.
+ */
+ @Override
+ public void validate() {
+ super.validate();
+ }
+}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetZipDeflateCompression.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetZipDeflateCompression.java
new file mode 100644
index 000000000000..715264afb80b
--- /dev/null
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetZipDeflateCompression.java
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.datafactory.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/** The ZipDeflate compression method used on a dataset. */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("ZipDeflate")
+@Fluent
+public final class DatasetZipDeflateCompression extends DatasetCompression {
+ @JsonIgnore private final ClientLogger logger = new ClientLogger(DatasetZipDeflateCompression.class);
+
+ /*
+ * The ZipDeflate compression level.
+ */
+ @JsonProperty(value = "level")
+ private Object level;
+
+ /**
+ * Get the level property: The ZipDeflate compression level.
+ *
+ * @return the level value.
+ */
+ public Object level() {
+ return this.level;
+ }
+
+ /**
+ * Set the level property: The ZipDeflate compression level.
+ *
+ * @param level the level value to set.
+ * @return the DatasetZipDeflateCompression object itself.
+ */
+ public DatasetZipDeflateCompression withLevel(Object level) {
+ this.level = level;
+ return this;
+ }
+
+ /**
+ * Validates the instance.
+ *
+ * @throws IllegalArgumentException thrown if the instance is not valid.
+ */
+ @Override
+ public void validate() {
+ super.validate();
+ }
+}
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/ExecuteWranglingDataflowActivity.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/ExecuteWranglingDataflowActivity.java
index dac8014a64e8..07388f1832da 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/ExecuteWranglingDataflowActivity.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/ExecuteWranglingDataflowActivity.java
@@ -91,8 +91,7 @@ public ExecuteWranglingDataflowActivity withUserProperties(List us
}
/**
- * Get the sinks property: (Deprecated. Please use Queries). List of Power Query activity sinks mapped to a
- * queryName.
+ * Get the sinks property: List of Power Query activity sinks mapped to a queryName.
*
* @return the sinks value.
*/
@@ -101,8 +100,7 @@ public Map sinks() {
}
/**
- * Set the sinks property: (Deprecated. Please use Queries). List of Power Query activity sinks mapped to a
- * queryName.
+ * Set the sinks property: List of Power Query activity sinks mapped to a queryName.
*
* @param sinks the sinks value to set.
* @return the ExecuteWranglingDataflowActivity object itself.
@@ -115,29 +113,6 @@ public ExecuteWranglingDataflowActivity withSinks(Map si
return this;
}
- /**
- * Get the queries property: List of mapping for Power Query mashup query to sink dataset(s).
- *
- * @return the queries value.
- */
- public List queries() {
- return this.innerTypeProperties() == null ? null : this.innerTypeProperties().queries();
- }
-
- /**
- * Set the queries property: List of mapping for Power Query mashup query to sink dataset(s).
- *
- * @param queries the queries value to set.
- * @return the ExecuteWranglingDataflowActivity object itself.
- */
- public ExecuteWranglingDataflowActivity withQueries(List queries) {
- if (this.innerTypeProperties() == null) {
- this.innerTypeProperties = new ExecutePowerQueryActivityTypeProperties();
- }
- this.innerTypeProperties().withQueries(queries);
- return this;
- }
-
/**
* Get the dataFlow property: Data flow reference.
*
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Flowlet.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Flowlet.java
deleted file mode 100644
index 3c782c0e0d04..000000000000
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Flowlet.java
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.resourcemanager.datafactory.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.datafactory.fluent.models.FlowletTypeProperties;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import java.util.List;
-
-/** Data flow flowlet. */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-@JsonTypeName("Flowlet")
-@Fluent
-public final class Flowlet extends DataFlow {
- @JsonIgnore private final ClientLogger logger = new ClientLogger(Flowlet.class);
-
- /*
- * Flowlet type properties.
- */
- @JsonProperty(value = "typeProperties")
- private FlowletTypeProperties innerTypeProperties;
-
- /**
- * Get the innerTypeProperties property: Flowlet type properties.
- *
- * @return the innerTypeProperties value.
- */
- private FlowletTypeProperties innerTypeProperties() {
- return this.innerTypeProperties;
- }
-
- /** {@inheritDoc} */
- @Override
- public Flowlet withDescription(String description) {
- super.withDescription(description);
- return this;
- }
-
- /** {@inheritDoc} */
- @Override
- public Flowlet withAnnotations(List