Add new splitOnFirst, splitOnLast, trimStart, trimEnd, toHumanFriendlyUrl methods

mythz · mythz · commit 9ce4ecd149d2 · 2015-04-11T13:41:33.000-04:00
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java
@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import static net.servicestack.client.Func.last;
+
 // Generic Utils
 public class Utils {
 
@@ -369,6 +371,14 @@ public static String[] splitOnFirst(String strVal, char needle) {
                 : new String[] { strVal.substring(0, pos), strVal.substring(pos + 1) };
     }
 
+    public static String[] splitOnFirst(String strVal, String needle) {
+        if (strVal == null) return new String[0];
+        int pos = strVal.indexOf(needle);
+        return pos == -1
+                ? new String[] { strVal }
+                : new String[] { strVal.substring(0, pos), strVal.substring(pos + needle.length()) };
+    }
+
     public static String[] splitOnLast(String strVal, char needle) {
         if (strVal == null) return new String[0];
         int pos = strVal.lastIndexOf(needle);
@@ -377,6 +387,14 @@ public static String[] splitOnLast(String strVal, char needle) {
                 : new String[] { strVal.substring(0, pos), strVal.substring(pos + 1) };
     }
 
+    public static String[] splitOnLast(String strVal, String needle) {
+        if (strVal == null) return new String[0];
+        int pos = strVal.lastIndexOf(needle);
+        return pos == -1
+                ? new String[] { strVal }
+                : new String[] { strVal.substring(0, pos), strVal.substring(pos + needle.length()) };
+    }
+
     public static String combinePath(String basePath, String withPath){
         if (basePath == null)
             basePath = "";
@@ -564,4 +582,33 @@ public static boolean equals(String s1, String s2){
             return s1 == null;
         return s1.equals(s2);
     }
+
+    public static String trimStart(String text, char character) {
+        if (text == null || text.length() == 0) return "";
+
+        int i = 0;
+        while (text.charAt(i) == character) {
+            i++;
+        }
+        return text.substring(i).trim();
+    }
+
+    public static String trimEnd(String text, char character) {
+        if (text == null || text.length() == 0) return "";
+
+        int i = text.length() - 1;
+        while (text.charAt(i) == character){
+            if (--i < 0) {
+                return "";
+            }
+        }
+        return text.substring(0, i + 1).trim();
+    }
+
+    public static String toHumanFriendlyUrl(String url){
+        if (url == null) return null;
+
+        url = trimEnd(last(splitOnFirst(url, "://")), '/');
+        return url;
+    }
 }
