X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FSerialUtils.java;h=decf57525fb30336ab00dee5be5bb2952d5f8196;hb=0ff71477abf90d4843b8d9a3dc9907b5edc95fc0;hp=c28faeddebd86cd783e4924460aa01cb749f4b83;hpb=e570f7eb0843d1074c3fc46dd759125715d68df0;p=fanfix.git
diff --git a/src/be/nikiroo/utils/serial/SerialUtils.java b/src/be/nikiroo/utils/serial/SerialUtils.java
index c28faed..decf575 100644
--- a/src/be/nikiroo/utils/serial/SerialUtils.java
+++ b/src/be/nikiroo/utils/serial/SerialUtils.java
@@ -11,13 +11,33 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UnknownFormatConversionException;
-import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.ImageUtils;
/**
* Small class to help with serialisation.
*
* Note that we do not support inner classes (but we do support nested classes)
* and all objects require an empty constructor to be deserialised.
+ *
+ * It is possible to add support to custom types (both the encoder and the
+ * decoder will require the custom classes) -- see {@link CustomSerializer}.
+ *
+ * Default supported types are:
+ *
+ * - NULL (as a null value)
+ * - String
+ * - Boolean
+ * - Byte
+ * - Character
+ * - Short
+ * - Long
+ * - Float
+ * - Double
+ * - Integer
+ * - Enum (any enum whose name and value is known by the caller)
+ * - java.awt.image.BufferedImage (as a {@link CustomSerializer})
+ * - An array of the above (as a {@link CustomSerializer})
+ *
*
* @author niki
*/
@@ -65,7 +85,7 @@ public class SerialUtils {
}
@Override
- protected Object fromString(String content) {
+ protected Object fromString(String content) throws IOException {
String[] tab = content.split("\n");
try {
@@ -78,7 +98,10 @@ public class SerialUtils {
return array;
} catch (Exception e) {
- throw new UnknownFormatConversionException(e.getMessage());
+ if (e instanceof IOException) {
+ throw (IOException) e;
+ }
+ throw new IOException(e.getMessage());
}
}
});
@@ -88,7 +111,7 @@ public class SerialUtils {
@Override
protected String toString(Object value) {
try {
- return StringUtils.fromImage((BufferedImage) value);
+ return ImageUtils.toBase64((BufferedImage) value);
} catch (IOException e) {
throw new UnknownFormatConversionException(e.getMessage());
}
@@ -102,7 +125,7 @@ public class SerialUtils {
@Override
protected Object fromString(String content) {
try {
- return StringUtils.toImage(content);
+ return ImageUtils.fromBase64(content);
} catch (IOException e) {
throw new UnknownFormatConversionException(e.getMessage());
}
@@ -249,14 +272,24 @@ public class SerialUtils {
builder.append("\n}");
}
- // return true if encoded (supported)
+ /**
+ * Encode the object into the given builder if possible (if supported).
+ *
+ * @param builder
+ * the builder 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)
+ */
static boolean encode(StringBuilder builder, Object value) {
if (value == null) {
builder.append("NULL");
} else if (value.getClass().getCanonicalName().endsWith("[]")) {
- customTypes.get("[]").encode(builder, value);
+ return customTypes.get("[]").encode(builder, value);
} else if (customTypes.containsKey(value.getClass().getCanonicalName())) {
- customTypes.get(value.getClass().getCanonicalName())//
+ return customTypes.get(value.getClass().getCanonicalName())//
.encode(builder, value);
} else if (value instanceof String) {
encodeString(builder, (String) value);
@@ -288,45 +321,62 @@ public class SerialUtils {
return true;
}
- static Object decode(String encodedValue) {
- String cut = "";
- if (encodedValue.length() > 1) {
- cut = encodedValue.substring(0, encodedValue.length() - 1);
- }
+ /**
+ * Decode the data into an equivalent source object.
+ *
+ * @param encodedValue
+ * the encoded data, cannot be NULL
+ *
+ * @return the object (can be NULL for NULL encoded values)
+ *
+ * @throws IOException
+ * if the content cannot be converted
+ */
+ static Object decode(String encodedValue) throws IOException {
+ try {
+ String cut = "";
+ if (encodedValue.length() > 1) {
+ cut = encodedValue.substring(0, encodedValue.length() - 1);
+ }
- if (CustomSerializer.isCustom(encodedValue)) {
- // custom:TYPE_NAME:"content is String-encoded"
- String type = CustomSerializer.typeOf(encodedValue);
- if (customTypes.containsKey(type)) {
- return customTypes.get(type).decode(encodedValue);
+ if (CustomSerializer.isCustom(encodedValue)) {
+ // custom:TYPE_NAME:"content is String-encoded"
+ String type = CustomSerializer.typeOf(encodedValue);
+ if (customTypes.containsKey(type)) {
+ return customTypes.get(type).decode(encodedValue);
+ }
+ throw new IOException("Unknown custom type: " + type);
+ } else if (encodedValue.equals("NULL")
+ || encodedValue.equals("null")) {
+ return null;
+ } else if (encodedValue.endsWith("\"")) {
+ return decodeString(encodedValue);
+ } else if (encodedValue.equals("true")) {
+ return true;
+ } else if (encodedValue.equals("false")) {
+ return false;
+ } else if (encodedValue.endsWith("b")) {
+ return Byte.parseByte(cut);
+ } else if (encodedValue.endsWith("c")) {
+ return decodeString(cut).charAt(0);
+ } else if (encodedValue.endsWith("s")) {
+ return Short.parseShort(cut);
+ } else if (encodedValue.endsWith("L")) {
+ return Long.parseLong(cut);
+ } else if (encodedValue.endsWith("F")) {
+ return Float.parseFloat(cut);
+ } else if (encodedValue.endsWith("d")) {
+ return Double.parseDouble(cut);
+ } else if (encodedValue.endsWith(";")) {
+ return decodeEnum(encodedValue);
} else {
- throw new UnknownFormatConversionException(
- "Unknown custom type: " + type);
+ return Integer.parseInt(encodedValue);
}
- } else if (encodedValue.equals("NULL") || encodedValue.equals("null")) {
- return null;
- } else if (encodedValue.endsWith("\"")) {
- return decodeString(encodedValue);
- } else if (encodedValue.equals("true")) {
- return true;
- } else if (encodedValue.equals("false")) {
- return false;
- } else if (encodedValue.endsWith("b")) {
- return Byte.parseByte(cut);
- } else if (encodedValue.endsWith("c")) {
- return decodeString(cut).charAt(0);
- } else if (encodedValue.endsWith("s")) {
- return Short.parseShort(cut);
- } else if (encodedValue.endsWith("L")) {
- return Long.parseLong(cut);
- } else if (encodedValue.endsWith("F")) {
- return Float.parseFloat(cut);
- } else if (encodedValue.endsWith("d")) {
- return Double.parseDouble(cut);
- } else if (encodedValue.endsWith(";")) {
- return decodeEnum(encodedValue);
- } else {
- return Integer.parseInt(encodedValue);
+ } catch (Exception e) {
+ if (e instanceof IOException) {
+ throw (IOException) e;
+ }
+ throw new IOException(e.getMessage());
}
}
@@ -390,7 +440,6 @@ public class SerialUtils {
try {
return Enum.valueOf((Class) getClass(type), name);
} catch (Exception e) {
- e.printStackTrace();
throw new UnknownFormatConversionException("Unknown enum: <" + type
+ "> " + name);
}