fix build error

Author: hackergin

dolphinscheduler-task-plugin/dolphinscheduler-task-flink-materialized-table/pom.xml

@@ -42,20 +42,10 @@
             <artifactId>dolphinscheduler-datasource-all</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-filesystem-test-utils</artifactId>
-            <version>1.20-SNAPSHOT</version>
-        </dependency>
         <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java</artifactId>
-            <version>1.20-SNAPSHOT</version>
+            <groupId>org.apache.dolphinscheduler</groupId>
+            <artifactId>dolphinscheduler-common</artifactId>
+            <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-files</artifactId>
-            <version>1.20-SNAPSHOT</version>
-        </dependency> -->
     </dependencies>
 </project>

dolphinscheduler-task-plugin/dolphinscheduler-task-flink-materialized-table/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkMaterializedTableTaskChannel.java

@@ -22,8 +22,6 @@
 import org.apache.dolphinscheduler.plugin.task.api.TaskChannel;
 import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
 import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
-import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode;
-import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper;
 
 /**
  * Flink Materialized Table Task Channel.
@@ -33,18 +31,6 @@
  */
 public class FlinkMaterializedTableTaskChannel implements TaskChannel {
 
-    /**
-     * Cancels the application.
-     * 
-     * This method is not used in this implementation as the task is handled directly.
-     *
-     * @param status The status of the cancellation operation
-     */
-    @Override
-    public void cancelApplication(boolean status) {
-        // Not used in this implementation
-    }
-
     /**
      * Creates a new Flink Materialized Table task instance.
      *
@@ -56,25 +42,8 @@ public AbstractTask createTask(TaskExecutionContext taskRequest) {
         return new FlinkMaterializedTableTask(taskRequest);
     }
 
-    /**
-     * Parses the task parameters from the parameters node.
-     *
-     * @param parametersNode The parameters node containing task configuration
-     * @return Parsed FlinkMaterializedTableParameters instance
-     */
-    @Override
-    public AbstractParameters parseParameters(ParametersNode parametersNode) {
-        return JSONUtils.parseObject(parametersNode.getTaskParams(), FlinkMaterializedTableParameters.class);
-    }
-
-    /**
-     * Gets the resource parameters helper for the task.
-     *
-     * @param parameters The task parameters as a JSON string
-     * @return ResourceParametersHelper instance for managing task resources
-     */
     @Override
-    public ResourceParametersHelper getResources(String parameters) {
-        return JSONUtils.parseObject(parameters, FlinkMaterializedTableParameters.class).getResources();
+    public AbstractParameters parseParameters(String taskParams) {
+        return JSONUtils.parseObject(taskParams, FlinkMaterializedTableParameters.class);
     }
 }

dolphinscheduler-task-plugin/dolphinscheduler-task-flink-materialized-table/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkMaterializedTableTaskChannelFactory.java

@@ -19,10 +19,6 @@
 
 import org.apache.dolphinscheduler.plugin.task.api.TaskChannel;
 import org.apache.dolphinscheduler.plugin.task.api.TaskChannelFactory;
-import org.apache.dolphinscheduler.spi.params.base.PluginParams;
-
-import java.util.Collections;
-import java.util.List;
 
 import com.google.auto.service.AutoService;
 
@@ -48,18 +44,6 @@ public String getName() {
         return "FLINK_MATERIALIZED_TABLE";
     }
 
-    /**
-     * Gets the plugin parameters.
-     * 
-     * This method returns the list of parameters that can be configured for this task type.
-     *
-     * @return List of plugin parameters (currently returns null as parameters are handled internally)
-     */
-    @Override
-    public List<PluginParams> getParams() {
-        return Collections.emptyList();
-    }
-
     /**
      * Creates a new task channel instance.
      * 

dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts

@@ -458,14 +458,6 @@ export function formatParams(data: INodeData): {
     taskParams.datasource = data.datasource
   }
 
-  if (data.taskType === 'DYNAMIC') {
-    taskParams.processDefinitionCode = data.processDefinitionCode
-    taskParams.maxNumOfSubWorkflowInstances = data.maxNumOfSubWorkflowInstances
-    taskParams.degreeOfParallelism = data.degreeOfParallelism
-    taskParams.filterCondition = data.filterCondition
-    taskParams.listParameters = data.listParameters
-  }
-
   if (data.taskType === 'FLINK_MATERIALIZED_TABLE') {
     taskParams.identifier = data.identifier
     taskParams.gatewayEndpoint = data.gatewayEndpoint

dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-flink-materialized-table.ts

@@ -56,7 +56,6 @@ export function useFlinkMaterializedTable({
             Fields.useName(from),
             ...Fields.useTaskDefinition({ projectCode, from, readonly, data, model }),
             Fields.useRunFlag(),
-            Fields.useCache(),
             Fields.useDescription(),
             Fields.useTaskPriority(),
             Fields.useWorkerGroup(projectCode),

dolphinscheduler-ui/src/views/projects/task/constants/task-type.ts

@@ -184,13 +184,12 @@ export const TASK_TYPES_MAP = {
     alias: 'REMOTESHELL',
     helperLinkDisable: true
   },
-<<<<<<< HEAD
   ALIYUN_SERVERLESS_SPARK: {
     alias: 'ALIYUN_SERVERLESS_SPARK',
-=======
+    helperLinkDisable: true
+  },
   FLINK_MATERIALIZED_TABLE: {
     alias: 'FLINK_MATERIALIZED_TABLE',
->>>>>>> d1a185500 (support flink materialized table)
     helperLinkDisable: true
   }
 } as {