[AutoPR datafactory/resource-manager] [Datafactory] DatabricksSparkJarActivity, DatabricksSparkPythonActivity and other D…

datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/AzureDatabricksLinkedService.java

@@ -73,6 +73,12 @@ public class AzureDatabricksLinkedService extends LinkedServiceInner {
     @JsonProperty(value = "typeProperties.newClusterSparkConf")
     private Map<String, Object> newClusterSparkConf;
 
+    /**
+     * Additional tags for cluster resources.
+     */
+    @JsonProperty(value = "typeProperties.newClusterCustomTags")
+    private Map<String, Object> newClusterCustomTags;
+
     /**
      * The encrypted credential used for authentication. Credentials are
      * encrypted using the integration runtime credential manager. Type: string
@@ -221,6 +227,26 @@ public AzureDatabricksLinkedService withNewClusterSparkConf(Map<String, Object>
         return this;
     }
 
+    /**
+     * Get additional tags for cluster resources.
+     *
+     * @return the newClusterCustomTags value
+     */
+    public Map<String, Object> newClusterCustomTags() {
+        return this.newClusterCustomTags;
+    }
+
+    /**
+     * Set additional tags for cluster resources.
+     *
+     * @param newClusterCustomTags the newClusterCustomTags value to set
+     * @return the AzureDatabricksLinkedService object itself.
+     */
+    public AzureDatabricksLinkedService withNewClusterCustomTags(Map<String, Object> newClusterCustomTags) {
+        this.newClusterCustomTags = newClusterCustomTags;
+        return this;
+    }
+
     /**
      * Get the encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).
      *

datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/DatabricksNotebookActivity.java

@@ -9,6 +9,7 @@
 package com.microsoft.azure.management.datafactoryv2.v2018_06_01;
 
 import java.util.Map;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -37,6 +38,13 @@ public class DatabricksNotebookActivity extends ExecutionActivity {
     @JsonProperty(value = "typeProperties.baseParameters")
     private Map<String, Object> baseParameters;
 
+    /**
+     * A list of libraries to be installed on the cluster that will execute the
+     * job.
+     */
+    @JsonProperty(value = "typeProperties.libraries")
+    private List<Map<String, Object>> libraries;
+
     /**
      * Get the absolute path of the notebook to be run in the Databricks Workspace. This path must begin with a slash. Type: string (or Expression with resultType string).
      *
@@ -77,4 +85,24 @@ public DatabricksNotebookActivity withBaseParameters(Map<String, Object> basePar
         return this;
     }
 
+    /**
+     * Get a list of libraries to be installed on the cluster that will execute the job.
+     *
+     * @return the libraries value
+     */
+    public List<Map<String, Object>> libraries() {
+        return this.libraries;
+    }
+
+    /**
+     * Set a list of libraries to be installed on the cluster that will execute the job.
+     *
+     * @param libraries the libraries value to set
+     * @return the DatabricksNotebookActivity object itself.
+     */
+    public DatabricksNotebookActivity withLibraries(List<Map<String, Object>> libraries) {
+        this.libraries = libraries;
+        return this;
+    }
+
 }

datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/DatabricksSparkJarActivity.java

@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datafactoryv2.v2018_06_01;
+
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * DatabricksSparkJar activity.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("DatabricksSparkJar")
+@JsonFlatten
+public class DatabricksSparkJarActivity extends ExecutionActivity {
+    /**
+     * The full name of the class containing the main method to be executed.
+     * This class must be contained in a JAR provided as a library. Type:
+     * string (or Expression with resultType string).
+     */
+    @JsonProperty(value = "typeProperties.mainClassName", required = true)
+    private Object mainClassName;
+
+    /**
+     * Parameters that will be passed to the main method.
+     */
+    @JsonProperty(value = "typeProperties.parameters")
+    private List<Object> parameters;
+
+    /**
+     * A list of libraries to be installed on the cluster that will execute the
+     * job.
+     */
+    @JsonProperty(value = "typeProperties.libraries")
+    private List<Map<String, Object>> libraries;
+
+    /**
+     * Get the full name of the class containing the main method to be executed. This class must be contained in a JAR provided as a library. Type: string (or Expression with resultType string).
+     *
+     * @return the mainClassName value
+     */
+    public Object mainClassName() {
+        return this.mainClassName;
+    }
+
+    /**
+     * Set the full name of the class containing the main method to be executed. This class must be contained in a JAR provided as a library. Type: string (or Expression with resultType string).
+     *
+     * @param mainClassName the mainClassName value to set
+     * @return the DatabricksSparkJarActivity object itself.
+     */
+    public DatabricksSparkJarActivity withMainClassName(Object mainClassName) {
+        this.mainClassName = mainClassName;
+        return this;
+    }
+
+    /**
+     * Get parameters that will be passed to the main method.
+     *
+     * @return the parameters value
+     */
+    public List<Object> parameters() {
+        return this.parameters;
+    }
+
+    /**
+     * Set parameters that will be passed to the main method.
+     *
+     * @param parameters the parameters value to set
+     * @return the DatabricksSparkJarActivity object itself.
+     */
+    public DatabricksSparkJarActivity withParameters(List<Object> parameters) {
+        this.parameters = parameters;
+        return this;
+    }
+
+    /**
+     * Get a list of libraries to be installed on the cluster that will execute the job.
+     *
+     * @return the libraries value
+     */
+    public List<Map<String, Object>> libraries() {
+        return this.libraries;
+    }
+
+    /**
+     * Set a list of libraries to be installed on the cluster that will execute the job.
+     *
+     * @param libraries the libraries value to set
+     * @return the DatabricksSparkJarActivity object itself.
+     */
+    public DatabricksSparkJarActivity withLibraries(List<Map<String, Object>> libraries) {
+        this.libraries = libraries;
+        return this;
+    }
+
+}

datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/DatabricksSparkPythonActivity.java

@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datafactoryv2.v2018_06_01;
+
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * DatabricksSparkPython activity.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("DatabricksSparkPython")
+@JsonFlatten
+public class DatabricksSparkPythonActivity extends ExecutionActivity {
+    /**
+     * The URI of the Python file to be executed. DBFS paths are supported.
+     * Type: string (or Expression with resultType string).
+     */
+    @JsonProperty(value = "typeProperties.pythonFile", required = true)
+    private Object pythonFile;
+
+    /**
+     * Command line parameters that will be passed to the Python file.
+     */
+    @JsonProperty(value = "typeProperties.parameters")
+    private List<Object> parameters;
+
+    /**
+     * A list of libraries to be installed on the cluster that will execute the
+     * job.
+     */
+    @JsonProperty(value = "typeProperties.libraries")
+    private List<Map<String, Object>> libraries;
+
+    /**
+     * Get the URI of the Python file to be executed. DBFS paths are supported. Type: string (or Expression with resultType string).
+     *
+     * @return the pythonFile value
+     */
+    public Object pythonFile() {
+        return this.pythonFile;
+    }
+
+    /**
+     * Set the URI of the Python file to be executed. DBFS paths are supported. Type: string (or Expression with resultType string).
+     *
+     * @param pythonFile the pythonFile value to set
+     * @return the DatabricksSparkPythonActivity object itself.
+     */
+    public DatabricksSparkPythonActivity withPythonFile(Object pythonFile) {
+        this.pythonFile = pythonFile;
+        return this;
+    }
+
+    /**
+     * Get command line parameters that will be passed to the Python file.
+     *
+     * @return the parameters value
+     */
+    public List<Object> parameters() {
+        return this.parameters;
+    }
+
+    /**
+     * Set command line parameters that will be passed to the Python file.
+     *
+     * @param parameters the parameters value to set
+     * @return the DatabricksSparkPythonActivity object itself.
+     */
+    public DatabricksSparkPythonActivity withParameters(List<Object> parameters) {
+        this.parameters = parameters;
+        return this;
+    }
+
+    /**
+     * Get a list of libraries to be installed on the cluster that will execute the job.
+     *
+     * @return the libraries value
+     */
+    public List<Map<String, Object>> libraries() {
+        return this.libraries;
+    }
+
+    /**
+     * Set a list of libraries to be installed on the cluster that will execute the job.
+     *
+     * @param libraries the libraries value to set
+     * @return the DatabricksSparkPythonActivity object itself.
+     */
+    public DatabricksSparkPythonActivity withLibraries(List<Map<String, Object>> libraries) {
+        this.libraries = libraries;
+        return this;
+    }
+
+}

datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/ExecutionActivity.java

@@ -19,6 +19,8 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonTypeName("Execution")
 @JsonSubTypes({
+    @JsonSubTypes.Type(name = "DatabricksSparkPython", value = DatabricksSparkPythonActivity.class),
+    @JsonSubTypes.Type(name = "DatabricksSparkJar", value = DatabricksSparkJarActivity.class),
     @JsonSubTypes.Type(name = "DatabricksNotebook", value = DatabricksNotebookActivity.class),
     @JsonSubTypes.Type(name = "DataLakeAnalyticsU-SQL", value = DataLakeAnalyticsUSQLActivity.class),
     @JsonSubTypes.Type(name = "AzureMLUpdateResource", value = AzureMLUpdateResourceActivity.class),

datafactoryv2/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/datafactoryv2/v2018_06_01/SelfHostedIntegrationRuntimeStatus.java

@@ -110,13 +110,6 @@ public class SelfHostedIntegrationRuntimeStatus extends IntegrationRuntimeStatus
     @JsonProperty(value = "typeProperties.links")
     private List<LinkedIntegrationRuntime> links;
 
-    /**
-     * The MSI-s of the data factories to which the integration runtime is
-     * shared.
-     */
-    @JsonProperty(value = "typeProperties.sharedWithFactories", access = JsonProperty.Access.WRITE_ONLY)
-    private List<String> sharedWithFactories;
-
     /**
      * The version that the integration runtime is going to update to.
      */
@@ -268,15 +261,6 @@ public SelfHostedIntegrationRuntimeStatus withLinks(List<LinkedIntegrationRuntim
         return this;
     }
 
-    /**
-     * Get the MSI-s of the data factories to which the integration runtime is shared.
-     *
-     * @return the sharedWithFactories value
-     */
-    public List<String> sharedWithFactories() {
-        return this.sharedWithFactories;
-    }
-
     /**
      * Get the version that the integration runtime is going to update to.
      *