Skip to content

Commit 1dafdf4

Browse files
emeroademeroad
committed
[#8965] Cleanup
1 parent ffe9556 commit 1dafdf4

File tree

10 files changed

+73
-24
lines changed

10 files changed

+73
-24
lines changed

‎plugins-it/mariadb-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/MariaDBServer.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.jdbc;
22

3+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
34
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
45
import org.apache.logging.log4j.LogManager;
56
import org.apache.logging.log4j.Logger;
@@ -38,10 +39,8 @@ public void accept(OutputFrame outputFrame) {
3839
mariaDB.start();
3940

4041
int port = mariaDB.getMappedPort(3306);
41-
Properties properties = new Properties();
42-
properties.setProperty("JDBC_URL", mariaDB.getJdbcUrl());
42+
Properties properties = DatabaseContainers.toProperties(mariaDB);
4343
properties.setProperty("URL", mariaDB.getHost() + ":" + port);
44-
4544
return properties;
4645
}
4746

‎plugins-it/mariadb-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/MariaDB_IT_Base.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.navercorp.pinpoint.pluginit.jdbc.DriverManagerUtils;
2020
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
2121
import com.navercorp.pinpoint.pluginit.jdbc.JDBCDriverClass;
22+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
2223
import com.navercorp.pinpoint.test.plugin.shared.SharedTestBeforeAllResult;
2324
import org.apache.logging.log4j.LogManager;
2425
import org.apache.logging.log4j.Logger;
@@ -80,7 +81,7 @@ public static String getURL() {
8081

8182
@SharedTestBeforeAllResult
8283
public static void setBeforeAllResult(Properties beforeAllResult) {
83-
JDBC_URL = beforeAllResult.getProperty("JDBC_URL");
84+
JDBC_URL = DatabaseContainers.getJdbcUrl(beforeAllResult);
8485
URL = beforeAllResult.getProperty("URL");
8586
}
8687

‎plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MSSqlIT.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.navercorp.pinpoint.pluginit.jdbc.JDBCApi;
2323
import com.navercorp.pinpoint.pluginit.jdbc.JDBCDriverClass;
2424
import com.navercorp.pinpoint.pluginit.jdbc.JDBCTestConstants;
25+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
2526
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
2627
import com.navercorp.pinpoint.pluginit.utils.TestcontainersOption;
2728
import com.navercorp.pinpoint.test.plugin.Dependency;
@@ -85,9 +86,9 @@ public static String getPassWord() {
8586

8687
@SharedTestBeforeAllResult
8788
public static void setBeforeAllResult(Properties beforeAllResult) {
88-
JDBC_URL = beforeAllResult.getProperty("JDBC_URL");
89-
USERNAME = beforeAllResult.getProperty("USERNAME");
90-
PASSWORD = beforeAllResult.getProperty("PASSWORD");
89+
JDBC_URL = DatabaseContainers.getJdbcUrl(beforeAllResult);
90+
USERNAME = DatabaseContainers.getUsername(beforeAllResult);
91+
PASSWORD = DatabaseContainers.getPassword(beforeAllResult);
9192
}
9293

9394
@BeforeClass

‎plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MsSqlServer.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.jdbc.mssql;
22

3+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
34
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
45
import org.junit.Assume;
56
import org.slf4j.Logger;
@@ -21,11 +22,7 @@ public Properties beforeAll() {
2122
mssqlserver = MSSQLServerContainerFactory.newMSSQLServerContainer(logger.getName());
2223
mssqlserver.start();
2324

24-
Properties properties = new Properties();
25-
properties.setProperty("JDBC_URL", mssqlserver.getJdbcUrl());
26-
properties.setProperty("USERNAME", mssqlserver.getUsername());
27-
properties.setProperty("PASSWORD", mssqlserver.getPassword());
28-
return properties;
25+
return DatabaseContainers.toProperties(mssqlserver);
2926
}
3027

3128
@Override

‎plugins-it/mysql-jdbc-driver-plugin-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlServer.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.jdbc.mysql;
22

3+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
34
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
45
import org.apache.logging.log4j.LogManager;
56
import org.apache.logging.log4j.Logger;
@@ -40,9 +41,7 @@ public void accept(OutputFrame outputFrame) {
4041
mysqlDB.withUrlParam("useSSL", "false");
4142
mysqlDB.start();
4243

43-
Properties properties = new Properties();
44-
properties.setProperty("JDBC_URL", mysqlDB.getJdbcUrl());
45-
return properties;
44+
return DatabaseContainers.toProperties(mysqlDB);
4645
}
4746

4847
@Override

‎plugins-it/mysql-jdbc-driver-plugin-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySql_IT_Base.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.navercorp.pinpoint.pluginit.jdbc.DriverManagerUtils;
2020
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
2121
import com.navercorp.pinpoint.pluginit.jdbc.JDBCDriverClass;
22+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
2223
import com.navercorp.pinpoint.test.plugin.shared.SharedTestBeforeAllResult;
2324
import org.apache.logging.log4j.LogManager;
2425
import org.apache.logging.log4j.Logger;
@@ -47,7 +48,7 @@ public static String getJdbcUrl() {
4748

4849
@SharedTestBeforeAllResult
4950
public static void setBeforeAllResult(Properties beforeAllResult) {
50-
JDBC_URL = beforeAllResult.getProperty("JDBC_URL");
51+
JDBC_URL = DatabaseContainers.getJdbcUrl(beforeAllResult);
5152
}
5253

5354

‎plugins-it/plugins-it-jdbc-test/pom.xml

+14
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,20 @@
4949
<artifactId>junit</artifactId>
5050
<scope>provided</scope>
5151
</dependency>
52+
<dependency>
53+
<groupId>org.testcontainers</groupId>
54+
<artifactId>testcontainers</artifactId>
55+
<version>${testcontainers.version}</version>
56+
<optional>true</optional>
57+
<scope>compile</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.testcontainers</groupId>
61+
<artifactId>jdbc</artifactId>
62+
<version>${testcontainers.version}</version>
63+
<optional>true</optional>
64+
<scope>compile</scope>
65+
</dependency>
5266
</dependencies>
5367

5468
<build>

‎plugins-it/plugins-it-jdbc-test/src/main/java/com/navercorp/pinpoint/pluginit/jdbc/testcontainers/DatabaseContainers.java

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package com.navercorp.pinpoint.pluginit.jdbc.testcontainers;
2+
3+
import org.testcontainers.containers.JdbcDatabaseContainer;
4+
5+
import java.util.Objects;
6+
import java.util.Properties;
7+
8+
public final class DatabaseContainers {
9+
10+
public static final String JDBC_URL = "JDBC_URL";
11+
public static final String USERNAME = "USERNAME";
12+
public static final String PASSWORD = "PASSWORD";
13+
14+
private DatabaseContainers() {
15+
}
16+
17+
public static Properties toProperties(JdbcDatabaseContainer container) {
18+
Objects.requireNonNull(container, "container");
19+
20+
Properties properties = new Properties();
21+
properties.setProperty(JDBC_URL, container.getJdbcUrl());
22+
properties.setProperty(USERNAME, container.getUsername());
23+
properties.setProperty(PASSWORD, container.getPassword());
24+
return properties;
25+
}
26+
27+
public static String getJdbcUrl(Properties p) {
28+
return p.getProperty(JDBC_URL);
29+
}
30+
31+
public static String getUsername(Properties p) {
32+
return p.getProperty(USERNAME);
33+
}
34+
35+
public static String getPassword(Properties p) {
36+
return p.getProperty(PASSWORD);
37+
}
38+
39+
}

‎plugins-it/postgresql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/postgresql/PostgreSqlBase.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.navercorp.pinpoint.pluginit.jdbc.DriverManagerUtils;
2020
import com.navercorp.pinpoint.pluginit.jdbc.DriverProperties;
2121
import com.navercorp.pinpoint.pluginit.jdbc.JDBCDriverClass;
22+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
2223
import com.navercorp.pinpoint.test.plugin.shared.SharedTestBeforeAllResult;
2324
import org.apache.logging.log4j.LogManager;
2425
import org.apache.logging.log4j.Logger;
@@ -55,9 +56,9 @@ public static String getPassWord() {
5556

5657
@SharedTestBeforeAllResult
5758
public static void setBeforeAllResult(Properties beforeAllResult) {
58-
JDBC_URL = beforeAllResult.getProperty("JDBC_URL");
59-
USERNAME = beforeAllResult.getProperty("USERNAME");
60-
PASSWORD = beforeAllResult.getProperty("PASSWORD");
59+
JDBC_URL = DatabaseContainers.getJdbcUrl(beforeAllResult);
60+
USERNAME = DatabaseContainers.getUsername(beforeAllResult);
61+
PASSWORD = DatabaseContainers.getPassword(beforeAllResult);
6162
}
6263

6364
public static DriverProperties getDriverProperties() {

‎plugins-it/postgresql-jdbc-it/src/test/java/com/navercorp/pinpoint/plugin/jdbc/postgresql/PostgreSqlServer.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.jdbc.postgresql;
22

3+
import com.navercorp.pinpoint.pluginit.jdbc.testcontainers.DatabaseContainers;
34
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
45
import org.apache.logging.log4j.LogManager;
56
import org.apache.logging.log4j.Logger;
@@ -22,11 +23,7 @@ public Properties beforeAll() {
2223

2324
postgreSql.start();
2425

25-
Properties properties = new Properties();
26-
properties.setProperty("JDBC_URL", postgreSql.getJdbcUrl());
27-
properties.setProperty("USERNAME", postgreSql.getUsername());
28-
properties.setProperty("PASSWORD", postgreSql.getPassword());
29-
return properties;
26+
return DatabaseContainers.toProperties(postgreSql);
3027
}
3128

3229
@Override

0 commit comments

Comments
 (0)