CodeGen from PR 16633 in Azure/azure-rest-api-specs

Merge 2dbf7252a10bc2c4b31f79d90af9e56e1e654a11 into ad6f098218e4f5eab87e784f1b6fc8a713147cab

Author: SDKAuto

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-11-04)
+
+- 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
 

sdk/datafactory/azure-resourcemanager-datafactory/README.md

@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-datafactory</artifactId>
-    <version>1.0.0-beta.6</version>
+    <version>1.0.0-beta.7</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

sdk/datafactory/azure-resourcemanager-datafactory/SAMPLE.md

@@ -521,8 +521,7 @@ public final class DataFlowsCreateOrUpdateSamples {
                             + " string,CurrentConversionRate as double),allowSchemaDrift: true,validateSchema: false)"
                             + " ~> CADSource\n"
                             + "USDCurrency, CADSource union(byName: true)~> Union\n"
-                            + "Union derive(NewCurrencyRate = round(CurrentConversionRate*1.25)) ~>"
-                            + " NewCurrencyColumn\n"
+                            + "Union derive(NewCurrencyRate = round(CurrentConversionRate*1.25)) ~> NewCurrencyColumn\n"
                             + "NewCurrencyColumn split(Country == 'USD',Country == 'CAD',disjoint: false) ~>"
                             + " ConditionalSplit1@(USD, CAD)\n"
                             + "ConditionalSplit1@USD sink(saveMode:'overwrite' ) ~> USDSink\n"
@@ -577,8 +576,7 @@ public final class DataFlowsCreateOrUpdateSamples {
                             + " string,CurrentConversionRate as double),allowSchemaDrift: true,validateSchema: false)"
                             + " ~> CADSource\n"
                             + "USDCurrency, CADSource union(byName: true)~> Union\n"
-                            + "Union derive(NewCurrencyRate = round(CurrentConversionRate*1.25)) ~>"
-                            + " NewCurrencyColumn\n"
+                            + "Union derive(NewCurrencyRate = round(CurrentConversionRate*1.25)) ~> NewCurrencyColumn\n"
                             + "NewCurrencyColumn split(Country == 'USD',Country == 'CAD',disjoint: false) ~>"
                             + " ConditionalSplit1@(USD, CAD)\n"
                             + "ConditionalSplit1@USD sink(saveMode:'overwrite' ) ~> USDSink\n"

sdk/datafactory/azure-resourcemanager-datafactory/pom.xml

@@ -38,7 +38,10 @@
   </developers>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    <jacoco.skip.coverage.check>true</jacoco.skip.coverage.check>
+    <skipNewCodesnippetTooling>false</skipNewCodesnippetTooling>
+    <javadocDoclet></javadocDoclet>
+    <javadocDocletOptions></javadocDocletOptions>
   </properties>
   <dependencies>
     <dependency>
@@ -84,14 +87,6 @@
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.7</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.revapi</groupId>
         <artifactId>revapi-maven-plugin</artifactId>

sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/DataFactoryManager.java

@@ -8,6 +8,7 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
+import com.azure.core.http.HttpPipelinePosition;
 import com.azure.core.http.policy.AddDatePolicy;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpLoggingPolicy;
@@ -67,6 +68,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * Entry point to DataFactoryManager. The Azure Data Factory V2 management API provides a RESTful set of web services
@@ -249,7 +251,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(" (")
@@ -272,11 +274,24 @@ public DataFactoryManager authenticate(TokenCredential credential, AzureProfile
             List<HttpPipelinePolicy> policies = new ArrayList<>();
             policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
             policies.add(new RequestIdPolicy());
+            policies
+                .addAll(
+                    this
+                        .policies
+                        .stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
+                        .collect(Collectors.toList()));
             HttpPolicyProviders.addBeforeRetryPolicies(policies);
             policies.add(retryPolicy);
             policies.add(new AddDatePolicy());
             policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
-            policies.addAll(this.policies);
+            policies
+                .addAll(
+                    this
+                        .policies
+                        .stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
+                        .collect(Collectors.toList()));
             HttpPolicyProviders.addAfterRetryPolicies(policies);
             policies.add(new HttpLoggingPolicy(httpLogOptions));
             HttpPipeline httpPipeline =

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<PollResult<CreateDataFlowDebugSessionResponseInner>, 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<PollResult<CreateDataFlowDebugSessionResponseInner>, CreateDataFlowDebugSessionResponseInner>
         beginCreate(
             String resourceGroupName, String factoryName, CreateDataFlowDebugSessionRequest request, Context context);
@@ -184,7 +184,7 @@ Response<Void> 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<PollResult<DataFlowDebugCommandResponseInner>, DataFlowDebugCommandResponseInner> beginExecuteCommand(
         String resourceGroupName, String factoryName, DataFlowDebugCommandRequest request);
 
@@ -200,7 +200,7 @@ SyncPoller<PollResult<DataFlowDebugCommandResponseInner>, 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<PollResult<DataFlowDebugCommandResponseInner>, DataFlowDebugCommandResponseInner> beginExecuteCommand(
         String resourceGroupName, String factoryName, DataFlowDebugCommandRequest request, Context context);
 

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<PollResult<SsisObjectMetadataStatusResponseInner>, SsisObjectMetadataStatusResponseInner> beginRefresh(
         String resourceGroupName, String factoryName, String integrationRuntimeName);
 
@@ -45,7 +45,7 @@ SyncPoller<PollResult<SsisObjectMetadataStatusResponseInner>, 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<PollResult<SsisObjectMetadataStatusResponseInner>, SsisObjectMetadataStatusResponseInner> beginRefresh(
         String resourceGroupName, String factoryName, String integrationRuntimeName, Context context);
 

sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/IntegrationRuntimesClient.java

@@ -380,7 +380,7 @@ Response<IntegrationRuntimeAuthKeysInner> 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<PollResult<IntegrationRuntimeStatusResponseInner>, IntegrationRuntimeStatusResponseInner> beginStart(
         String resourceGroupName, String factoryName, String integrationRuntimeName);
 
@@ -396,7 +396,7 @@ SyncPoller<PollResult<IntegrationRuntimeStatusResponseInner>, 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<PollResult<IntegrationRuntimeStatusResponseInner>, 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<PollResult<Void>, Void> beginStop(
         String resourceGroupName, String factoryName, String integrationRuntimeName);
 
@@ -458,7 +458,7 @@ SyncPoller<PollResult<Void>, 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<PollResult<Void>, Void> beginStop(
         String resourceGroupName, String factoryName, String integrationRuntimeName, Context context);
 

sdk/datafactory/azure-resourcemanager-datafactory/src/main/java/com/azure/resourcemanager/datafactory/fluent/TriggersClient.java

@@ -188,7 +188,7 @@ Response<Void> 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<PollResult<TriggerSubscriptionOperationStatusInner>, TriggerSubscriptionOperationStatusInner>
         beginSubscribeToEvents(String resourceGroupName, String factoryName, String triggerName);
 
@@ -204,7 +204,7 @@ Response<Void> 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<PollResult<TriggerSubscriptionOperationStatusInner>, TriggerSubscriptionOperationStatusInner>
         beginSubscribeToEvents(String resourceGroupName, String factoryName, String triggerName, Context context);
 
@@ -281,7 +281,7 @@ Response<TriggerSubscriptionOperationStatusInner> 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<PollResult<TriggerSubscriptionOperationStatusInner>, TriggerSubscriptionOperationStatusInner>
         beginUnsubscribeFromEvents(String resourceGroupName, String factoryName, String triggerName);
 
@@ -297,7 +297,7 @@ Response<TriggerSubscriptionOperationStatusInner> 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<PollResult<TriggerSubscriptionOperationStatusInner>, 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<PollResult<Void>, 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<PollResult<Void>, Void> beginStart(
         String resourceGroupName, String factoryName, String triggerName, Context context);
 
@@ -400,7 +400,7 @@ SyncPoller<PollResult<Void>, 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<PollResult<Void>, Void> beginStop(String resourceGroupName, String factoryName, String triggerName);
 
     /**
@@ -415,7 +415,7 @@ SyncPoller<PollResult<Void>, 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<PollResult<Void>, Void> beginStop(
         String resourceGroupName, String factoryName, String triggerName, Context context);
 

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<String, PowerQuerySink> sinks;
 
+    /*
+     * List of mapping for Power Query mashup query to sink dataset(s).
+     */
+    @JsonProperty(value = "queries")
+    private List<PowerQuerySinkMapping> 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<String, PowerQuerySink> 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<String, PowerQueryS
         return this;
     }
 
+    /**
+     * Get the queries property: List of mapping for Power Query mashup query to sink dataset(s).
+     *
+     * @return the queries value.
+     */
+    public List<PowerQuerySinkMapping> 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<PowerQuerySinkMapping> 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());
+        }
     }
 }