Merge branch 'master' into streamify
authorNiki Roo <niki@nikiroo.be>
Wed, 24 Apr 2019 19:42:42 +0000 (21:42 +0200)
committerNiki Roo <niki@nikiroo.be>
Wed, 24 Apr 2019 19:42:42 +0000 (21:42 +0200)
src/be/nikiroo/utils/serial/CustomSerializer.java
src/be/nikiroo/utils/serial/Exporter.java
src/be/nikiroo/utils/serial/SerialUtils.java
src/be/nikiroo/utils/serial/server/ConnectAction.java

index be89316eae07b74f6a67ccaeb589641ba81f8cea..80bac595a8a13068b1b45b10ece585c1566d5bb9 100644 (file)
@@ -1,34 +1,43 @@
 package be.nikiroo.utils.serial;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 public abstract class CustomSerializer {
 
-       protected abstract String toString(Object value);
+       protected abstract void toStream(OutputStream out, Object value)
+                       throws IOException;
 
-       protected abstract Object fromString(String content) throws IOException;
+       protected abstract Object fromStream(InputStream in) throws IOException;
 
        protected abstract String getType();
 
        /**
-        * Encode the object into the given builder if possible (if supported).
+        * Encode the object into the given {@link OutputStream} if supported.
         * 
-        * @param builder
+        * @param out
         *            the builder to append to
         * @param value
         *            the object to encode
-        * @return TRUE if success, FALSE if not (the content of the builder won't
-        *         be changed in case of failure)
+        * 
+        * @return FALSE if the value is not supported, TRUE if the operation was
+        *         successful (if the value is supported by the operation was not
+        *         successful, you will get an {@link IOException})
+        * 
+        * @throws IOException
+        *             in case of I/O error
         */
-       public boolean encode(StringBuilder builder, Object value) {
-               int prev = builder.length();
-               String customString = toString(value);
-               builder.append("custom^").append(getType()).append("^");
-               if (!SerialUtils.encode(builder, customString)) {
-                       builder.delete(prev, builder.length());
+       public boolean encode(OutputStream out, Object value) throws IOException {
+               if (!isSupported(value)) {
                        return false;
                }
 
+               SerialUtils.write(out, "custom^");
+               SerialUtils.write(out, getType());
+               SerialUtils.write(out, "^");
+               toStream(out, value);
+
                return true;
        }
 
index dc96d973226fbcaaf09331ae8f0b6ac3d68ada98..709c5903f6b4e9e9f62515bc601432e6aad200b7 100644 (file)
@@ -2,6 +2,7 @@ package be.nikiroo.utils.serial;
 
 import java.io.IOException;
 import java.io.NotSerializableException;
+import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,14 +18,19 @@ import be.nikiroo.utils.StringUtils;
  */
 public class Exporter {
        private Map<Integer, Object> map;
-       private StringBuilder builder;
+       private OutputStream out;
 
        /**
         * Create a new {@link Exporter}.
         */
-       public Exporter() {
+       public Exporter(OutputStream out) {
+               if (out == null) {
+                       throw new NullPointerException(
+                                       "Cannot create an be.nikiroo.utils.serials.Exporter that will export to NULL");
+               }
+
+               this.out = out;
                map = new HashMap<Integer, Object>();
-               builder = new StringBuilder();
        }
 
        /**
@@ -42,26 +48,21 @@ public class Exporter {
         *             if the object cannot be serialised (in this case, the
         *             {@link Exporter} can contain bad, most probably not
         *             importable data)
+        * @throws IOException
+        *             in case of I/O error
         */
-       public Exporter append(Object o) throws NotSerializableException {
-               SerialUtils.append(builder, o, map);
+       public Exporter append(Object o) throws NotSerializableException,
+                       IOException {
+               SerialUtils.append(out, o, map);
                return this;
        }
 
-       /**
-        * Clear the current content.
-        */
-       public void clear() {
-               builder.setLength(0);
-               map.clear();
-       }
-
        /**
         * Append the exported items in a serialised form into the given
-        * {@link StringBuilder}.
+        * {@link OutputStream}.
         * 
-        * @param toBuilder
-        *            the {@link StringBuilder}
+        * @param out
+        *            the {@link OutputStream}
         * @param b64
         *            TRUE to have BASE64-coded content, FALSE to have raw content,
         *            NULL to let the system decide
@@ -69,17 +70,17 @@ public class Exporter {
         *            TRUE to zip the BASE64 output if the output is indeed in
         *            BASE64 format, FALSE not to
         */
-       public void appendTo(StringBuilder toBuilder, Boolean b64, boolean zip) {
-               if (b64 == null && builder.length() < 128) {
+       public void appendTo(OutputStream out, Boolean b64, boolean zip) {
+               if (b64 == null && out.length() < 128) {
                        b64 = false;
                }
 
                if (b64 == null || b64) {
                        try {
-                               String zipped = StringUtils.base64(builder.toString(), zip);
-                               if (b64 != null || zipped.length() < builder.length() - 4) {
-                                       toBuilder.append(zip ? "ZIP:" : "B64:");
-                                       toBuilder.append(zipped);
+                               String zipped = StringUtils.base64(out.toString(), zip);
+                               if (b64 != null || zipped.length() < out.length() - 4) {
+                                       SerialUtils.write(out, zip ? "ZIP:" : "B64:");
+                                       SerialUtils.write(out, zipped);
                                        return;
                                }
                        } catch (IOException e) {
@@ -89,51 +90,6 @@ public class Exporter {
                        }
                }
 
-               toBuilder.append(builder);
-       }
-
-       /**
-        * The exported items in a serialised form.
-        * 
-        * @deprecated use {@link Exporter#toString(Boolean, boolean)} instead
-        * 
-        * @param zip
-        *            TRUE to have zipped (and BASE64-coded) content, FALSE to have
-        *            raw content, NULL to let the system decide
-        * 
-        * @return the items currently in this {@link Exporter}
-        */
-       @Deprecated
-       public String toString(Boolean zip) {
-               return toString(zip, zip == null || zip);
-       }
-
-       /**
-        * The exported items in a serialised form.
-        * 
-        * @param b64
-        *            TRUE to have BASE64-coded content, FALSE to have raw content,
-        *            NULL to let the system decide
-        * @param zip
-        *            TRUE to zip the BASE64 output if the output is indeed in
-        *            BASE64 format, FALSE not to
-        * 
-        * @return the items currently in this {@link Exporter}
-        */
-       public String toString(Boolean b64, boolean zip) {
-               StringBuilder toBuilder = new StringBuilder();
-               appendTo(toBuilder, b64, zip);
-               return toBuilder.toString();
-       }
-
-       /**
-        * The exported items in a serialised form (possibly BASE64-coded, possibly
-        * zipped).
-        * 
-        * @return the items currently in this {@link Exporter}
-        */
-       @Override
-       public String toString() {
-               return toString(null, true);
+               out.append(out);
        }
 }
\ No newline at end of file
index 706d579970f9456fd430d4ae2020185aa8c7ed24..e88337b0a7f68ac03fd10ce2696909bb0cf8a187 100644 (file)
@@ -1,7 +1,10 @@
 package be.nikiroo.utils.serial;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.NotSerializableException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -53,39 +56,42 @@ public class SerialUtils {
                // Array types:
                customTypes.put("[]", new CustomSerializer() {
                        @Override
-                       protected String toString(Object value) {
+                       protected void toStream(OutputStream out, Object value)
+                                       throws IOException {
                                String type = value.getClass().getCanonicalName();
                                type = type.substring(0, type.length() - 2); // remove the []
 
-                               StringBuilder builder = new StringBuilder();
-                               builder.append(type).append("\n");
+                               write(out,type);
+                               write(out,"\n");
                                try {
                                        for (int i = 0; true; i++) {
                                                Object item = Array.get(value, i);
                                                // encode it normally if direct value
-                                               if (!SerialUtils.encode(builder, item)) {
+                                               if (!SerialUtils.encode(out, item)) {
                                                        try {
-                                                               // use ZIP: if not
-                                                               new Exporter().append(item).appendTo(builder,
-                                                                               true, false);
+                                                               // TODO: use ZIP: if not?
+                                                               new Exporter(out).append(item);
                                                        } catch (NotSerializableException e) {
                                                                throw new UnknownFormatConversionException(e
                                                                                .getMessage());
                                                        }
                                                }
-                                               builder.append("\n");
+                                               write(out,"\n");
                                        }
                                } catch (ArrayIndexOutOfBoundsException e) {
                                        // Done.
                                }
-
-                               return builder.toString();
                        }
 
                        @Override
                        protected String getType() {
                                return "[]";
                        }
+                       
+                       @Override
+                       protected Object fromStream(InputStream in) throws IOException {
+                               return null;
+                       }
 
                        @Override
                        protected Object fromString(String content) throws IOException {
@@ -252,14 +258,14 @@ public class SerialUtils {
        }
 
        /**
-        * Serialise the given object into this {@link StringBuilder}.
+        * Serialise the given object into this {@link OutputStream}.
         * <p>
         * <b>Important: </b>If the operation fails (with a
         * {@link NotSerializableException}), the {@link StringBuilder} will be
         * corrupted (will contain bad, most probably not importable data).
         * 
-        * @param builder
-        *            the output {@link StringBuilder} to serialise to
+        * @param out
+        *            the output {@link OutputStream} to serialise to
         * @param o
         *            the object to serialise
         * @param map
@@ -271,9 +277,11 @@ public class SerialUtils {
         *             if the object cannot be serialised (in this case, the
         *             {@link StringBuilder} can contain bad, most probably not
         *             importable data)
+        * @throws IOException
+        *             in case of I/O errors
         */
-       static void append(StringBuilder builder, Object o, Map<Integer, Object> map)
-                       throws NotSerializableException {
+       static void append(OutputStream out, Object o, Map<Integer, Object> map)
+                       throws NotSerializableException, IOException {
 
                Field[] fields = new Field[] {};
                String type = "";
@@ -295,9 +303,13 @@ public class SerialUtils {
                        }
                }
 
-               builder.append("{\nREF ").append(type).append("@").append(id)
-                               .append(":");
-               if (!encode(builder, o)) { // check if direct value
+               write(out, "{\nREF ");
+               write(out, type);
+               write(out, "@");
+               write(out, id);
+               write(out, ":");
+
+               if (!encode(out, o)) { // check if direct value
                        try {
                                for (Field field : fields) {
                                        field.setAccessible(true);
@@ -311,16 +323,15 @@ public class SerialUtils {
                                                continue;
                                        }
 
-                                       builder.append("\n");
-                                       builder.append(field.getName());
-                                       builder.append(":");
-                                       Object value;
+                                       write(out, "\n");
+                                       write(out, field.getName());
+                                       write(out, ":");
 
-                                       value = field.get(o);
+                                       Object value = field.get(o);
 
-                                       if (!encode(builder, value)) {
-                                               builder.append("\n");
-                                               append(builder, value, map);
+                                       if (!encode(out, value)) {
+                                               write(out, "\n");
+                                               append(out, value, map);
                                        }
                                }
                        } catch (IllegalArgumentException e) {
@@ -331,11 +342,12 @@ public class SerialUtils {
                                                                                // setAccessible)
                        }
                }
-               builder.append("\n}");
+               write(out, "\n}");
        }
 
        /**
-        * Encode the object into the given builder if possible and if supported.
+        * Encode the object into the given {@link OutputStream} if possible and if
+        * supported.
         * <p>
         * A supported object in this context means an object we can directly
         * encode, like an Integer or a String. Custom objects and arrays are also
@@ -343,47 +355,57 @@ public class SerialUtils {
         * <p>
         * For compound objects, you should use {@link Exporter}.
         * 
-        * @param builder
-        *            the builder to append to
+        * @param out
+        *            the {@link OutputStream} to append to
         * @param value
         *            the object to encode (can be NULL, which will be encoded)
         * 
-        * @return TRUE if success, FALSE if not (the content of the builder won't
-        *         be changed in case of failure)
+        * @return TRUE if success, FALSE if not (the content of the
+        *         {@link OutputStream} won't be changed in case of failure)
+        * 
+        * @throws IOException
+        *             in case of I/O error
         */
-       static boolean encode(StringBuilder builder, Object value) {
+       static boolean encode(OutputStream out, Object value) throws IOException {
                if (value == null) {
-                       builder.append("NULL");
+                       write(out, "NULL");
                } else if (value.getClass().getSimpleName().endsWith("[]")) {
                        // Simple name does support [] suffix and do not return NULL for
                        // inner anonymous classes
-                       return customTypes.get("[]").encode(builder, value);
+                       return customTypes.get("[]").encode(out, value);
                } else if (customTypes.containsKey(value.getClass().getCanonicalName())) {
                        return customTypes.get(value.getClass().getCanonicalName())//
-                                       .encode(builder, value);
+                                       .encode(out, value);
                } else if (value instanceof String) {
-                       encodeString(builder, (String) value);
+                       encodeString(out, (String) value);
                } else if (value instanceof Boolean) {
-                       builder.append(value);
+                       write(out, value);
                } else if (value instanceof Byte) {
-                       builder.append(value).append('b');
+                       write(out, value);
+                       write(out, "b");
                } else if (value instanceof Character) {
-                       encodeString(builder, "" + value);
-                       builder.append('c');
+                       encodeString(out, "" + value);
+                       write(out, "c");
                } else if (value instanceof Short) {
-                       builder.append(value).append('s');
+                       write(out, value);
+                       write(out, "s");
                } else if (value instanceof Integer) {
-                       builder.append(value);
+                       write(out, value);
                } else if (value instanceof Long) {
-                       builder.append(value).append('L');
+                       write(out, value);
+                       write(out, "L");
                } else if (value instanceof Float) {
-                       builder.append(value).append('F');
+                       write(out, value);
+                       write(out, "F");
                } else if (value instanceof Double) {
-                       builder.append(value).append('d');
+                       write(out, value);
+                       write(out, "d");
                } else if (value instanceof Enum) {
                        String type = value.getClass().getCanonicalName();
-                       builder.append(type).append(".").append(((Enum<?>) value).name())
-                                       .append(";");
+                       write(out, type);
+                       write(out, ".");
+                       write(out, ((Enum<?>) value).name());
+                       write(out, ";");
                } else {
                        return false;
                }
@@ -456,6 +478,27 @@ public class SerialUtils {
                }
        }
 
+       /**
+        * Write the given {@link String} into the given {@link OutputStream} in
+        * UTF-8.
+        * 
+        * @param out
+        *            the {@link OutputStream}
+        * @param data
+        *            the data to write, cannot be NULL
+        * 
+        * @throws IOException
+        *             in case of I/O error
+        */
+       static void write(OutputStream out, Object data) throws IOException {
+               try {
+                       out.write(data.toString().getBytes("UTF-8"));
+               } catch (UnsupportedEncodingException e) {
+                       // A conforming JVM is required to support UTF-8
+                       e.printStackTrace();
+               }
+       }
+
        /**
         * Return the corresponding class or throw an {@link Exception} if it
         * cannot.
@@ -507,7 +550,7 @@ public class SerialUtils {
        }
 
        @SuppressWarnings({ "unchecked", "rawtypes" })
-       private static Enum<?> decodeEnum(String escaped) {
+       static private Enum<?> decodeEnum(String escaped) {
                // escaped: be.xxx.EnumType.VALUE;
                int pos = escaped.lastIndexOf(".");
                String type = escaped.substring(0, pos);
@@ -522,32 +565,56 @@ public class SerialUtils {
        }
 
        // aa bb -> "aa\tbb"
-       private static void encodeString(StringBuilder builder, String raw) {
-               builder.append('\"');
+       static void encodeString(OutputStream out, String raw) throws IOException {
+               out.write('\"');
+               // TODO !! utf-8 required
                for (char car : raw.toCharArray()) {
-                       switch (car) {
-                       case '\\':
-                               builder.append("\\\\");
-                               break;
-                       case '\r':
-                               builder.append("\\r");
-                               break;
-                       case '\n':
-                               builder.append("\\n");
-                               break;
-                       case '"':
-                               builder.append("\\\"");
-                               break;
-                       default:
-                               builder.append(car);
-                               break;
+                       encodeString(out, car);
+               }
+               out.write('\"');
+       }
+
+       // aa bb -> "aa\tbb"
+       static void encodeString(OutputStream out, InputStream raw)
+                       throws IOException {
+               out.write('\"');
+               byte buffer[] = new byte[4069];
+               for (int len = 0; (len = raw.read(buffer)) > 0;) {
+                       for (int i = 0; i < len; i++) {
+                               // TODO: not 100% correct, look up howto for UTF-8
+                               encodeString(out, (char) buffer[i]);
                        }
                }
-               builder.append('\"');
+               out.write('\"');
+       }
+
+       // for encode string, NOT to encode a char by itself!
+       static void encodeString(OutputStream out, char raw) throws IOException {
+               switch (raw) {
+               case '\\':
+                       out.write('\\');
+                       out.write('\\');
+                       break;
+               case '\r':
+                       out.write('\\');
+                       out.write('r');
+                       break;
+               case '\n':
+                       out.write('\\');
+                       out.write('n');
+                       break;
+               case '"':
+                       out.write('\\');
+                       out.write('\"');
+                       break;
+               default:
+                       out.write(raw);
+                       break;
+               }
        }
 
        // "aa\tbb" -> aa bb
-       private static String decodeString(String escaped) {
+       static String decodeString(String escaped) {
                StringBuilder builder = new StringBuilder();
 
                boolean escaping = false;
index a377ced597f2a6bd84d01fd008f7f5099b9409a3..6af3be7357a06ca345a73091a1cb331acb75b987 100644 (file)
@@ -365,15 +365,15 @@ abstract class ConnectAction {
         */
        private void writeLine(OutputStream out, String line) throws IOException {
                if (crypt == null) {
-                       out.write(line.getBytes());
+                       out.write(line.getBytes("UTF-8"));
                        bytesSent += line.length();
                } else {
                        // TODO: how NOT to create so many big Strings?
                        String b64 = crypt.encrypt64(line, false);
-                       out.write(b64.getBytes());
+                       out.write(b64.getBytes("UTF-8"));
                        bytesSent += b64.length();
                }
-               out.write("\n".getBytes());
+               out.write("\n".getBytes("UTF-8"));
                bytesSent++;
        }
 }
\ No newline at end of file