Add support for byte arrays serialized as base64 string

mythz · mythz · commit 346c65a5ad66 · 2021-03-09T03:32:55.000+08:00
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ByteArray.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ByteArray.java
@@ -0,0 +1,12 @@
+package net.servicestack.client;
+
+import java.util.Base64;
+
+public class ByteArray {
+    public static byte[] parse(String base64) {
+        return Base64.getDecoder().decode(base64);
+    }
+    public static String toString(byte[] bytes) {
+        return Base64.getEncoder().encodeToString(bytes);
+    }
+}
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/DateTime.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/DateTime.java
@@ -6,4 +6,7 @@ public class DateTime {
     public static Date parse(String date) {
         return Utils.parseDate(date);
     }
+    public static String toString(Date date) {
+        return Utils.toJsonDate(date);
+    }
 }
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Guid.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Guid.java
@@ -6,4 +6,7 @@ public class Guid {
     public static UUID parse(String guid) {
         return Utils.fromGuidString(guid);
     }
+    public static String toString(UUID uuid) {
+        return Utils.toGuidString(uuid);
+    }
 }
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonSerializers.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonSerializers.java
@@ -3,82 +3,46 @@
 
 package net.servicestack.client;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.google.gson.TypeAdapter;
-import com.google.gson.TypeAdapterFactory;
+import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 public class JsonSerializers {
     public static JsonSerializer<Date> getDateSerializer(){
-        return new JsonSerializer<Date>() {
-            @Override
-            public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
-                return src == null ? null : new JsonPrimitive(Utils.toJsonDate(src));
-            }
-        };
+        return (src, typeOfSrc, context) -> src == null ? null : new JsonPrimitive(Utils.toJsonDate(src));
     }
 
     public static JsonDeserializer<Date> getDateDeserializer(){
-        return new JsonDeserializer<Date>() {
-            @Override
-            public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-                return json == null ? null : Utils.parseDate(json.getAsString());
-            }
-        };
+        return (json, typeOfT, context) -> json == null ? null : Utils.parseDate(json.getAsString());
     }
 
     public static JsonSerializer<TimeSpan> getTimeSpanSerializer(){
-        return new JsonSerializer<TimeSpan>() {
-            @Override
-            public JsonElement serialize(TimeSpan src, Type typeOfSrc, JsonSerializationContext context) {
-                return src == null ? null : new JsonPrimitive(src.toXsdDuration());
-            }
-        };
+        return (src, typeOfSrc, context) -> src == null ? null : new JsonPrimitive(src.toXsdDuration());
     }
 
     public static JsonDeserializer<TimeSpan> getTimeSpanDeserializer(){
-        return new JsonDeserializer<TimeSpan>() {
-            @Override
-            public TimeSpan deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-                return json == null ? null : TimeSpan.parse(json.getAsString());
-            }
-        };
+        return (json, typeOfT, context) -> json == null ? null : TimeSpan.parse(json.getAsString());
     }
 
     public static JsonSerializer<UUID> getGuidSerializer(){
-        return new JsonSerializer<UUID>() {
-            @Override
-            public JsonElement serialize(UUID src, Type typeOfSrc, JsonSerializationContext context) {
-                return src == null ? null : new JsonPrimitive(Utils.toGuidString(src));
-            }
-        };
+        return (src, typeOfSrc, context) -> src == null ? null : new JsonPrimitive(Utils.toGuidString(src));
     }
 
     public static JsonDeserializer<UUID> getGuidDeserializer(){
-        return new JsonDeserializer<UUID>() {
-            @Override
-            public UUID deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-                return json == null ? null : Utils.fromGuidString(json.getAsString());
-            }
-        };
+        return (json, typeOfT, context) -> json == null ? null : Utils.fromGuidString(json.getAsString());
+    }
+
+    public static JsonSerializer<byte[]> getByteArraySerializer(){
+        return (src, typeOfSrc, context) -> src == null ? null : new JsonPrimitive(Base64.getEncoder().encodeToString(src));
+    }
+
+    public static JsonDeserializer<byte[]> getByteArrayDeserializer(){
+        return (json, typeOfT, context) -> json == null ? null : Base64.getDecoder().decode(json.getAsString());
     }
 
     public static class CaseInsensitiveEnumTypeAdapterFactory implements TypeAdapterFactory {
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java
@@ -91,7 +91,9 @@ public GsonBuilder getGsonBuilder() {
                 .registerTypeAdapter(TimeSpan.class, JsonSerializers.getTimeSpanSerializer())
                 .registerTypeAdapter(TimeSpan.class, JsonSerializers.getTimeSpanDeserializer())
                 .registerTypeAdapter(UUID.class, JsonSerializers.getGuidSerializer())
-                .registerTypeAdapter(UUID.class, JsonSerializers.getGuidDeserializer());
+                .registerTypeAdapter(UUID.class, JsonSerializers.getGuidDeserializer())
+                .registerTypeAdapter(byte[].class, JsonSerializers.getByteArraySerializer())
+                .registerTypeAdapter(byte[].class, JsonSerializers.getByteArrayDeserializer());
     }
 
     public Gson getGson() {
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/TimeSpan.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/TimeSpan.java
@@ -194,6 +194,10 @@ public static TimeSpan parse(String xsdDuration){
         return new TimeSpan(interval);
     }
 
+    public static String toString(TimeSpan timeSpan) {
+        return timeSpan.toXsdDuration();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ByteArray.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ByteArray.java
@@ -0,0 +1,12 @@
+package net.servicestack.client;
+
+import java.util.Base64;
+
+public class ByteArray {
+    public static byte[] parse(String base64) {
+        return Base64.getDecoder().decode(base64);
+    }
+    public static String toString(byte[] bytes) {
+        return Base64.getEncoder().encodeToString(bytes);
+    }
+}
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/DateTime.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/DateTime.java
@@ -6,4 +6,7 @@ public class DateTime {
     public static Date parse(String date) {
         return Utils.parseDate(date);
     }
+    public static String toString(Date date) {
+        return Utils.toJsonDate(date);
+    }
 }
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Guid.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Guid.java
@@ -6,4 +6,7 @@ public class Guid {
     public static UUID parse(String guid) {
         return Utils.fromGuidString(guid);
     }
+    public static String toString(UUID uuid) {
+        return Utils.toGuidString(uuid);
+    }
 }
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonSerializers.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonSerializers.java
@@ -3,82 +3,46 @@
 
 package net.servicestack.client;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.google.gson.TypeAdapter;
-import com.google.gson.TypeAdapterFactory;
+import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 public class JsonSerializers {
     public static JsonSerializer<Date> getDateSerializer(){
-        return new JsonSerializer<Date>() {
-            @Override
-            public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
-                return src == null ? null : new JsonPrimitive(Utils.toJsonDate(src));
-            }
-        };
+        return (src, typeOfSrc, context) -> src == null ? null : new JsonPrimitive(Utils.toJsonDate(src));
     }
 
     public static JsonDeserializer<Date> getDateDeserializer(){
-        return new JsonDeserializer<Date>() {
-            @Override
-            public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-                return json == null ? null : Utils.parseDate(json.getAsString());
-            }
-        };
+        return (json, typeOfT, context) -> json == null ? null : Utils.parseDate(json.getAsString());
     }
 
     public static JsonSerializer<TimeSpan> getTimeSpanSerializer(){
-        return new JsonSerializer<TimeSpan>() {
-            @Override
-            public JsonElement serialize(TimeSpan src, Type typeOfSrc, JsonSerializationContext context) {
-                return src == null ? null : new JsonPrimitive(src.toXsdDuration());
-            }
-        };
+        return (src, typeOfSrc, context) -> src == null ? null : new JsonPrimitive(src.toXsdDuration());
     }
 
     public static JsonDeserializer<TimeSpan> getTimeSpanDeserializer(){
-        return new JsonDeserializer<TimeSpan>() {
-            @Override
-            public TimeSpan deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-                return json == null ? null : TimeSpan.parse(json.getAsString());
-            }
-        };
+        return (json, typeOfT, context) -> json == null ? null : TimeSpan.parse(json.getAsString());
     }
 
     public static JsonSerializer<UUID> getGuidSerializer(){
-        return new JsonSerializer<UUID>() {
-            @Override
-            public JsonElement serialize(UUID src, Type typeOfSrc, JsonSerializationContext context) {
-                return src == null ? null : new JsonPrimitive(Utils.toGuidString(src));
-            }
-        };
+        return (src, typeOfSrc, context) -> src == null ? null : new JsonPrimitive(Utils.toGuidString(src));
     }
 
     public static JsonDeserializer<UUID> getGuidDeserializer(){
-        return new JsonDeserializer<UUID>() {
-            @Override
-            public UUID deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-                return json == null ? null : Utils.fromGuidString(json.getAsString());
-            }
-        };
+        return (json, typeOfT, context) -> json == null ? null : Utils.fromGuidString(json.getAsString());
+    }
+
+    public static JsonSerializer<byte[]> getByteArraySerializer(){
+        return (src, typeOfSrc, context) -> src == null ? null : new JsonPrimitive(Base64.getEncoder().encodeToString(src));
+    }
+
+    public static JsonDeserializer<byte[]> getByteArrayDeserializer(){
+        return (json, typeOfT, context) -> json == null ? null : Base64.getDecoder().decode(json.getAsString());
     }
 
     public static class CaseInsensitiveEnumTypeAdapterFactory implements TypeAdapterFactory {
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java
@@ -91,7 +91,9 @@ public GsonBuilder getGsonBuilder() {
                 .registerTypeAdapter(TimeSpan.class, JsonSerializers.getTimeSpanSerializer())
                 .registerTypeAdapter(TimeSpan.class, JsonSerializers.getTimeSpanDeserializer())
                 .registerTypeAdapter(UUID.class, JsonSerializers.getGuidSerializer())
-                .registerTypeAdapter(UUID.class, JsonSerializers.getGuidDeserializer());
+                .registerTypeAdapter(UUID.class, JsonSerializers.getGuidDeserializer())
+                .registerTypeAdapter(byte[].class, JsonSerializers.getByteArraySerializer())
+                .registerTypeAdapter(byte[].class, JsonSerializers.getByteArrayDeserializer());
     }
 
     public Gson getGson() {
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
@@ -194,6 +194,10 @@ public static TimeSpan parse(String xsdDuration){
         return new TimeSpan(interval);
     }
 
+    public static String toString(TimeSpan timeSpan) {
+        return timeSpan.toXsdDuration();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/AndroidClient/client/src/test/java/chat/chatdtos.java b/src/AndroidClient/client/src/test/java/chat/chatdtos.java
@@ -1,6 +1,6 @@
 /* Options:
-Date: 2017-02-12 03:54:05
-Version: 4.00
+Date: 2021-03-08 19:21:43
+Version: 5.105
 Tip: To override a DTO option, remove "//" prefix before updating
 BaseUrl: https://chat.netcore.io
 
diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java
@@ -12,6 +12,8 @@
 import java.net.HttpURLConnection;
 import java.util.*;
 
+import static org.junit.Assert.assertArrayEquals;
+
 public class TestServiceTests extends TestCase {
     public TestServiceTests() {
         //Log.Instance = new AndroidLogProvider("ZZZ");
@@ -303,11 +305,7 @@ public void test_Can_get_response_as_Stream() throws IOException {
 
     public void test_Can_post_data_and_read_as_Stream() throws IOException {
         testdtos.ReturnStream req = new testdtos.ReturnStream();
-        ArrayList<Short> data = new ArrayList<>();
-        data.add((short) 65);
-        data.add((short) 66);
-        data.add((short) 67);
-        req.setData(data);
+        req.setData(ByteArray.parse("QUJD")); // base64("ABC")
 
         InputStream is = client.post(req);
         byte[] response = Utils.readBytesToEnd(is);
@@ -366,6 +364,7 @@ public static testdtos.AllCollectionTypes createAllCollectionTypes(){
             .setIntList(Utils.createList(4, 5, 6))
             .setStringArray(Utils.createList("A", "B", "C"))
             .setStringList(Utils.createList("D","E","F"))
+            .setByteArray(ByteArray.parse("QUJD")) //ABC
             .setPocoArray(Utils.createList(createPoco("pocoArray")))
             .setPocoList(Utils.createList(createPoco("pocoList")))
             .setPocoLookup(Utils.createMap("A", Utils.createList(createPoco("B"), createPoco("C"))))
@@ -410,6 +409,7 @@ public static void assertAllCollectionTypes(testdtos.AllCollectionTypes actual,
         assertEquals(expected.getIntList(), actual.getIntList());
         assertEquals(expected.getStringArray(), actual.getStringArray());
         assertEquals(expected.getStringList(), actual.getStringList());
+        assertArrayEquals(expected.getByteArray(), actual.getByteArray());
         assertPocoEquals(expected.getPocoArray(), actual.getPocoArray());
         assertPocoEquals(expected.getPocoList(), actual.getPocoList());
 
diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/testdtos.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/testdtos.java
diff --git a/src/AndroidClient/client/src/test/java/test/dtos.java b/src/AndroidClient/client/src/test/java/test/dtos.java

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,7 @@ public class DateTime {`
`6`	`6`	`public static Date parse(String date) {`
`7`	`7`	`return Utils.parseDate(date);`
`8`	`8`	`}`
	`9`	`+ public static String toString(Date date) {`
	`10`	`+ return Utils.toJsonDate(date);`
	`11`	`+ }`
`9`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,7 @@ public class Guid {`
`6`	`6`	`public static UUID parse(String guid) {`
`7`	`7`	`return Utils.fromGuidString(guid);`
`8`	`8`	`}`
	`9`	`+ public static String toString(UUID uuid) {`
	`10`	`+ return Utils.toGuidString(uuid);`
	`11`	`+ }`
`9`	`12`	`}`