resolve conflict & fix checkstyle

Author: hackergin

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/WorkflowFlinkMaterializedTableE2ETest.java

@@ -17,6 +17,8 @@
 
 package org.apache.dolphinscheduler.e2e.cases;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.apache.dolphinscheduler.e2e.core.DolphinScheduler;
 import org.apache.dolphinscheduler.e2e.pages.LoginPage;
 import org.apache.dolphinscheduler.e2e.pages.common.NavBarPage;
@@ -30,6 +32,8 @@
 import org.apache.dolphinscheduler.e2e.pages.security.TenantPage;
 import org.apache.dolphinscheduler.e2e.pages.security.UserPage;
 
+import java.time.Duration;
+
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Order;
@@ -40,12 +44,9 @@
 import org.openqa.selenium.support.ui.WebDriverWait;
 import org.testcontainers.shaded.org.awaitility.Awaitility;
 
-import java.time.Duration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 @DolphinScheduler(composeFiles = "docker/flink-materialized-table/docker-compose.yaml")
 class WorkflowFlinkMaterializedTableE2ETest {
+
     private static final String project = "test-workflow-1";
     private static final String workflow = "test-workflow-1";
     private static final String user = "admin";
@@ -68,13 +69,13 @@ public static void setup() {
                 .goToNav(SecurityPage.class)
                 .goToTab(UserPage.class);
 
-        new WebDriverWait(userPage.driver(), Duration.ofSeconds(20)).until(ExpectedConditions.visibilityOfElementLocated(
-                new By.ByClassName("name")));
+        new WebDriverWait(userPage.driver(), Duration.ofSeconds(20))
+                .until(ExpectedConditions.visibilityOfElementLocated(
+                        new By.ByClassName("name")));
 
         userPage.update(user, user, email, phone, tenant)
                 .goToNav(ProjectPage.class)
-                .create(project)
-        ;
+                .create(project);
     }
 
     @AfterAll
@@ -107,7 +108,7 @@ void testCreateWorkflow() {
 
         workflowDefinitionPage
                 .createWorkflow()
-                .<FlinkMaterializedTableTaskForm> addTask(WorkflowForm.TaskType.FLINK_MATERIALIZED_TABLE)
+                .<FlinkMaterializedTableTaskForm>addTask(WorkflowForm.TaskType.FLINK_MATERIALIZED_TABLE)
                 .gatewayEndpoint(flinkSqlGatewayUrl)
                 .identifier(materializedTableIdentifier)
                 .staticPartitions("{}")
@@ -120,14 +121,12 @@ void testCreateWorkflow() {
                 .submit()
                 .name(workflow)
                 .addGlobalParam("global_param", "hello world")
-                .submit()
-        ;
+                .submit();
 
         Awaitility.await().untilAsserted(() -> assertThat(workflowDefinitionPage.workflowList())
                 .as("Workflow list should contain newly-created workflow")
                 .anyMatch(
-                        it -> it.getText().contains(workflow)
-                ));
+                        it -> it.getText().contains(workflow)));
         workflowDefinitionPage.publish(workflow);
     }
 
@@ -160,4 +159,4 @@ void testRunWorkflow() {
             assertThat(row.executionTime()).isEqualTo(1);
         });
     }
-} 
+}

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowForm.java

@@ -18,14 +18,13 @@
 package org.apache.dolphinscheduler.e2e.pages.project.workflow;
 
 import org.apache.dolphinscheduler.e2e.core.WebDriverWaitFactory;
+import org.apache.dolphinscheduler.e2e.pages.project.workflow.task.FlinkMaterializedTableTaskForm;
 import org.apache.dolphinscheduler.e2e.pages.project.workflow.task.HttpTaskForm;
 import org.apache.dolphinscheduler.e2e.pages.project.workflow.task.JavaTaskForm;
 import org.apache.dolphinscheduler.e2e.pages.project.workflow.task.PythonTaskForm;
 import org.apache.dolphinscheduler.e2e.pages.project.workflow.task.ShellTaskForm;
 import org.apache.dolphinscheduler.e2e.pages.project.workflow.task.SubWorkflowTaskForm;
 import org.apache.dolphinscheduler.e2e.pages.project.workflow.task.SwitchTaskForm;
-import org.apache.dolphinscheduler.e2e.pages.project.workflow.task.JavaTaskForm;
-import org.apache.dolphinscheduler.e2e.pages.project.workflow.task.FlinkMaterializedTableTaskForm;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;

dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/FlinkMaterializedTableTaskForm.java

@@ -17,9 +17,10 @@
 
 package org.apache.dolphinscheduler.e2e.pages.project.workflow.task;
 
-import lombok.Getter;
 import org.apache.dolphinscheduler.e2e.pages.project.workflow.WorkflowForm;
-import org.openqa.selenium.By;
+
+import lombok.Getter;
+
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
@@ -29,14 +30,13 @@
 @Getter
 public final class FlinkMaterializedTableTaskForm extends TaskNodeForm {
 
-
     @FindBys({
             @FindBy(className = "input-identifier"),
             @FindBy(tagName = "input"),
     })
     private WebElement inputIdentifier;
 
-        @FindBys({
+    @FindBys({
             @FindBy(className = "input-gateway-endpoint"),
             @FindBy(tagName = "input"),
     })
@@ -103,4 +103,4 @@ public FlinkMaterializedTableTaskForm executionConfig(String executionConfig) {
         executionConfig().sendKeys(executionConfig);
         return this;
     }
-} 
+}

dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml

@@ -216,7 +216,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <version>${project.version}</version>
             <groupId>org.apache.dolphinscheduler</groupId>
             <artifactId>dolphinscheduler-task-flink-materialized-table</artifactId>
             <version>${project.version}</version>

dolphinscheduler-task-plugin/dolphinscheduler-task-flink-materialized-table/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/gateway/model/FetchResultResponseBodyImpl.java

@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.dolphinscheduler.plugin.task.flink.gateway.model;
 
 import java.util.List;

dolphinscheduler-task-plugin/dolphinscheduler-task-flink-materialized-table/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/gateway/model/SqlGatewayResponseImpl.java

@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.dolphinscheduler.plugin.task.flink.gateway.model;
 
 import java.util.List;

dolphinscheduler-task-plugin/dolphinscheduler-task-flink-materialized-table/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/gateway/serde/FetchResultResponseBodyDeserializer.java

@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.dolphinscheduler.plugin.task.flink.gateway.serde;
 
 import org.apache.dolphinscheduler.plugin.task.flink.gateway.model.FetchResultResponseBody;

dolphinscheduler-task-plugin/dolphinscheduler-task-flink-materialized-table/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/gateway/serde/FetchResultResponseBodySerializer.java

@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.dolphinscheduler.plugin.task.flink.gateway.serde;
 
 import org.apache.dolphinscheduler.plugin.task.flink.gateway.model.FetchResultResponseBody;