Do not remove leading or trailing slashes on path

Extracted property for service url
Renamed some properties

Author: spimminger

backmeup-storage-client/src/main/java/org/backmeup/storage/client/StorageConnectionStringBuilder.java

@@ -1,15 +1,14 @@
 package org.backmeup.storage.client;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
 
 /*
- * [service-name]:[[protocoll://]serverName[:portNumber][/basePath]][;property=value]*
+ * [service-name];[[protocoll://]serverName[:portNumber][/basePath]][;property=value]*
  * 
- * backmeup-storage:[[protocoll://]serverName[:portNumber][/basePath]][;property=value]*
+ * backmeup-storage;[[protocoll://]serverName[:portNumber][/basePath]][;property=value]*
  * 
  * backmeup-storage;http://localhost:8080/backmeup-storage-service/;Token=abc123
  * 
@@ -30,6 +29,11 @@ public StorageConnectionStringBuilder() {
         properties = new HashMap<>();
     }
 
+    public StorageConnectionStringBuilder(String connectionString) {
+        this();
+        parse(connectionString);
+    }
+    
     // Properties -------------------------------------------------------------
 
     public String getProtocol() {
@@ -69,16 +73,41 @@ public String getPath() {
     }
 
     public void setPath(String basePath) {
-        url.put(PATH, removeSlashes(basePath));
+        url.put(PATH, basePath);
     }
 
-    public void add(String key, String value) {
+    public void addProperty(String key, String value) {
         if (key == null || value == null) {
             throw new IllegalArgumentException("Arguments must not be null");
         }
         properties.put(key, value);
     }
 
+    public String getProperty(String key) {
+        if (key == null || key == "") {
+            throw new IllegalArgumentException("Key must not be null");
+        }
+        
+        return properties.get(key);
+    }
+    
+    public String getUrl() {
+        StringBuffer sb = new StringBuffer();
+        if (url.containsKey(PROTOCOL)) {
+            sb.append(url.get(PROTOCOL));
+            sb.append("://");
+        }
+        sb.append(url.get(HOST));
+        if (url.containsKey(PORT)) {
+            sb.append(":");
+            sb.append(url.get(PORT));
+        }
+        if (url.containsKey(PATH)) {
+            sb.append(url.get(PATH));
+        }
+        return sb.toString();
+    }
+    
     public void parse(String connectionString) {
         if (connectionString == null || connectionString.length() == 0) {
             throw new IllegalArgumentException("Invalid Connection String");
@@ -99,14 +128,16 @@ public void parse(String connectionString) {
 
             setProtocol(serverUrl.getProtocol());
             setHost(serverUrl.getHost());
-            setPort(serverUrl.getPort());
+            if (serverUrl.getPort() != -1) {
+                setPort(serverUrl.getPort());
+            }
             setPath(serverUrl.getPath());
 
-        } catch (MalformedURLException e) {
-            throw new IllegalArgumentException("Invalid Connection String");
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Invalid Connection String"); 
         }
 
-        // 2: for each remaining pair parse into appropriate map entries
+        // 4: for each remaining pair parse into appropriate map entries
         for (int i = 2; i < valuePairs.length; i++) {
             final int equalDex = valuePairs[i].indexOf("=");
             if (equalDex < 1) {
@@ -123,49 +154,21 @@ public void parse(String connectionString) {
                 throw new IllegalArgumentException("Invalid Connection String");
             }
 
-            add(key, value);
+            addProperty(key, value);
         }
     }
 
     public String build() {
         return this.toString();
     }
 
-    private String removeSlashes(String string) {
-        // return string.replaceAll("/$", "");
-
-        String retVal = string;
-        // remove beginning slash
-        if (retVal.startsWith("/")) {
-            retVal = retVal.substring(1, retVal.length());
-        }
-
-        // remove trailing slash
-        if (retVal.endsWith("/")) {
-            retVal = retVal.substring(0, retVal.length() - 1);
-        }
-
-        return retVal;
-    }
 
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(PREFIX);
         sb.append(";");
-        if (url.containsKey(PROTOCOL)) {
-            sb.append(url.get(PROTOCOL));
-            sb.append("://");
-        }
-        sb.append(url.get(HOST));
-        if (url.containsKey(PORT)) {
-            sb.append(":");
-            sb.append(url.get(PORT));
-        }
-        if (url.containsKey(PATH)) {
-            sb.append("/");
-            sb.append(url.get(PATH));
-        }
+        sb.append(getUrl());
         if (!properties.isEmpty()) {
             for (Entry<String, String> entry : properties.entrySet()) {
                 sb.append(";");
@@ -176,4 +179,23 @@ public String toString() {
         }
         return sb.toString();
     }
+    
+    // Private methods --------------------------------------------------------
+    
+    private String removeSlashes(String string) {
+        // return string.replaceAll("/$", "");
+
+        String retVal = string;
+        // remove leading slash
+        if (retVal.startsWith("/")) {
+            retVal = retVal.substring(1, retVal.length());
+        }
+
+        // remove trailing slash
+        if (retVal.endsWith("/")) {
+            retVal = retVal.substring(0, retVal.length() - 1);
+        }
+
+        return retVal;
+    }
 }