Update Serializer to add the possibility to export into JSON

gama-platform · May 8, 2022 · b0470d1 · b0470d1
1 parent e99eb13
commit b0470d1
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 8 deletions.
diff --git a/msi.gama.core/src/msi/gaml/statements/SaveStatement.java b/msi.gama.core/src/msi/gaml/statements/SaveStatement.java
@@ -1113,7 +1113,7 @@ public String toCleanString(final Object o) {
 	 *            the var
 	 * @return the string
 	 */
-	public String type(final ITyped var) {
+	public static String type(final ITyped var) {
 		switch (var.getGamlType().id()) {
 			case IType.BOOL:
 				return "Boolean";

diff --git a/ummisco.gama.serialize/.classpath b/ummisco.gama.serialize/.classpath
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="ext/mxparser-1.2.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="ext/xstream-1.4.18.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gaml">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="ext/mxparser-1.2.2.jar"/>
+	<classpathentry kind="lib" path="ext/xstream-1.4.18.jar"/>
+	<classpathentry kind="lib" path="ext/jettison-1.4.1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ummisco.gama.serialize/build.properties b/ummisco.gama.serialize/build.properties
@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                models/,\
                ext/mxparser-1.2.2.jar,\
-               ext/xstream-1.4.18.jar
+               ext/xstream-1.4.18.jar,\
+               ext/jettison-1.4.1.jar
diff --git a/ummisco.gama.serialize/ext/jettison-1.4.1.jar b/ummisco.gama.serialize/ext/jettison-1.4.1.jar
diff --git a/ummisco.gama.serialize/src/ummisco/gama/serializer/factory/StreamConverter.java b/ummisco.gama.serialize/src/ummisco/gama/serializer/factory/StreamConverter.java
@@ -16,6 +16,7 @@
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 
@@ -39,14 +40,23 @@ public abstract class StreamConverter {
 	private static Map<Class<?>, XStream> xStreamMap = Collections.synchronizedMap(new HashMap<Class<?>, XStream>());
 
 	private static XStream getXStreamInstance(Class<?> clazz) {
+		return getXStreamInstance(clazz, false);
+	}	
+
+	private static XStream getXStreamInstance(Class<?> clazz, boolean toJSON) {
 		if (xStreamMap.containsKey(clazz)) {
 			return xStreamMap.get(clazz);
 		}
 		synchronized (clazz) {
 			if (xStreamMap.containsKey(clazz)) {
 				return xStreamMap.get(clazz);
 			}
-			XStream xStream = new XStream(new DomDriver());
+			XStream xStream;
+			if(toJSON) {
+				xStream = new XStream(new JettisonMappedXmlDriver());								
+			} else {
+				xStream = new XStream(new DomDriver());				
+			}
 			xStream.ignoreUnknownElements();
 			xStream.processAnnotations(clazz);
 			xStream.addPermission(AnyTypePermission.ANY);
@@ -76,6 +86,19 @@ public static void registerConverter(final XStream st,final Converter c) {
 		st.registerConverter(c);
 	}
 
+	/**
+	 * Convert object to stream in JSON.
+	 *
+	 * @param scope
+	 *            the scope
+	 * @param o
+	 *            the o
+	 * @return the string
+	 */
+	public static synchronized String convertObjectToJSONStream(final IScope scope, final Object o) {
+		return loadAndBuild(new ConverterScope(scope),o, true).toXML(o);
+	}	
+
 	/**
 	 * Load and build.
 	 *
@@ -84,9 +107,13 @@ public static void registerConverter(final XStream st,final Converter c) {
 	 * @return the x stream
 	 */
 	public static XStream loadAndBuild(final ConverterScope cs, final Object o) {
+		return loadAndBuild(cs, o, false);
+	}	
+
+	public static XStream loadAndBuild(final ConverterScope cs, final Object o, final boolean toJSON) {
 
 		final Converter[] cnv = Converters.converterFactory(cs);
-		XStream streamer=getXStreamInstance(o.getClass());
+		XStream streamer = getXStreamInstance(o.getClass(),toJSON);		
 		for (final Converter c : cnv) { StreamConverter.registerConverter(streamer,c); }
 		// dataStreamer.setMode(XStream.ID_REFERENCES);
 		return streamer;