Merge S String utils into single Utils class

mythz · mythz · commit 84d482a1725a · 2015-03-25T01:00:46.000-04:00
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/S.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/S.java
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/TimeSpan.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/TimeSpan.java
@@ -96,11 +96,11 @@ public static TimeSpan parse(String xsdDuration){
         int seconds = 0;
         double ms = 0.0;
 
-        String[] t = S.splitOnFirst(xsdDuration.substring(1),'T'); //strip P
+        String[] t = Utils.splitOnFirst(xsdDuration.substring(1),'T'); //strip P
 
         boolean hasTime = t.length == 2;
 
-        String[] d = S.splitOnFirst(t[0],'D');
+        String[] d = Utils.splitOnFirst(t[0],'D');
         if (d.length == 2) {
             Integer day = Utils.tryParseInt(d[0]);
             if (day != null) {
@@ -109,23 +109,23 @@ public static TimeSpan parse(String xsdDuration){
         }
 
         if (hasTime) {
-            String[] h = S.splitOnFirst(t[1], 'H');
+            String[] h = Utils.splitOnFirst(t[1], 'H');
             if (h.length == 2) {
                 Integer hour = Utils.tryParseInt(h[0]);
                 if (hour != null) {
                     hours = hour;
                 }
             }
 
-            String[] m = S.splitOnFirst(h[h.length -1], 'M');
+            String[] m = Utils.splitOnFirst(h[h.length -1], 'M');
             if (m.length == 2) {
                 Integer min = Utils.tryParseInt(m[0]);
                 if (min != null) {
                     minutes = min;
                 }
             }
 
-            String[] s = S.splitOnFirst(m[m.length - 1], 'S');
+            String[] s = Utils.splitOnFirst(m[m.length - 1], 'S');
             if (s.length == 2) {
                 Double millis = Utils.tryParseDouble(s[0]);
                 if (millis != null){
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
@@ -2,6 +2,14 @@
 
 package net.servicestack.client;
 
+import com.google.gson.Gson;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
 import java.nio.ByteBuffer;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -10,6 +18,7 @@
 
 // Generic Utils
 public class Utils {
+
     public static Integer tryParseInt(String str) {
         try {
             return Integer.parseInt(str);
@@ -156,8 +165,8 @@ public static Date parseDate(String string) {
             : string;
 
         if (str.startsWith(wcfJsonPrefix)) {
-            String body = S.splitOnLast(S.splitOnFirst(str,'(')[1],')')[0];
-            String unixTimeStr = S.splitOnLast(body.replace('+','-'),'-')[0];
+            String body = splitOnLast(splitOnFirst(str, '(')[1], ')')[0];
+            String unixTimeStr = splitOnLast(body.replace('+', '-'), '-')[0];
             long unixTime = Long.parseLong(unixTimeStr);
             return new Date(unixTime);
         }
@@ -179,4 +188,76 @@ public static Date fromIsoDateString(String iso8601string){
             throw new RuntimeException(e);
         }
     }
+
+    /*String Utils*/
+    public static String[] splitOnFirst(String strVal, char 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 + 1) };
+    }
+
+    public static String[] splitOnLast(String strVal, char 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 + 1) };
+    }
+
+    public static String combinePath(String basePath, String withPath){
+        if (basePath == null)
+            basePath = "";
+        if (withPath == null)
+            withPath = "";
+
+        String prefix = basePath.endsWith("/")
+                ? basePath
+                : basePath + "/";
+
+        String suffix = withPath.startsWith("/")
+                ? withPath.substring(1)
+                : withPath;
+
+        return prefix + suffix;
+    }
+
+    public static String fromUtf8Bytes(byte[] bytes) {
+        try {
+            return new String(bytes, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static byte[] toUtf8Bytes(String string) {
+        try {
+            return string.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String readToEnd(HttpURLConnection response){
+        try {
+            return readToEnd(response.getInputStream(), "UTF-8");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String readToEnd(InputStream stream, final String charsetName) throws IOException {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(stream, charsetName));
+
+        String line;
+        StringBuilder sb = new StringBuilder();
+        while ((line = reader.readLine()) != null) {
+            sb.append(line);
+        }
+
+        String text = sb.toString();
+        reader.close();
+        return text;
+    }
 }
