[james-project] 01/05: JAMES-2879 Use Host.asString() instead of Host.toString() implicitly

[btellier]

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit d95246be8681cc58dd2efb4d085cd117d950aee4
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Tue Sep 10 13:32:55 2019 +0700

    JAMES-2879 Use Host.asString() instead of Host.toString() implicitly
---
 .../org/apache/james/blob/objectstorage/DockerSwiftContainer.java   | 6 +++---
 .../apache/james/blob/objectstorage/aws/DockerAwsS3Container.java   | 2 +-
 server/container/util/src/main/java/org/apache/james/util/Host.java | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerSwiftContainer.java
 
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerSwiftContainer.java
index b72b8fa..14d0e19 100644
--- 
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerSwiftContainer.java
+++ 
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerSwiftContainer.java
@@ -83,11 +83,11 @@ public class DockerSwiftContainer {
             LOGGER.error(execResult.getStderr());
         }
         URI keystoneV2Endpoint =
-            URI.create("http://"; + getKeystoneHost() + "/v2.0");
+            URI.create("http://"; + getKeystoneHost().asString() + "/v2.0");
         URI keystoneV3Endpoint =
-            URI.create("http://"; + getKeystoneHost() + "/v3");
+            URI.create("http://"; + getKeystoneHost().asString() + "/v3");
         URI swiftEndpoint =
-            URI.create("http://"; + getSwiftHost() + "/auth/v1.0");
+            URI.create("http://"; + getSwiftHost().asString() + "/auth/v1.0");
         dockerSwift = new DockerSwift(keystoneV2Endpoint, keystoneV3Endpoint, 
swiftEndpoint);
 
     }
diff --git 
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/DockerAwsS3Container.java
 
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/DockerAwsS3Container.java
index 55d1450..e8b1072 100644
--- 
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/DockerAwsS3Container.java
+++ 
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/DockerAwsS3Container.java
@@ -52,7 +52,7 @@ public class DockerAwsS3Container {
     public void start() {
         awsS3Container.start();
 
-        dockerAwsS3 = new DockerAwsS3(URI.create("http://"; + getHost() + "/"));
+        dockerAwsS3 = new DockerAwsS3(URI.create("http://"; + 
getHost().asString() + "/"));
     }
 
     public void stop() {
diff --git 
a/server/container/util/src/main/java/org/apache/james/util/Host.java 
b/server/container/util/src/main/java/org/apache/james/util/Host.java
index cb6acce..df08a06 100644
--- a/server/container/util/src/main/java/org/apache/james/util/Host.java
+++ b/server/container/util/src/main/java/org/apache/james/util/Host.java
@@ -130,8 +130,12 @@ public class Host {
         return false;
     }
 
+    public String asString() {
+        return this.hostName + ":" + this.port;
+    }
+
     @Override
     public String toString() {
-        return this.hostName + ":" + this.port;
+        return asString();
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org