Merge pull request #220 from rpmoore/http_host_fix_3_2_autogen

If the host field has http:// it will be removed when put into the Ho…

Author: Denver

ds3-sdk/src/main/java/com/spectralogic/ds3client/networking/NetUtils.java

@@ -120,7 +120,16 @@ private static String bucketPath(final String bucket) {
     }
 
     public static String buildHostField(final ConnectionDetails details) {
-        return details.getEndpoint();
+        return filterHttp(details.getEndpoint());
+    }
+
+    public static String filterHttp(final String url) {
+        if (url.startsWith("http://") || url.startsWith("https://"))
+        {
+            final int colonIndex = url.indexOf(":");
+            return url.substring(colonIndex + 3);
+        }
+        return url;
     }
 
     public static int getPort(final URL url) {

ds3-sdk/src/test/java/com/spectralogic/ds3client/ConnectionFixture.java

@@ -27,4 +27,12 @@ public static ConnectionDetails getConnection() {
     public static ConnectionDetails getConnection(final int port) {
         return ConnectionDetailsImpl.builder("localhost:" + port, new Credentials("id", "key")).build();
     }
+
+    public static ConnectionDetails getHttpConnection() {
+        return getHttpConnection(8080);
+    }
+
+    public static ConnectionDetails getHttpConnection(final int port) {
+        return ConnectionDetailsImpl.builder("http://localhost:" + port, new Credentials("id", "key")).build();
+    }
 }

ds3-sdk/src/test/java/com/spectralogic/ds3client/utils/NetUtils_Test.java

@@ -167,6 +167,12 @@ public void getHttpDefaultPort() throws MalformedURLException {
         assertTrue(port == 80);
     }
 
+    @Test
+    public void buildHostFieldWithHttp() {
+        final String result = NetUtils.buildHostField(ConnectionFixture.getHttpConnection());
+        assertThat(result, is("localhost:8080"));
+    }
+
     @Test
     public void buildHost() throws MalformedURLException {
         final ConnectionDetails details = new ConnectionDetails() {