Merge pull request #29 from aliyun/feature/release-v1.1.5

merge code from dw-common-spec release 1.1.5
aliyun · May 15, 2024 · 47052c6 · 47052c6
2 parents 5e23f8a + 0f19220
commit 47052c6
Show file tree

Hide file tree

Showing 86 changed files with 2,441 additions and 291 deletions.
diff --git a/client/migrationx-common/pom.xml b/client/migrationx-common/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <artifactId>migrationx</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
 
     <artifactId>migrationx-common</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/client/migrationx-domain/migrationx-domain-airflow/pom.xml b/client/migrationx-domain/migrationx-domain-airflow/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>migrationx-domain</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.aliyun.dataworks</groupId>
             <artifactId>migrationx-domain-dataworks</artifactId>
-            <version>1.1.4</version>
+            <version>1.1.5</version>
         </dependency>
     </dependencies>
 

diff --git a/client/migrationx-domain/migrationx-domain-aliyunemr/pom.xml b/client/migrationx-domain/migrationx-domain-aliyunemr/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>migrationx-domain</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.13</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
@@ -101,7 +100,7 @@
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-emr</artifactId>
-            <version>4.0.212-SNAPSHOT</version>
+            <version>3.3.8</version>
         </dependency>
 
     </dependencies>

diff --git a/...va/com/aliyun/dataworks/migrationx/domain/dataworks/aliyunemr/AliyunEmrExportRequest.java b/...va/com/aliyun/dataworks/migrationx/domain/dataworks/aliyunemr/AliyunEmrExportRequest.java
@@ -17,28 +17,18 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Map;
+
+import lombok.Data;
 
 /**
  * @author sam.liux
  * @date 2020/12/15
  */
+@Data
 public class AliyunEmrExportRequest {
     private File folder;
     private List<String> projects;
-
-    public File getFolder() {
-        return folder;
-    }
-
-    public void setFolder(File folder) {
-        this.folder = folder;
-    }
-
-    public List<String> getProjects() {
-        return projects;
-    }
-
-    public void setProjects(List<String> projects) {
-        this.projects = projects;
-    }
+    private Map<String, List<String>> projectFlowList;
+    private String folderFilter;
 }
diff --git a/...ain/java/com/aliyun/dataworks/migrationx/domain/dataworks/aliyunemr/AliyunEmrProject.java b/...ain/java/com/aliyun/dataworks/migrationx/domain/dataworks/aliyunemr/AliyunEmrProject.java
@@ -15,48 +15,24 @@
 
 package com.aliyun.dataworks.migrationx.domain.dataworks.aliyunemr;
 
-import com.aliyuncs.emr.model.v20160408.DescribeFlowResponse;
+import java.util.List;
+import java.util.Map;
+
 import com.aliyuncs.emr.model.v20160408.ListFlowJobResponse;
 import com.aliyuncs.emr.model.v20160408.ListFlowProjectResponse;
 import com.aliyuncs.emr.model.v20160408.ListFlowResponse;
-
-import java.util.List;
-import java.util.Map;
+import lombok.Data;
 
 /**
  * @author sam.liux
  * @date 2020/12/15
  */
+@Data
 public class AliyunEmrProject {
     private ListFlowProjectResponse.Project project;
-    private Map<ListFlowResponse.FlowItem, DescribeFlowResponse> flows;
+    private Map<ListFlowResponse.FlowItem, Flow> flows;
     private List<ListFlowJobResponse.Job> jobs;
 
-    public ListFlowProjectResponse.Project getProject() {
-        return project;
-    }
-
-    public void setProject(ListFlowProjectResponse.Project project) {
-        this.project = project;
-    }
-
-    public Map<ListFlowResponse.FlowItem, DescribeFlowResponse> getFlows() {
-        return flows;
-    }
-
-    public void setFlows(
-        Map<ListFlowResponse.FlowItem, DescribeFlowResponse> flows) {
-        this.flows = flows;
-    }
-
-    public List<ListFlowJobResponse.Job> getJobs() {
-        return jobs;
-    }
-
-    public void setJobs(List<ListFlowJobResponse.Job> jobs) {
-        this.jobs = jobs;
-    }
-
     public ListFlowJobResponse.Job getJobById(String jobId) {
         return this.jobs.stream().filter(
             job -> job.getId().equals(jobId)).findFirst().orElse(null);