[#noissue] Cleanup

pinpoint-apm · Oct 14, 2024 · 79e5bf5 · 79e5bf5
1 parent 06584b0
commit 79e5bf5
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 24 deletions.
diff --git a/...sandra-2-it/src/test/java/com/navercorp/pinpoint/it/plugin/cassandra/CassandraServer.java b/...sandra-2-it/src/test/java/com/navercorp/pinpoint/it/plugin/cassandra/CassandraServer.java
@@ -39,7 +39,7 @@ public Properties beforeAll() {
 
         Properties properties = new Properties();
         properties.setProperty("PORT", port.toString());
-        System.setProperty("PORT", port.toString());
+        System.getProperties().putAll(properties);
         return properties;
     }
 

diff --git a/...sandra-4-it/src/test/java/com/navercorp/pinpoint/it/plugin/cassandra/CassandraServer.java b/...sandra-4-it/src/test/java/com/navercorp/pinpoint/it/plugin/cassandra/CassandraServer.java
@@ -32,7 +32,7 @@ public Properties beforeAll() {
         final Integer port = cassandra.getMappedPort(CassandraContainer.CQL_PORT);
         Properties properties = new Properties();
         properties.setProperty("PORT", port.toString());
-        System.setProperty("PORT", port.toString());
+        System.getProperties().putAll(properties);
 
         return properties;
     }

diff --git a/...ticsearch-6-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java b/...ticsearch-6-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java
@@ -29,7 +29,7 @@ public Properties beforeAll() {
 
         Integer port = elasticsearchContainer.getMappedPort(ESServerContainerFactory.DEFAULT_PORT);
         properties.setProperty("PORT", port.toString());
-        System.setProperty("PORT", port.toString());
+        System.getProperties().putAll(properties);
         return properties;
     }
 

diff --git a/...search-7-16-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java b/...search-7-16-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java
@@ -29,8 +29,7 @@ public Properties beforeAll() {
 
         Integer port = elasticsearchContainer.getMappedPort(ESServerContainerFactory.DEFAULT_PORT);
         properties.setProperty("PORT", port.toString());
-        System.setProperty("PORT", port.toString());
-
+        System.getProperties().putAll(properties);
         return properties;
     }
 

diff --git a/...-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/informix/InformixServer.java b/...-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/informix/InformixServer.java
@@ -47,9 +47,7 @@ public Properties beforeAll() {
         container.withLogConsumer(new LogOutputStream(LOGGER::info));
         container.start();
 
-        Connection connection = null;
-        try {
-            connection = createConnection("localhost:" + container.getFirstMappedPort() + "/sysmaster", "informix", "in4mix");
+        try (Connection connection = createConnection("localhost:" + container.getFirstMappedPort() + "/sysmaster", "informix", "in4mix")) {
             Statement statement = connection.createStatement();
 
             List<String> tableQuery = createTableQuery();
@@ -59,19 +57,12 @@ public Properties beforeAll() {
             }
         } catch (Exception e) {
             LOGGER.error("Failed to start testcontainer", e);
-        } finally {
-            if (connection != null) {
-                try {
-                    connection.close();
-                } catch (SQLException ignored) {
-                }
-            }
         }
 
         Integer port = container.getFirstMappedPort();
         Properties properties = new Properties();
         properties.setProperty("PORT", port.toString());
-        System.setProperty("PORT", port.toString());
+        System.getProperties().putAll(properties);
         return properties;
     }
 

diff --git a/...ins-it/kafka-it/kafka-2-it/src/test/java/test/pinpoint/plugin/kafka/Kafka2UnitServer.java b/...ins-it/kafka-it/kafka-2-it/src/test/java/test/pinpoint/plugin/kafka/Kafka2UnitServer.java
@@ -55,8 +55,7 @@ public Properties beforeAll() {
         Properties properties = new Properties();
         properties.setProperty("PORT", String.valueOf(server.getBrokerPort()));
         properties.setProperty("OFFSET", String.valueOf(OFFSET_STORE.getOffset()));
-        System.setProperty("PORT", String.valueOf(server.getBrokerPort()));
-        System.setProperty("OFFSET", String.valueOf(OFFSET_STORE.getOffset()));
+        System.getProperties().putAll(properties);
         return properties;
     }
 

diff --git a/...ins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java b/...ins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java
@@ -53,8 +53,7 @@ public Properties beforeAll() {
         Properties properties = new Properties();
         properties.setProperty("PORT", String.valueOf(port));
         properties.setProperty("OFFSET", String.valueOf(OFFSET_STORE.getOffset()));
-        System.setProperty("OFFSET", String.valueOf(OFFSET_STORE.getOffset()));
-        System.setProperty("PORT", String.valueOf(port));
+        System.getProperties().putAll(properties);
         return properties;
     }
 

diff --git a/.../kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/KafkaStreamsUnitServer.java b/.../kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/KafkaStreamsUnitServer.java
@@ -61,7 +61,7 @@ public Properties beforeAll() {
 
         Properties properties = new Properties();
         properties.setProperty("PORT", String.valueOf(port));
-        System.setProperty("PORT", String.valueOf(port));
+        System.getProperties().putAll(properties);
         return properties;
     }
 

diff --git a/...rabbitmq-it/src/test/java/com/navercorp/pinpoint/it/plugin/rabbitmq/TestBrokerServer.java b/...rabbitmq-it/src/test/java/com/navercorp/pinpoint/it/plugin/rabbitmq/TestBrokerServer.java
@@ -21,7 +21,7 @@ public Properties beforeAll() {
         int port = container.getFirstMappedPort();
         Properties properties = new Properties();
         properties.setProperty("PORT", String.valueOf(port));
-        System.setProperty("PORT", String.valueOf(port));
+        System.getProperties().putAll(properties);
         return properties;
     }
 

diff --git a/.../redis-lettuce-it/src/test/java/com/navercorp/pinpoint/it/plugin/lettuce/RedisServer.java b/.../redis-lettuce-it/src/test/java/com/navercorp/pinpoint/it/plugin/lettuce/RedisServer.java
@@ -39,8 +39,7 @@ public Properties beforeAll() {
         Properties properties = new Properties();
         properties.setProperty("HOST", redisServer.getHost());
         properties.setProperty("PORT", String.valueOf(redisServer.getMappedPort(6379)));
-        System.setProperty("HOST", redisServer.getHost());
-        System.setProperty("PORT", String.valueOf(redisServer.getMappedPort(6379)));
+        System.getProperties().putAll(properties);
 
         return properties;
     }