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 index 37e197a8f842..bb4879113ad7 100644 --- 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 index 82f09d5ae61a..a04b7a1351b7 100644 --- 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/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java b/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java index 81d662aac1ae..28191c18e442 100644 --- a/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java +++ b/plugins-it/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/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpWebServer.java b/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpWebServer.java index ef6e07b79851..9fe7bf19b1fd 100644 --- a/plugins-it/httpclient3-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpWebServer.java +++ b/plugins-it/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/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientITBase.java b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientITBase.java index b628582af6cf..84c175ceaff9 100644 --- a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClientITBase.java +++ b/plugins-it/httpclient4-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/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpWebServer.java b/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpWebServer.java index 09085f60ed4f..0e9cd58130a3 100644 --- a/plugins-it/httpclient4-it/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpWebServer.java +++ b/plugins-it/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/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/HttpWebServer.java b/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/HttpWebServer.java index e926d55d644b..da5db219a948 100644 --- a/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/HttpWebServer.java +++ b/plugins-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/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/RestTemplateIT.java b/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/RestTemplateIT.java index 706d864f3352..ae3dc2adefd0 100644 --- a/plugins-it/spring-it/src/test/java/com/navercorp/pinpoint/plugin/spring/web/RestTemplateIT.java +++ b/plugins-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; }