Skip to content

[feat-#1204][e2e] Add Oracle Logminer E2E Test. #1205

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
FlechazoW merged 2 commits into from
Aug 31, 2022
Merged

[feat-#1204][e2e] Add Oracle Logminer E2E Test. #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5668904
[feat-#1204][e2e] Add Oracle Logminer E2E Test.
chaozwn Aug 31, 2022
5d9b16e
[feat-#1204][e2e] Add Oracle Logminer E2E Test.
chaozwn Aug 31, 2022
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
28 changes: 18 additions & 10 deletions chunjun-e2e/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
</properties>

<dependencies>
<dependency>
<groupId>com.dtstack.chunjun</groupId>
<artifactId>chunjun-clients</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<!-- testcontainer-->
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
Expand All @@ -30,15 +38,15 @@
</dependency>

<dependency>
<groupId>com.github.noraui</groupId>
<artifactId>ojdbc8</artifactId>
<version>12.2.0.1</version>
<groupId>org.testcontainers</groupId>
<artifactId>jdbc</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>jdbc</artifactId>
<artifactId>oracle-xe</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -58,16 +66,16 @@
</dependency>

<dependency>
<groupId>com.dtstack.chunjun</groupId>
<artifactId>chunjun-clients</artifactId>
<version>${project.version}</version>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.19</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.19</version>
<groupId>com.github.noraui</groupId>
<artifactId>ojdbc8</artifactId>
<version>12.2.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
105 changes: 0 additions & 105 deletions ...un-e2e/src/test/java/com/dtstack/chunjun/connector/containers/oracle/OracleContainer.java
View file
Open in desktop

This file was deleted.

25 changes: 22 additions & 3 deletions chunjun-e2e/src/test/java/com/dtstack/chunjun/connector/entity/LaunchCommandBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@
package com.dtstack.chunjun.connector.entity;

import com.dtstack.chunjun.enums.ClusterMode;
import com.dtstack.chunjun.util.GsonUtil;

import com.google.gson.GsonBuilder;
import org.junit.Assert;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

public class LaunchCommandBuilder {
private List<String> commands;
Expand Down Expand Up @@ -55,6 +56,12 @@ public LaunchCommandBuilder withChunJunDistDir(String chunJunDistDir) {
return this;
}

public LaunchCommandBuilder withFlinkLibDir(String chunJunDistDir) {
commands.add("-flinkLibDir");
commands.add(chunJunDistDir);
return this;
}

public LaunchCommandBuilder withFlinkConfDir(String flinkConfDir) {
commands.add("-flinkConfDir");
commands.add(flinkConfDir);
Expand All @@ -63,13 +70,13 @@ public LaunchCommandBuilder withFlinkConfDir(String flinkConfDir) {

public LaunchCommandBuilder withFlinkCustomConf(Map<String, Object> properties) {
commands.add("-confProp");
commands.add(GsonUtil.GSON.toJson(properties));
commands.add(new GsonBuilder().create().toJson(properties));
Copy link
Copy Markdown
Member

@FlechazoW FlechazoW Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why use new Gson rather than GsonUtil.GSON?

Copy link
Copy Markdown
Member Author

@chaozwn chaozwn Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ablove.

return this;
}

public LaunchCommandBuilder withAddJar(List<String> path) {
commands.add("-addjar");
commands.add(GsonUtil.GSON.toJson(path));
commands.add(new GsonBuilder().create().toJson(path));
Copy link
Copy Markdown
Member

@FlechazoW FlechazoW Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why use new Gson rather than GsonUtil.GSON?

Copy link
Copy Markdown
Member Author

@chaozwn chaozwn Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this time, because GsonUtil uses prettyjson by default, when using the shell to submit, we cannot appear \r\n json data.

Copy link
Copy Markdown
Member Author

@chaozwn chaozwn Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The json we use must be one line of data.

return this;
}

Expand All @@ -79,6 +86,18 @@ public LaunchCommandBuilder withShipFile(String path) {
return this;
}

public LaunchCommandBuilder withParameters(Map<String, String> parameters) {
if (parameters != null && !parameters.isEmpty()) {
commands.add("-p");
String params =
parameters.entrySet().stream()
.map(entry -> entry.getKey() + "=" + entry.getValue())
.collect(Collectors.joining(","));
commands.add(params);
}
return this;
}

public String[] builder() {
return commands.toArray(new String[0]);
}
Expand Down
Loading