X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FCustomSerializer.java;h=e58ccf2af5945eab2ba4b508bd9d04c9213c56f1;hb=28bee1c360ac061db48395356f36ef62c2923bf1;hp=fe63f71903619c6ae49f7fa8d765ddf0b2858f0a;hpb=dce410fec00030c0affde7b19bcde6de847fae13;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/utils/serial/CustomSerializer.java b/src/be/nikiroo/utils/serial/CustomSerializer.java
index fe63f71..e58ccf2 100644
--- a/src/be/nikiroo/utils/serial/CustomSerializer.java
+++ b/src/be/nikiroo/utils/serial/CustomSerializer.java
@@ -4,10 +4,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.streams.BufferedInputStream;
-import be.nikiroo.utils.streams.NextableInputStream;
-import be.nikiroo.utils.streams.NextableInputStreamStep;
import be.nikiroo.utils.streams.ReplaceInputStream;
import be.nikiroo.utils.streams.ReplaceOutputStream;
@@ -78,7 +75,12 @@ public abstract class CustomSerializer {
protected abstract String getType();
/**
- * Encode the object into the given {@link OutputStream}.
+ * Encode the object into the given {@link OutputStream}, i.e., generate the
+ * ENCODED_VALUE part.
+ *
+ * Use whatever scheme you wish, the system shall ensure that the content is
+ * correctly encoded and that you will receive the same content at decode
+ * time.
*
* @param out
* the builder to append to
@@ -105,6 +107,14 @@ public abstract class CustomSerializer {
/**
* Decode the value back into the supported object type.
+ *
+ * We do not expect the full content here but only:
+ *
+ * - ENCODED_VALUE
+ *
-
+ *
+ * That is, we do not expect the "custom^TYPE^"
+ * part.
*
* @param in
* the encoded value
@@ -120,58 +130,14 @@ public abstract class CustomSerializer {
new String[] { "\\", "\n" });
try {
- NextableInputStream stream = new NextableInputStream(
- replace.open(), 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");
- }
-
- return fromStream(stream);
- } finally {
- stream.close();
- }
+ return fromStream(replace);
} finally {
replace.close(false);
}
}
- /** Use {@link CustomSerializer#isCustom(BufferedInputStream)}. */
- @Deprecated
- public static boolean isCustom(String encodedValue) {
- int pos1 = encodedValue.indexOf('^');
- int pos2 = encodedValue.indexOf('^', pos1 + 1);
-
- return pos1 >= 0 && pos2 >= 0 && encodedValue.startsWith("custom^");
- }
-
public static boolean isCustom(BufferedInputStream in) throws IOException {
- return in.startsWiths("custom^");
+ return in.startsWith("custom^");
}
public static String typeOf(String encodedValue) {