fix namespace from master merge

[nikiroo-utils.git] / src / be / nikiroo / utils / serial / CustomSerializer.java

diff --git a/src/be/nikiroo/utils/serial/CustomSerializer.java b/src/be/nikiroo/utils/serial/CustomSerializer.java
index 0bafb86f65152755ca7684614622af34e7aec449..36a6c214c02576deb012316e2d6338477554d6e5 100644 (file)
--- a/src/be/nikiroo/utils/serial/CustomSerializer.java
+++ b/src/be/nikiroo/utils/serial/CustomSerializer.java
@@ -1,59 +1,105 @@
 package be.nikiroo.utils.serial;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.streams.NextableInputStream;
+import be.nikiroo.utils.streams.NextableInputStreamStep;
 
 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());
-                       return false;
-               }
+       public boolean encode(OutputStream out, Object value) throws IOException {
+               SerialUtils.write(out, "custom^");
+               SerialUtils.write(out, getType());
+               SerialUtils.write(out, "^");
+               // TODO: manage ENTER
+               toStream(out, value);
 
                return true;
        }
 
-       public Object decode(String encodedValue) throws IOException {
-               return fromString((String) SerialUtils.decode(contentOf(encodedValue)));
+       public Object decode(InputStream in) throws IOException {
+               // TODO: manage ENTER
+               NextableInputStream stream = new NextableInputStream(in,
+                               new NextableInputStreamStep('^'));
+
+               try {
+                       if (!stream.next()) {
+                               throw new IOException("Cannot find the first custom^ element");
+                       }
+
+                       String custom = IOUtils.readSmallStream(stream);
+                       if (!"custom".equals(custom)) {
+                               throw new IOException(
+                                               "Cannot find the first custom^ element, it is: "
+                                                               + custom + "^");
+                       }
+
+                       if (!stream.next()) {
+                               throw new IOException("Cannot find the second custom^"
+                                               + getType() + " element");
+                       }
+
+                       String type = IOUtils.readSmallStream(stream);
+                       if (!getType().equals(type)) {
+                               throw new IOException("Cannot find the second custom^"
+                                               + getType() + " element, it is: custom^" + type + "^");
+                       }
+
+                       if (!stream.nextAll()) {
+                               throw new IOException("Cannot find the third custom^"
+                                               + getType() + "^value element");
+                       }
+
+                       // TODO: manage ENTER
+                       return fromStream(stream);
+               } finally {
+                       stream.close(false);
+               }
        }
 
        public static boolean isCustom(String encodedValue) {
-               int pos1 = encodedValue.indexOf(':');
-               int pos2 = encodedValue.indexOf(':', pos1 + 1);
+               int pos1 = encodedValue.indexOf('^');
+               int pos2 = encodedValue.indexOf('^', pos1 + 1);
 
-               return pos1 >= 0 && pos2 >= 0 && encodedValue.startsWith("custom:");
+               return pos1 >= 0 && pos2 >= 0 && encodedValue.startsWith("custom^");
        }
 
        public static String typeOf(String encodedValue) {
-               int pos1 = encodedValue.indexOf(':');
-               int pos2 = encodedValue.indexOf(':', pos1 + 1);
+               int pos1 = encodedValue.indexOf('^');
+               int pos2 = encodedValue.indexOf('^', pos1 + 1);
                String type = encodedValue.substring(pos1 + 1, pos2);
 
                return type;
        }
 
        public static String contentOf(String encodedValue) {
-               int pos1 = encodedValue.indexOf(':');
-               int pos2 = encodedValue.indexOf(':', pos1 + 1);
+               int pos1 = encodedValue.indexOf('^');
+               int pos2 = encodedValue.indexOf('^', pos1 + 1);
                String encodedContent = encodedValue.substring(pos2 + 1);
 
                return encodedContent;