Handling of enums

Source/Core/src/ca/uqac/lif/azrael/ObjectPrinter.java

@@ -34,18 +34,18 @@ public abstract class ObjectPrinter<T>
 	 * types
 	 */
 	protected List<PrintHandler<T>> m_handlers;
-	
+
 	/**
 	 * The default handler to use when no other handler accepts an object
 	 */
 	protected PrintHandler<T> m_reflectionHandler = new ReflectionPrintHandler<T>(this);
-	
+
 	/**
 	 * Whether to use the {@link Readable} interface when an object
 	 * implements it
 	 */
 	protected boolean m_usePrintable = true;
-	
+
 	/**
 	 * Creates a new object printer
 	 */
@@ -54,7 +54,7 @@ public ObjectPrinter()
 		super();
 		m_handlers = new ArrayList<PrintHandler<T>>();
 	}
-	
+
 	/**
 	 * Serializes the contents of an object. If the object implements the
 	 * {@link Printable} interface, it is serialized by calling its
@@ -85,7 +85,7 @@ public T print(Object o) throws PrintException
 		}
 		return m_reflectionHandler.handle(o);
 	}
-	
+
 	/**
 	 * Wraps an object into a structure that contains its type declaration
 	 * and its printed contents
@@ -95,7 +95,7 @@ public T print(Object o) throws PrintException
 	 * @throws PrintException Thrown if the print operation caused an error
 	 */
 	public abstract T wrap(Object o, T t) throws PrintException;
-	
+
 	/**
 	 * Resets the state of the printer
 	 */
@@ -110,7 +110,7 @@ public void reset()
 			m_reflectionHandler.reset();
 		}
 	}
-	
+
 	/**
 	 * Tells whether the object printer uses the {@link Printable}
 	 * interface when an object implements it
@@ -120,4 +120,13 @@ public boolean usesPrintable()
 	{
 		return m_usePrintable;
 	}
+
+	/**
+	 * Prints a version number
+	 * @return The number
+	 */
+	public static String getVersionString()
+	{
+		return "2.0";
+	}
 }

Source/Core/src/ca/uqac/lif/azrael/ObjectReader.java

@@ -22,6 +22,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -57,6 +58,7 @@ public ObjectReader()
 	{
 		super();
 		m_handlers = new ArrayList<ReadHandler<T>>();
+		m_classLoaders = new HashSet<ClassLoader>();
 	}
 
 	/**

Source/Core/src/ca/uqac/lif/azrael/ReflectionPrintHandler.java

@@ -111,7 +111,7 @@ protected static List<Field> getAllFields(Class<?> type)
 		while (it.hasNext())
 		{
 			Field f = it.next();
-			if (f.getName().startsWith("$") || f.getName().startsWith(("!")))
+			if (f.getClass().isEnum() || f.getName().startsWith("$") || f.getName().startsWith(("!")))
 			{
 				it.remove();
 			}

Source/Json/src/ca/uqac/lif/azrael/json/EnumPrintHandler.java

@@ -0,0 +1,42 @@
+/*
+    Azrael, a serializer for Java objects
+    Copyright (C) 2016-2019 Sylvain Hallé
+    Laboratoire d'informatique formelle
+    Université du Québec à Chicoutimi, Canada
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package ca.uqac.lif.azrael.json;
+
+import ca.uqac.lif.azrael.PrintException;
+import ca.uqac.lif.json.JsonElement;
+
+public class EnumPrintHandler extends JsonPrintHandler
+{
+	public EnumPrintHandler(JsonPrinter printer)
+	{
+		super(printer);
+	}
+
+	@Override
+	public boolean canHandle(Object o)
+	{
+		return o.getClass().isEnum();
+	}
+
+	@Override
+	public JsonElement handle(Object o) throws PrintException 
+	{
+		return m_printer.wrap(o, m_printer.print(o.toString()));
+	}
+}

Source/Json/src/ca/uqac/lif/azrael/json/EnumReadHandler.java

@@ -0,0 +1,52 @@
+/*
+    Azrael, a serializer for Java objects
+    Copyright (C) 2016-2019 Sylvain Hallé
+    Laboratoire d'informatique formelle
+    Université du Québec à Chicoutimi, Canada
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package ca.uqac.lif.azrael.json;
+
+import ca.uqac.lif.azrael.ReadException;
+import ca.uqac.lif.json.JsonElement;
+import ca.uqac.lif.json.JsonString;
+
+public class EnumReadHandler extends JsonReadHandler
+{
+
+	public EnumReadHandler(JsonReader reader)
+	{
+		super(reader);
+	}
+
+	@Override
+	public boolean canHandle(JsonElement o) throws ReadException
+	{
+		if (!m_reader.isWrapped(o))
+		{
+			return false;
+		}
+		Class<?> clazz = m_reader.unwrapType(o);
+		return clazz.isEnum();
+	}
+
+	@Override
+	public String handle(JsonElement o) throws ReadException
+	{
+		//Class<?> clazz = m_reader.unwrapType(o);
+		JsonString s = (JsonString) m_reader.unwrapContents(o);
+		return s.stringValue();
+	}
+
+}

Source/Json/src/ca/uqac/lif/azrael/json/JsonPrinter.java

@@ -33,15 +33,16 @@ public class JsonPrinter extends ObjectPrinter<JsonElement>
 	public JsonPrinter()
 	{
 		super();
+		m_handlers.add(new RawPrintHandler(this));
 		m_handlers.add(new NullPrintHandler(this));
 		m_handlers.add(new BooleanPrintHandler(this));
 		m_handlers.add(new NumberPrintHandler(this));
 		m_handlers.add(new StringPrintHandler(this));
 		m_handlers.add(new ListPrintHandler(this));
 		m_handlers.add(new QueuePrintHandler(this));
 		m_handlers.add(new SetPrintHandler(this));
+		m_handlers.add(new EnumPrintHandler(this));
 		m_handlers.add(new MapPrintHandler(this));
-		m_handlers.add(new RawPrintHandler(this));
 	}
 
 	@Override

Source/Json/src/ca/uqac/lif/azrael/json/JsonReader.java

@@ -41,6 +41,7 @@ public JsonReader()
 		m_handlers.add(new NumberReadHandler(this));
 		m_handlers.add(new StringReadHandler(this));
 		m_handlers.add(new ListReadHandler(this));
+		m_handlers.add(new EnumReadHandler(this));
 		m_handlers.add(new QueueReadHandler(this));
 		m_handlers.add(new SetReadHandler(this));
 		m_handlers.add(new MapReadHandler(this));

Source/Json/src/ca/uqac/lif/azrael/json/JsonTest.java

@@ -120,6 +120,21 @@ public void testJson4() throws PrintException, ReadException
 		assertEquals("bar", nco.m_objects.get(1).m_y);
 	}
 
+	@Test
+	public void testEnum1() throws PrintException, ReadException
+	{
+		EnumObject eo = new EnumObject();
+		JsonPrinter printer = new JsonPrinter();
+		JsonElement je = printer.print(eo);
+		assertNotNull(je);
+		JsonReader reader = new JsonReader();
+		Object o = reader.read(je);
+		assertNotNull(o);
+		assertTrue(o instanceof EnumObject);
+		EnumObject nco = (EnumObject) o;
+		assertEquals(nco.me, EnumObject.MyEnum.FOO); 
+	}
+
 	protected static class SimpleObject implements Printable, Readable
 	{
 		int m_x;
@@ -217,4 +232,11 @@ public void add(SimpleObject o)
 			m_objects.add(o);
 		}
 	}
+
+	protected static class EnumObject
+	{
+		public static enum MyEnum {FOO, BAR}
+
+		public MyEnum me = MyEnum.FOO;
+	}
 }

Source/Xml/src/ca/uqac/lif/azrael/xml/EnumPrintHandler.java

@@ -0,0 +1,42 @@
+/*
+    Azrael, a serializer for Java objects
+    Copyright (C) 2016-2019 Sylvain Hallé
+    Laboratoire d'informatique formelle
+    Université du Québec à Chicoutimi, Canada
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package ca.uqac.lif.azrael.xml;
+
+import ca.uqac.lif.azrael.PrintException;
+import ca.uqac.lif.xml.XmlElement;
+
+public class EnumPrintHandler extends XmlPrintHandler
+{
+	public EnumPrintHandler(XmlPrinter printer)
+	{
+		super(printer);
+	}
+
+	@Override
+	public boolean canHandle(Object o)
+	{
+		return o.getClass().isEnum();
+	}
+
+	@Override
+	public XmlElement handle(Object o) throws PrintException 
+	{
+		return m_printer.wrap(o, m_printer.print(o.toString()));
+	}
+}

Source/Xml/src/ca/uqac/lif/azrael/xml/EnumReadHandler.java

@@ -0,0 +1,50 @@
+/*
+    Azrael, a serializer for Java objects
+    Copyright (C) 2016-2019 Sylvain Hallé
+    Laboratoire d'informatique formelle
+    Université du Québec à Chicoutimi, Canada
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package ca.uqac.lif.azrael.xml;
+
+import ca.uqac.lif.azrael.ReadException;
+import ca.uqac.lif.xml.XmlElement;
+
+public class EnumReadHandler extends XmlReadHandler
+{
+
+	public EnumReadHandler(XmlReader reader)
+	{
+		super(reader);
+	}
+
+	@Override
+	public boolean canHandle(XmlElement o) throws ReadException
+	{
+		if (!m_reader.isWrapped(o))
+		{
+			return false;
+		}
+		Class<?> clazz = m_reader.unwrapType(o);
+		return clazz.isEnum();
+	}
+
+	@Override
+	public String handle(XmlElement o) throws ReadException
+	{
+		String s = (String) m_reader.unwrapContents(o);
+		return s;
+	}
+
+}

Source/Xml/src/ca/uqac/lif/azrael/xml/XmlReadHandler.java

@@ -0,0 +1,15 @@
+package ca.uqac.lif.azrael.xml;
+
+import ca.uqac.lif.azrael.ReadHandler;
+import ca.uqac.lif.xml.XmlElement;
+
+public abstract class XmlReadHandler implements ReadHandler<XmlElement>
+{
+	protected XmlReader m_reader;
+
+	public XmlReadHandler(XmlReader printer)
+	{
+		super();
+		m_reader = printer;
+	}
+}