[pinpoint-apm#8965] Cleanup

emeroad · Jun 23, 2022 · 3d87341 · 3d87341
1 parent 9fd59aa
commit 3d87341
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 15 deletions.
diff --git a/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/CxfClientIT.java b/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/CxfClientIT.java
@@ -54,15 +54,15 @@
 @SharedTestLifeCycleClass(HttpWebServer.class)
 public class CxfClientIT {
 
-    private static String ADDRESS;
+    private static String HOST_PORT;
 
     @SharedTestBeforeAllResult
     public static void setBeforeAllResult(Properties beforeAllResult) {
-        ADDRESS = beforeAllResult.getProperty("ADDRESS");
+        HOST_PORT = beforeAllResult.getProperty("HOST_PORT");
     }
 
     public String getAddress() {
-        return ADDRESS;
+        return "http://" + HOST_PORT;
     }
 
     @Test

diff --git a/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/HttpWebServer.java b/plugins-it/cxf-it/src/test/java/com/navercorp/pinpoint/plugin/cxf/HttpWebServer.java
@@ -14,7 +14,6 @@ public Properties beforeAll() {
             webServer = WebServer.newTestWebServer();
 
             Properties properties = new Properties();
-            properties.setProperty("ADDRESS", webServer.getCallHttpUrl());
             properties.setProperty("HOST_PORT", webServer.getHostAndPort());
             return properties;
         } catch (Exception e) {

diff --git a/.../httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java b/.../httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java
@@ -47,15 +47,15 @@
 @SharedTestLifeCycleClass(HttpWebServer.class)
 public class HttpClientIT {
 
-    private static String ADDRESS;
+    private static String HOST_PORT;
 
     @SharedTestBeforeAllResult
     public static void setBeforeAllResult(Properties beforeAllResult) {
-        ADDRESS = beforeAllResult.getProperty("ADDRESS");
+        HOST_PORT = beforeAllResult.getProperty("HOST_PORT");
     }
 
     public String getAddress() {
-        return ADDRESS;
+        return "http://" + HOST_PORT;
     }
 
 

diff --git a/...httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpWebServer.java b/...httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpWebServer.java
@@ -14,7 +14,6 @@ public Properties beforeAll() {
             webServer = WebServer.newTestWebServer();
 
             Properties properties = new Properties();
-            properties.setProperty("ADDRESS", webServer.getCallHttpUrl());
             properties.setProperty("HOST_PORT", webServer.getHostAndPort());
             return properties;
         } catch (Exception e) {

diff --git a/...pclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientITBase.java b/...pclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientITBase.java
@@ -27,13 +27,12 @@ public abstract class HttpClientITBase {
 
     @SharedTestBeforeAllResult
     public static void setBeforeAllResult(Properties beforeAllResult) {
-        ADDRESS = beforeAllResult.getProperty("ADDRESS");
         HOST_PORT = beforeAllResult.getProperty("HOST_PORT");
 
     }
 
     public String getAddress() {
-        return ADDRESS;
+        return "http://" + HOST_PORT;
     }
 
     public static String getHostPort() {

diff --git a/...httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpWebServer.java b/...httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpWebServer.java
@@ -14,7 +14,6 @@ public Properties beforeAll() {
             webServer = WebServer.newTestWebServer();
 
             Properties properties = new Properties();
-            properties.setProperty("ADDRESS", webServer.getCallHttpUrl());
             properties.setProperty("HOST_PORT", webServer.getHostAndPort());
             return properties;
         } catch (Exception e) {

diff --git a/...ns-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/HttpWebServer.java b/...ns-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/HttpWebServer.java
@@ -14,7 +14,6 @@ public Properties beforeAll() {
             webServer = WebServer.newTestWebServer();
 
             Properties properties = new Properties();
-            properties.setProperty("ADDRESS", webServer.getCallHttpUrl());
             properties.setProperty("HOST_PORT", webServer.getHostAndPort());
             return properties;
         } catch (Exception e) {

diff --git a/...s-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/RestTemplateIT.java b/...s-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/RestTemplateIT.java
@@ -53,14 +53,14 @@
 @SharedTestLifeCycleClass(HttpWebServer.class)
 public class RestTemplateIT {
 
-    private static String ADDRESS;
+    private static String HOST_PORT;
     @SharedTestBeforeAllResult
     public static void setBeforeAllResult(Properties beforeAllResult) {
-        ADDRESS = beforeAllResult.getProperty("ADDRESS");
+        HOST_PORT = beforeAllResult.getProperty("HOST_PORT");
     }
 
     public static String getCallUrl() {
-        return ADDRESS;
+        return "http://" + HOST_PORT;
     }