JSON serialization/deserialization

src/one/nio/serial/ArrayListSerializer.java

@@ -75,4 +75,9 @@ public void toJson(ArrayList obj, StringBuilder builder) throws IOException {
         }
         builder.append(']');
     }
+
+    @Override
+    public ArrayList fromJson(JsonReader in) throws IOException, ClassNotFoundException {
+        return in.readArray();
+    }
 }

src/one/nio/serial/BitSetSerializer.java

@@ -16,8 +16,9 @@
 
 package one.nio.serial;
 
+import one.nio.util.Base64;
+
 import java.io.IOException;
-import java.io.NotSerializableException;
 import java.nio.LongBuffer;
 import java.util.BitSet;
 
@@ -57,7 +58,17 @@ public void skip(DataStream in) throws IOException {
     }
 
     @Override
-    public void toJson(BitSet obj, StringBuilder builder) throws NotSerializableException {
-        throw new NotSerializableException(cls.getName());
+    public void toJson(BitSet obj, StringBuilder builder) {
+        Json.appendBinary(builder, obj.toByteArray());
+    }
+
+    @Override
+    public BitSet fromJson(JsonReader in) throws IOException {
+        return BitSet.valueOf(in.readBinary());
+    }
+
+    @Override
+    public BitSet fromString(String s) {
+        return BitSet.valueOf(Base64.decodeFromChars(s.toCharArray()));
     }
 }

src/one/nio/serial/BooleanArraySerializer.java

@@ -17,6 +17,7 @@
 package one.nio.serial;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 class BooleanArraySerializer extends Serializer<boolean[]> {
     private static final boolean[] EMPTY_BOOLEAN_ARRAY = new boolean[0];
@@ -70,4 +71,23 @@ public void toJson(boolean[] obj, StringBuilder builder) {
         }
         builder.append(']');
     }
+
+    @Override
+    public boolean[] fromJson(JsonReader in) throws IOException {
+        boolean[] result = new boolean[10];
+        int count = 0;
+
+        in.expect('[', "Expected array");
+        for (boolean needComma = false; in.skipWhitespace() != ']'; needComma = true) {
+            if (needComma) {
+                in.expect(',', "Unexpected end of array");
+                in.skipWhitespace();
+            }
+            if (count >= result.length) result = Arrays.copyOf(result, count * 2);
+            result[count++] = in.readBoolean();
+        }
+        in.read();
+
+        return Arrays.copyOf(result, count);
+    }
 }

src/one/nio/serial/BooleanSerializer.java

@@ -50,4 +50,14 @@ public void skip(DataStream in) throws IOException {
     public void toJson(Boolean v, StringBuilder builder) {
         builder.append(v.booleanValue());
     }
+
+    @Override
+    public Boolean fromJson(JsonReader in) throws IOException {
+        return in.readBoolean();
+    }
+
+    @Override
+    public Boolean fromString(String s) {
+        return Boolean.valueOf(s);
+    }
 }

src/one/nio/serial/ByteArraySerializer.java

@@ -16,8 +16,6 @@
 
 package one.nio.serial;
 
-import one.nio.util.Base64;
-
 import java.io.IOException;
 
 class ByteArraySerializer extends Serializer<byte[]> {
@@ -59,6 +57,11 @@ public void skip(DataStream in) throws IOException {
 
     @Override
     public void toJson(byte[] obj, StringBuilder builder) {
-        builder.append('"').append(Base64.encodeToChars(obj)).append('"');
+        Json.appendBinary(builder, obj);
+    }
+
+    @Override
+    public byte[] fromJson(JsonReader in) throws IOException {
+        return in.readBinary();
     }
 }

src/one/nio/serial/ByteSerializer.java

@@ -50,4 +50,14 @@ public void skip(DataStream in) throws IOException {
     public void toJson(Byte obj, StringBuilder builder) {
         builder.append(obj.byteValue());
     }
+
+    @Override
+    public Byte fromJson(JsonReader in) throws IOException {
+        return in.readByte();
+    }
+
+    @Override
+    public Byte fromString(String s) {
+        return Byte.valueOf(s);
+    }
 }

src/one/nio/serial/CharacterArraySerializer.java

@@ -63,4 +63,9 @@ public void skip(DataStream in) throws IOException {
     public void toJson(char[] obj, StringBuilder builder) {
         Json.appendChars(builder, obj);
     }
+
+    @Override
+    public char[] fromJson(JsonReader in) throws IOException {
+        return in.readString().toCharArray();
+    }
 }

src/one/nio/serial/CharacterSerializer.java

@@ -50,4 +50,14 @@ public void skip(DataStream in) throws IOException {
     public void toJson(Character v, StringBuilder builder) {
         Json.appendChar(builder, v);
     }
+
+    @Override
+    public Character fromJson(JsonReader in) throws IOException {
+        return in.readChar();
+    }
+
+    @Override
+    public Character fromString(String s) {
+        return s.charAt(0);
+    }
 }

src/one/nio/serial/ClassSerializer.java

@@ -16,6 +16,7 @@
 
 package one.nio.serial;
 
+import one.nio.gen.BytecodeGenerator;
 import one.nio.util.Utf8;
 
 import java.io.IOException;
@@ -60,4 +61,34 @@ public void skip(DataStream in) throws IOException {
     public void toJson(Class<?> obj, StringBuilder builder) {
         builder.append('"').append(obj.getName()).append('"');
     }
+
+    @Override
+    public Class<?> fromJson(JsonReader in) throws IOException, ClassNotFoundException {
+        return fromString(in.readString());
+    }
+
+    @Override
+    public Class<?> fromString(String s) throws ClassNotFoundException {
+        switch (s) {
+            case "int":
+                return int.class;
+            case "long":
+                return long.class;
+            case "boolean":
+                return boolean.class;
+            case "byte":
+                return byte.class;
+            case "short":
+                return short.class;
+            case "char":
+                return char.class;
+            case "float":
+                return float.class;
+            case "double":
+                return double.class;
+            case "void":
+                return void.class;
+        }
+        return Class.forName(s, false, BytecodeGenerator.INSTANCE);
+    }
 }

src/one/nio/serial/CollectionSerializer.java

@@ -103,6 +103,11 @@ public void toJson(Collection obj, StringBuilder builder) throws IOException {
         builder.append(']');
     }
 
+    @Override
+    public Collection fromJson(JsonReader in) throws IOException, ClassNotFoundException {
+        return in.readArray();
+    }
+
     @SuppressWarnings("unchecked")
     private Constructor findConstructor() {
         try {