X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FImporter.java;h=d21f1dd341c9085af11a08015a05c5fb04fc5c14;hb=ce0974c4b695f842fa7ec81f3c53d016d1959854;hp=0709a96883c77b005f57ddf04de4ac15b04165ac;hpb=aad145868879e293dbe391c005c1a6885341529b;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/Importer.java b/src/be/nikiroo/utils/serial/Importer.java
index 0709a96..d21f1dd 100644
--- a/src/be/nikiroo/utils/serial/Importer.java
+++ b/src/be/nikiroo/utils/serial/Importer.java
@@ -1,12 +1,11 @@
 package be.nikiroo.utils.serial;
 
+import java.io.IOException;
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Scanner;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Field;
 
-import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -36,35 +35,70 @@ public class Importer {
 		this.map = map;
 	}
 
-	public Importer readLine(String line) {
-		try {
-			processLine(line);
-		} catch (Exception e) {
-			throw new IllegalArgumentException(e);
-		}
-		return this;
-	}
+	/**
+	 * Read some data into this {@link Importer}: it can be the full serialised
+	 * content, or a number of lines of it (any given line <b>MUST</b> be
+	 * complete though) and accumulate it with the already present data.
+	 * 
+	 * @param data
+	 *            the data to parse
+	 * 
+	 * @return itself so it can be chained
+	 * 
+	 * @throws NoSuchFieldException
+	 *             if the serialised data contains information about a field
+	 *             which does actually not exist in the class we know of
+	 * @throws NoSuchMethodException
+	 *             if a class described in the serialised data cannot be created
+	 *             because it is not compatible with this code
+	 * @throws ClassNotFoundException
+	 *             if a class described in the serialised data cannot be found
+	 */
+	public Importer read(String data) throws NoSuchFieldException,
+			NoSuchMethodException, ClassNotFoundException {
 
-	public Importer read(String data) {
 		try {
-			if (data.startsWith("ZIP:")) {
-				data = StringUtils.unzip64(data.substring("ZIP:".length()));
-			}
 			Scanner scan = new Scanner(data);
 			scan.useDelimiter("\n");
 			while (scan.hasNext()) {
-				processLine(scan.next());
+				String line = scan.next();
+
+				if (line.startsWith("ZIP:")) {
+					line = StringUtils.unzip64(line.substring("ZIP:".length()));
+					read(line);
+				} else {
+					processLine(line);
+				}
 			}
 			scan.close();
-		} catch (Exception e) {
-			throw new IllegalArgumentException(e);
+		} catch (IOException e) {
+			throw new NoSuchMethodException(
+					"Internal error when decoding ZIP content: input may be corrupt");
 		}
+
 		return this;
 	}
 
-	public boolean processLine(String line) throws IllegalArgumentException,
-			NoSuchFieldException, SecurityException, IllegalAccessException,
-			NoSuchMethodException, InstantiationException, ClassNotFoundException, InvocationTargetException {
+	/**
+	 * Read a single (whole) line of serialised data into this {@link Importer}
+	 * and accumulate it with the already present data.
+	 * 
+	 * @param line
+	 *            the line to parse
+	 * 
+	 * @return TRUE if we are just done with one object or sub-object
+	 * 
+	 * @throws NoSuchFieldException
+	 *             if the serialised data contains information about a field
+	 *             which does actually not exist in the class we know of
+	 * @throws NoSuchMethodException
+	 *             if a class described in the serialised data cannot be created
+	 *             because it is not compatible with this code
+	 * @throws ClassNotFoundException
+	 *             if a class described in the serialised data cannot be found
+	 */
+	private boolean processLine(String line) throws NoSuchFieldException,
+			NoSuchMethodException, ClassNotFoundException {
 		// Defer to latest child if any
 		if (child != null) {
 			if (child.processLine(line)) {
@@ -85,18 +119,33 @@ public class Importer {
 		} else if (line.equals("}")) { // STOP: report self to parent
 			return true;
 		} else if (line.startsWith("REF ")) { // REF: create/link self
-			String ref = line.substring(4).split("@")[1];
+			String[] tab = line.substring("REF ".length()).split("@");
+			String type = tab[0];
+			tab = tab[1].split(":");
+			String ref = tab[0];
+
 			link = map.containsKey(ref);
 			if (link) {
 				me = map.get(ref);
 			} else {
-				me = SerialUtils.createObject(line.substring(4).split("@")[0]);
+				if (line.endsWith(":")) {
+					// construct
+					me = SerialUtils.createObject(type);
+				} else {
+					// direct value
+					int pos = line.indexOf(":");
+					String encodedValue = line.substring(pos + 1);
+					me = SerialUtils.decode(encodedValue);
+				}
 				map.put(ref, me);
 			}
-		} else { // FIELD: new field
+		} else { // FIELD: new field *or* direct simple value
 			if (line.endsWith(":")) {
 				// field value is compound
 				currentFieldName = line.substring(0, line.length() - 1);
+			} else if (line.startsWith(":") || !line.contains(":")) {
+				// not a field value but a direct value
+				me = SerialUtils.decode(line);
 			} else {
 				// field value is direct
 				int pos = line.indexOf(":");
@@ -118,8 +167,7 @@ public class Importer {
 	}
 
 	private void setField(String name, Object value)
-			throws NoSuchFieldException, SecurityException,
-			IllegalArgumentException, IllegalAccessException {
+			throws NoSuchFieldException {
 
 		try {
 			Field field = me.getClass().getDeclaredField(name);
@@ -130,9 +178,18 @@ public class Importer {
 			throw new NoSuchFieldException(String.format(
 					"Field \"%s\" was not found in object of type \"%s\".",
 					name, me.getClass().getCanonicalName()));
+		} catch (Exception e) {
+			throw new NoSuchFieldException(String.format(
+					"Internal error when setting \"%s.%s\": %s", me.getClass()
+							.getCanonicalName(), name, e.getMessage()));
 		}
 	}
 
+	/**
+	 * Return the current deserialised value.
+	 * 
+	 * @return the current value
+	 */
 	public Object getValue() {
 		return me;
 	}