Skip to content

merge code from dw-common-spec release 1.1.5 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2024
Merged

merge code from dw-common-spec release 1.1.5 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/migrationx-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions client/migrationx-domain/migrationx-domain-airflow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down
5 changes: 2 additions & 3 deletions client/migrationx-domain/migrationx-domain-aliyunemr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
22 changes: 6 additions & 16 deletions ...va/com/aliyun/dataworks/migrationx/domain/dataworks/aliyunemr/AliyunEmrExportRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
36 changes: 6 additions & 30 deletions ...ain/java/com/aliyun/dataworks/migrationx/domain/dataworks/aliyunemr/AliyunEmrProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading