diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/CHANGELOG.md b/sdk/datafactory/azure-resourcemanager-datafactory/CHANGELOG.md
index e319f3071715..09ca2ad41647 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.7 (Unreleased)
+## 1.0.0-beta.1 (2021-10-29)
+
+- 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 3c566d23d8d9..85035c9bd16b 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.6
+ 1.0.0-beta.7
```
[//]: # ({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 ddf5a0ae2f2d..99fccd16ee3f 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
@@ -249,7 +249,7 @@ public DataFactoryManager authenticate(TokenCredential credential, AzureProfile
.append("-")
.append("com.azure.resourcemanager.datafactory")
.append("/")
- .append("1.0.0-beta.6");
+ .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/DataFlowDebugSessionsClient.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/DataFlowDebugSessionsClient.java
index 8205f72b9282..3a74ffc1acd7 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/DataFlowDebugSessionsClient.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/DataFlowDebugSessionsClient.java
@@ -33,7 +33,7 @@ public interface DataFlowDebugSessionsClient {
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure for creating data flow debug session.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, CreateDataFlowDebugSessionResponseInner>
beginCreate(String resourceGroupName, String factoryName, CreateDataFlowDebugSessionRequest request);
@@ -49,7 +49,7 @@ public interface DataFlowDebugSessionsClient {
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure for creating data flow debug session.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, CreateDataFlowDebugSessionResponseInner>
beginCreate(
String resourceGroupName, String factoryName, CreateDataFlowDebugSessionRequest request, Context context);
@@ -184,7 +184,7 @@ Response deleteWithResponse(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure of data flow result for data preview, statistics or expression preview.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, DataFlowDebugCommandResponseInner> beginExecuteCommand(
String resourceGroupName, String factoryName, DataFlowDebugCommandRequest request);
@@ -200,7 +200,7 @@ SyncPoller, DataFlowDebugCommandRe
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure of data flow result for data preview, statistics or expression preview.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, DataFlowDebugCommandResponseInner> beginExecuteCommand(
String resourceGroupName, String factoryName, DataFlowDebugCommandRequest request, Context context);
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/IntegrationRuntimeObjectMetadatasClient.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/IntegrationRuntimeObjectMetadatasClient.java
index a998271c4ed4..761810fe3535 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/IntegrationRuntimeObjectMetadatasClient.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/IntegrationRuntimeObjectMetadatasClient.java
@@ -29,7 +29,7 @@ public interface IntegrationRuntimeObjectMetadatasClient {
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the status of the operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, SsisObjectMetadataStatusResponseInner> beginRefresh(
String resourceGroupName, String factoryName, String integrationRuntimeName);
@@ -45,7 +45,7 @@ SyncPoller, SsisObjectMetadata
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the status of the operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, SsisObjectMetadataStatusResponseInner> beginRefresh(
String resourceGroupName, String factoryName, String integrationRuntimeName, Context context);
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/IntegrationRuntimesClient.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/IntegrationRuntimesClient.java
index deff3644c05c..f23eea26a020 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/IntegrationRuntimesClient.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/IntegrationRuntimesClient.java
@@ -380,7 +380,7 @@ Response listAuthKeysWithResponse(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return integration runtime status response.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, IntegrationRuntimeStatusResponseInner> beginStart(
String resourceGroupName, String factoryName, String integrationRuntimeName);
@@ -396,7 +396,7 @@ SyncPoller, IntegrationRuntime
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return integration runtime status response.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, IntegrationRuntimeStatusResponseInner> beginStart(
String resourceGroupName, String factoryName, String integrationRuntimeName, Context context);
@@ -442,7 +442,7 @@ IntegrationRuntimeStatusResponseInner start(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, Void> beginStop(
String resourceGroupName, String factoryName, String integrationRuntimeName);
@@ -458,7 +458,7 @@ SyncPoller, Void> beginStop(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, Void> beginStop(
String resourceGroupName, String factoryName, String integrationRuntimeName, Context context);
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/TriggersClient.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/TriggersClient.java
index b016c07d0dbb..7941482ae770 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/TriggersClient.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/TriggersClient.java
@@ -188,7 +188,7 @@ Response deleteWithResponse(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, TriggerSubscriptionOperationStatusInner>
beginSubscribeToEvents(String resourceGroupName, String factoryName, String triggerName);
@@ -204,7 +204,7 @@ Response deleteWithResponse(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, TriggerSubscriptionOperationStatusInner>
beginSubscribeToEvents(String resourceGroupName, String factoryName, String triggerName, Context context);
@@ -281,7 +281,7 @@ Response getEventSubscriptionStatusWith
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, TriggerSubscriptionOperationStatusInner>
beginUnsubscribeFromEvents(String resourceGroupName, String factoryName, String triggerName);
@@ -297,7 +297,7 @@ Response getEventSubscriptionStatusWith
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, TriggerSubscriptionOperationStatusInner>
beginUnsubscribeFromEvents(String resourceGroupName, String factoryName, String triggerName, Context context);
@@ -343,7 +343,7 @@ TriggerSubscriptionOperationStatusInner unsubscribeFromEvents(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, Void> beginStart(String resourceGroupName, String factoryName, String triggerName);
/**
@@ -358,7 +358,7 @@ TriggerSubscriptionOperationStatusInner unsubscribeFromEvents(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, Void> beginStart(
String resourceGroupName, String factoryName, String triggerName, Context context);
@@ -400,7 +400,7 @@ SyncPoller, Void> beginStart(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, Void> beginStop(String resourceGroupName, String factoryName, String triggerName);
/**
@@ -415,7 +415,7 @@ SyncPoller, Void> beginStart(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
SyncPoller, Void> beginStop(
String resourceGroupName, String factoryName, String triggerName, Context context);
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 42fc84ab19b1..83165b1a3afe 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,9 +11,11 @@
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. */
@@ -22,14 +24,22 @@ public final class ExecutePowerQueryActivityTypeProperties extends ExecuteDataFl
@JsonIgnore private final ClientLogger logger = new ClientLogger(ExecutePowerQueryActivityTypeProperties.class);
/*
- * List of Power Query activity sinks mapped to a queryName.
+ * (Deprecated. Please use Queries). 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: List of Power Query activity sinks mapped to a queryName.
+ * Get the sinks property: (Deprecated. Please use Queries). List of Power Query activity sinks mapped to a
+ * queryName.
*
* @return the sinks value.
*/
@@ -38,7 +48,8 @@ public Map sinks() {
}
/**
- * Set the sinks property: List of Power Query activity sinks mapped to a queryName.
+ * Set the sinks property: (Deprecated. Please use Queries). List of Power Query activity sinks mapped to a
+ * queryName.
*
* @param sinks the sinks value to set.
* @return the ExecutePowerQueryActivityTypeProperties object itself.
@@ -48,6 +59,26 @@ 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) {
@@ -116,5 +147,8 @@ 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
new file mode 100644
index 000000000000..4c590f2b6f44
--- /dev/null
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/FlowletTypeProperties.java
@@ -0,0 +1,193 @@
+// 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;
+
+ /*
+ * Any object
+ */
+ @JsonProperty(value = "additionalProperties")
+ private Object additionalProperties;
+
+ /**
+ * 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;
+ }
+
+ /**
+ * Get the additionalProperties property: Any object.
+ *
+ * @return the additionalProperties value.
+ */
+ public Object additionalProperties() {
+ return this.additionalProperties;
+ }
+
+ /**
+ * Set the additionalProperties property: Any object.
+ *
+ * @param additionalProperties the additionalProperties value to set.
+ * @return the FlowletTypeProperties object itself.
+ */
+ public FlowletTypeProperties withAdditionalProperties(Object additionalProperties) {
+ this.additionalProperties = additionalProperties;
+ 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 555f061d9142..85fb658d581f 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,6 +42,12 @@ 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.
*
@@ -122,6 +128,26 @@ 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/PowerQueryTypeProperties.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/models/PowerQueryTypeProperties.java
index 4e6395a81700..6f124d5aaf58 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,6 +28,12 @@ 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.
*
@@ -68,6 +74,26 @@ 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/implementation/DataFlowDebugSessionsClientImpl.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/DataFlowDebugSessionsClientImpl.java
index 45da2af83323..c72c383db0ac 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/DataFlowDebugSessionsClientImpl.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/DataFlowDebugSessionsClientImpl.java
@@ -283,7 +283,7 @@ private Mono>> createWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure for creating data flow debug session.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, CreateDataFlowDebugSessionResponseInner>
beginCreateAsync(String resourceGroupName, String factoryName, CreateDataFlowDebugSessionRequest request) {
Mono>> mono = createWithResponseAsync(resourceGroupName, factoryName, request);
@@ -309,7 +309,7 @@ private Mono>> createWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure for creating data flow debug session.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, CreateDataFlowDebugSessionResponseInner>
beginCreateAsync(
String resourceGroupName, String factoryName, CreateDataFlowDebugSessionRequest request, Context context) {
@@ -337,7 +337,7 @@ private Mono>> createWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure for creating data flow debug session.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, CreateDataFlowDebugSessionResponseInner>
beginCreate(String resourceGroupName, String factoryName, CreateDataFlowDebugSessionRequest request) {
return beginCreateAsync(resourceGroupName, factoryName, request).getSyncPoller();
@@ -355,7 +355,7 @@ private Mono>> createWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure for creating data flow debug session.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, CreateDataFlowDebugSessionResponseInner>
beginCreate(
String resourceGroupName, String factoryName, CreateDataFlowDebugSessionRequest request, Context context) {
@@ -1062,7 +1062,7 @@ private Mono>> executeCommandWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure of data flow result for data preview, statistics or expression preview.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, DataFlowDebugCommandResponseInner>
beginExecuteCommandAsync(String resourceGroupName, String factoryName, DataFlowDebugCommandRequest request) {
Mono>> mono =
@@ -1089,7 +1089,7 @@ private Mono>> executeCommandWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure of data flow result for data preview, statistics or expression preview.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, DataFlowDebugCommandResponseInner>
beginExecuteCommandAsync(
String resourceGroupName, String factoryName, DataFlowDebugCommandRequest request, Context context) {
@@ -1117,7 +1117,7 @@ private Mono>> executeCommandWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure of data flow result for data preview, statistics or expression preview.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, DataFlowDebugCommandResponseInner>
beginExecuteCommand(String resourceGroupName, String factoryName, DataFlowDebugCommandRequest request) {
return beginExecuteCommandAsync(resourceGroupName, factoryName, request).getSyncPoller();
@@ -1135,7 +1135,7 @@ private Mono>> executeCommandWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return response body structure of data flow result for data preview, statistics or expression preview.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, DataFlowDebugCommandResponseInner>
beginExecuteCommand(
String resourceGroupName, String factoryName, DataFlowDebugCommandRequest request, Context context) {
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/FactoryImpl.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/FactoryImpl.java
index 798a92bb24ee..9256c83eaed8 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/FactoryImpl.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/FactoryImpl.java
@@ -288,8 +288,13 @@ public FactoryImpl withEncryption(EncryptionConfiguration encryption) {
}
public FactoryImpl withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
- this.innerModel().withPublicNetworkAccess(publicNetworkAccess);
- return this;
+ if (isInCreateMode()) {
+ this.innerModel().withPublicNetworkAccess(publicNetworkAccess);
+ return this;
+ } else {
+ this.updateFactoryUpdateParameters.withPublicNetworkAccess(publicNetworkAccess);
+ return this;
+ }
}
public FactoryImpl withIfMatch(String ifMatch) {
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/IntegrationRuntimeObjectMetadatasClientImpl.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/IntegrationRuntimeObjectMetadatasClientImpl.java
index 4abe5cf1a4a2..bd8fd5ed5c03 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/IntegrationRuntimeObjectMetadatasClientImpl.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/IntegrationRuntimeObjectMetadatasClientImpl.java
@@ -221,7 +221,7 @@ private Mono>> refreshWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the status of the operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, SsisObjectMetadataStatusResponseInner>
beginRefreshAsync(String resourceGroupName, String factoryName, String integrationRuntimeName) {
Mono>> mono =
@@ -248,7 +248,7 @@ private Mono>> refreshWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the status of the operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, SsisObjectMetadataStatusResponseInner>
beginRefreshAsync(
String resourceGroupName, String factoryName, String integrationRuntimeName, Context context) {
@@ -276,7 +276,7 @@ private Mono>> refreshWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the status of the operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, SsisObjectMetadataStatusResponseInner>
beginRefresh(String resourceGroupName, String factoryName, String integrationRuntimeName) {
return beginRefreshAsync(resourceGroupName, factoryName, integrationRuntimeName).getSyncPoller();
@@ -294,7 +294,7 @@ private Mono>> refreshWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the status of the operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, SsisObjectMetadataStatusResponseInner>
beginRefresh(String resourceGroupName, String factoryName, String integrationRuntimeName, Context context) {
return beginRefreshAsync(resourceGroupName, factoryName, integrationRuntimeName, context).getSyncPoller();
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/IntegrationRuntimesClientImpl.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/IntegrationRuntimesClientImpl.java
index 4dc6d0d9f2c4..eb03ef99ca16 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/IntegrationRuntimesClientImpl.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/IntegrationRuntimesClientImpl.java
@@ -2408,7 +2408,7 @@ private Mono>> startWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return integration runtime status response.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, IntegrationRuntimeStatusResponseInner>
beginStartAsync(String resourceGroupName, String factoryName, String integrationRuntimeName) {
Mono>> mono =
@@ -2435,7 +2435,7 @@ private Mono>> startWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return integration runtime status response.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, IntegrationRuntimeStatusResponseInner>
beginStartAsync(String resourceGroupName, String factoryName, String integrationRuntimeName, Context context) {
context = this.client.mergeContext(context);
@@ -2462,7 +2462,7 @@ private Mono>> startWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return integration runtime status response.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, IntegrationRuntimeStatusResponseInner>
beginStart(String resourceGroupName, String factoryName, String integrationRuntimeName) {
return beginStartAsync(resourceGroupName, factoryName, integrationRuntimeName).getSyncPoller();
@@ -2480,7 +2480,7 @@ private Mono>> startWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return integration runtime status response.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, IntegrationRuntimeStatusResponseInner>
beginStart(String resourceGroupName, String factoryName, String integrationRuntimeName, Context context) {
return beginStartAsync(resourceGroupName, factoryName, integrationRuntimeName, context).getSyncPoller();
@@ -2679,7 +2679,7 @@ private Mono>> stopWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, Void> beginStopAsync(
String resourceGroupName, String factoryName, String integrationRuntimeName) {
Mono>> mono =
@@ -2701,7 +2701,7 @@ private PollerFlux, Void> beginStopAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, Void> beginStopAsync(
String resourceGroupName, String factoryName, String integrationRuntimeName, Context context) {
context = this.client.mergeContext(context);
@@ -2723,7 +2723,7 @@ private PollerFlux, Void> beginStopAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, Void> beginStop(
String resourceGroupName, String factoryName, String integrationRuntimeName) {
return beginStopAsync(resourceGroupName, factoryName, integrationRuntimeName).getSyncPoller();
@@ -2741,7 +2741,7 @@ public SyncPoller, Void> beginStop(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, Void> beginStop(
String resourceGroupName, String factoryName, String integrationRuntimeName, Context context) {
return beginStopAsync(resourceGroupName, factoryName, integrationRuntimeName, context).getSyncPoller();
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/TriggersClientImpl.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/TriggersClientImpl.java
index 878d71fb4614..2f79e170e3c3 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/TriggersClientImpl.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/implementation/TriggersClientImpl.java
@@ -1299,7 +1299,7 @@ private Mono>> subscribeToEventsWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, TriggerSubscriptionOperationStatusInner>
beginSubscribeToEventsAsync(String resourceGroupName, String factoryName, String triggerName) {
Mono>> mono =
@@ -1326,7 +1326,7 @@ private Mono>> subscribeToEventsWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, TriggerSubscriptionOperationStatusInner>
beginSubscribeToEventsAsync(String resourceGroupName, String factoryName, String triggerName, Context context) {
context = this.client.mergeContext(context);
@@ -1353,7 +1353,7 @@ private Mono>> subscribeToEventsWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, TriggerSubscriptionOperationStatusInner>
beginSubscribeToEvents(String resourceGroupName, String factoryName, String triggerName) {
return beginSubscribeToEventsAsync(resourceGroupName, factoryName, triggerName).getSyncPoller();
@@ -1371,7 +1371,7 @@ private Mono>> subscribeToEventsWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, TriggerSubscriptionOperationStatusInner>
beginSubscribeToEvents(String resourceGroupName, String factoryName, String triggerName, Context context) {
return beginSubscribeToEventsAsync(resourceGroupName, factoryName, triggerName, context).getSyncPoller();
@@ -1731,7 +1731,7 @@ private Mono>> unsubscribeFromEventsWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, TriggerSubscriptionOperationStatusInner>
beginUnsubscribeFromEventsAsync(String resourceGroupName, String factoryName, String triggerName) {
Mono>> mono =
@@ -1758,7 +1758,7 @@ private Mono>> unsubscribeFromEventsWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, TriggerSubscriptionOperationStatusInner>
beginUnsubscribeFromEventsAsync(
String resourceGroupName, String factoryName, String triggerName, Context context) {
@@ -1786,7 +1786,7 @@ private Mono>> unsubscribeFromEventsWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, TriggerSubscriptionOperationStatusInner>
beginUnsubscribeFromEvents(String resourceGroupName, String factoryName, String triggerName) {
return beginUnsubscribeFromEventsAsync(resourceGroupName, factoryName, triggerName).getSyncPoller();
@@ -1804,7 +1804,7 @@ private Mono>> unsubscribeFromEventsWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return defines the response of a trigger subscription operation.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, TriggerSubscriptionOperationStatusInner>
beginUnsubscribeFromEvents(String resourceGroupName, String factoryName, String triggerName, Context context) {
return beginUnsubscribeFromEventsAsync(resourceGroupName, factoryName, triggerName, context).getSyncPoller();
@@ -1999,7 +1999,7 @@ private Mono>> startWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, Void> beginStartAsync(
String resourceGroupName, String factoryName, String triggerName) {
Mono>> mono = startWithResponseAsync(resourceGroupName, factoryName, triggerName);
@@ -2020,7 +2020,7 @@ private PollerFlux, Void> beginStartAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, Void> beginStartAsync(
String resourceGroupName, String factoryName, String triggerName, Context context) {
context = this.client.mergeContext(context);
@@ -2042,7 +2042,7 @@ private PollerFlux, Void> beginStartAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, Void> beginStart(
String resourceGroupName, String factoryName, String triggerName) {
return beginStartAsync(resourceGroupName, factoryName, triggerName).getSyncPoller();
@@ -2060,7 +2060,7 @@ public SyncPoller, Void> beginStart(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, Void> beginStart(
String resourceGroupName, String factoryName, String triggerName, Context context) {
return beginStartAsync(resourceGroupName, factoryName, triggerName, context).getSyncPoller();
@@ -2249,7 +2249,7 @@ private Mono>> stopWithResponseAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, Void> beginStopAsync(
String resourceGroupName, String factoryName, String triggerName) {
Mono>> mono = stopWithResponseAsync(resourceGroupName, factoryName, triggerName);
@@ -2270,7 +2270,7 @@ private PollerFlux, Void> beginStopAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
private PollerFlux, Void> beginStopAsync(
String resourceGroupName, String factoryName, String triggerName, Context context) {
context = this.client.mergeContext(context);
@@ -2292,7 +2292,7 @@ private PollerFlux, Void> beginStopAsync(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, Void> beginStop(
String resourceGroupName, String factoryName, String triggerName) {
return beginStopAsync(resourceGroupName, factoryName, triggerName).getSyncPoller();
@@ -2310,7 +2310,7 @@ public SyncPoller, Void> beginStop(
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the completion.
*/
- @ServiceMethod(returns = ReturnType.SINGLE)
+ @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
public SyncPoller, Void> beginStop(
String resourceGroupName, String factoryName, String triggerName, Context context) {
return beginStopAsync(resourceGroupName, factoryName, triggerName, context).getSyncPoller();
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/CredentialReference.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/CredentialReference.java
index aebbb2950347..9dbbdfed8186 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/CredentialReference.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/CredentialReference.java
@@ -22,7 +22,7 @@ public final class CredentialReference {
* Credential reference type.
*/
@JsonProperty(value = "type", required = true)
- private String type;
+ private String type = "CredentialReference";
/*
* Reference credential name.
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 20ebcbeea48c..cceda40c1bf5 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,6 +22,7 @@
@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 87521ba07a1a..49aa50d5ab3b 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,6 +31,12 @@ public final class DataFlowDebugPackage {
@JsonProperty(value = "dataFlow")
private DataFlowDebugResource dataFlow;
+ /*
+ * List of Data flows
+ */
+ @JsonProperty(value = "dataFlows")
+ private List dataFlows;
+
/*
* List of datasets.
*/
@@ -100,6 +106,26 @@ 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.
*
@@ -218,6 +244,9 @@ 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 3ae0b8eaddbd..d3027b8e2872 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,6 +9,7 @@
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;
@@ -22,7 +23,7 @@ public final class DataFlowReference {
* Data flow reference type.
*/
@JsonProperty(value = "type", required = true)
- private String type;
+ private String type = "DataFlowReference";
/*
* Reference data flow name.
@@ -36,6 +37,13 @@ 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.
*/
@@ -106,6 +114,26 @@ 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 8e336a3c3419..547cbb2ad59c 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
@@ -106,6 +106,13 @@ public DataFlowSink withDescription(String description) {
return this;
}
+ /** {@inheritDoc} */
+ @Override
+ public DataFlowSink withFlowlet(DataFlowReference flowlet) {
+ super.withFlowlet(flowlet);
+ return this;
+ }
+
/**
* Validates the instance.
*
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 14df3a146e38..e1e76e7b977f 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
@@ -106,6 +106,13 @@ public DataFlowSource withDescription(String description) {
return this;
}
+ /** {@inheritDoc} */
+ @Override
+ public DataFlowSource withFlowlet(DataFlowReference flowlet) {
+ super.withFlowlet(flowlet);
+ return this;
+ }
+
/**
* Validates the instance.
*
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetReference.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetReference.java
index eb32474a589a..6e51f831d803 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetReference.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/DatasetReference.java
@@ -20,7 +20,7 @@ public final class DatasetReference {
* Dataset reference type.
*/
@JsonProperty(value = "type", required = true)
- private String type;
+ private String type = "DatasetReference";
/*
* Reference dataset name.
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 07388f1832da..dac8014a64e8 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,7 +91,8 @@ public ExecuteWranglingDataflowActivity withUserProperties(List us
}
/**
- * Get the sinks property: List of Power Query activity sinks mapped to a queryName.
+ * Get the sinks property: (Deprecated. Please use Queries). List of Power Query activity sinks mapped to a
+ * queryName.
*
* @return the sinks value.
*/
@@ -100,7 +101,8 @@ public Map sinks() {
}
/**
- * Set the sinks property: List of Power Query activity sinks mapped to a queryName.
+ * Set the sinks property: (Deprecated. Please use Queries). List of Power Query activity sinks mapped to a
+ * queryName.
*
* @param sinks the sinks value to set.
* @return the ExecuteWranglingDataflowActivity object itself.
@@ -113,6 +115,29 @@ 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/Expression.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Expression.java
index 3dfad37c19b2..9a1800dfa309 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Expression.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Expression.java
@@ -18,7 +18,7 @@ public final class Expression {
* Expression type.
*/
@JsonProperty(value = "type", required = true)
- private String type;
+ private String type = "Expression";
/*
* Expression value.
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Factory.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Factory.java
index c0ea926d45ea..5f667d11ee8e 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Factory.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Factory.java
@@ -299,7 +299,7 @@ interface WithIfMatch {
Factory.Update update();
/** The template for Factory update. */
- interface Update extends UpdateStages.WithTags, UpdateStages.WithIdentity {
+ interface Update extends UpdateStages.WithTags, UpdateStages.WithIdentity, UpdateStages.WithPublicNetworkAccess {
/**
* Executes the update request.
*
@@ -337,6 +337,17 @@ interface WithIdentity {
*/
Update withIdentity(FactoryIdentity identity);
}
+ /** The stage of the Factory update allowing to specify publicNetworkAccess. */
+ interface WithPublicNetworkAccess {
+ /**
+ * Specifies the publicNetworkAccess property: Whether or not public network access is allowed for the data
+ * factory..
+ *
+ * @param publicNetworkAccess Whether or not public network access is allowed for the data factory.
+ * @return the next definition stage.
+ */
+ Update withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess);
+ }
}
/**
* Refreshes the resource to sync with Azure.
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/FactoryUpdateParameters.java b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/FactoryUpdateParameters.java
index 472ea3c0b550..ee779d40c7d5 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/FactoryUpdateParameters.java
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/FactoryUpdateParameters.java
@@ -29,6 +29,12 @@ public final class FactoryUpdateParameters {
@JsonProperty(value = "identity")
private FactoryIdentity identity;
+ /*
+ * Whether or not public network access is allowed for the data factory.
+ */
+ @JsonProperty(value = "publicNetworkAccess")
+ private PublicNetworkAccess publicNetworkAccess;
+
/**
* Get the tags property: The resource tags.
*
@@ -69,6 +75,26 @@ public FactoryUpdateParameters withIdentity(FactoryIdentity identity) {
return this;
}
+ /**
+ * Get the publicNetworkAccess property: Whether or not public network access is allowed for the data factory.
+ *
+ * @return the publicNetworkAccess value.
+ */
+ public PublicNetworkAccess publicNetworkAccess() {
+ return this.publicNetworkAccess;
+ }
+
+ /**
+ * Set the publicNetworkAccess property: Whether or not public network access is allowed for the data factory.
+ *
+ * @param publicNetworkAccess the publicNetworkAccess value to set.
+ * @return the FactoryUpdateParameters object itself.
+ */
+ public FactoryUpdateParameters withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
+ this.publicNetworkAccess = publicNetworkAccess;
+ return this;
+ }
+
/**
* Validates the instance.
*
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
new file mode 100644
index 000000000000..1788f38430ea
--- /dev/null
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/models/Flowlet.java
@@ -0,0 +1,247 @@
+// 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.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+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.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/** 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;
+
+ /*
+ * Data flow flowlet
+ */
+ @JsonIgnore private Map additionalProperties;
+
+ /**
+ * Get the innerTypeProperties property: Flowlet type properties.
+ *
+ * @return the innerTypeProperties value.
+ */
+ private FlowletTypeProperties innerTypeProperties() {
+ return this.innerTypeProperties;
+ }
+
+ /**
+ * Get the additionalProperties property: Data flow flowlet.
+ *
+ * @return the additionalProperties value.
+ */
+ @JsonAnyGetter
+ public Map additionalProperties() {
+ return this.additionalProperties;
+ }
+
+ /**
+ * Set the additionalProperties property: Data flow flowlet.
+ *
+ * @param additionalProperties the additionalProperties value to set.
+ * @return the Flowlet object itself.
+ */
+ public Flowlet withAdditionalProperties(Map additionalProperties) {
+ this.additionalProperties = additionalProperties;
+ return this;
+ }
+
+ @JsonAnySetter
+ void withAdditionalProperties(String key, Object value) {
+ if (additionalProperties == null) {
+ additionalProperties = new HashMap<>();
+ }
+ additionalProperties.put(key, value);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Flowlet withDescription(String description) {
+ super.withDescription(description);
+ return this;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Flowlet withAnnotations(List