X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.json%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjson%2FJsonObjectFactoryImpl.java;h=0f1e91e498040e273f32af07240ec9daf1de9fa3;hb=b00a7e9898ea2819100290cab22bf614e23a3abf;hp=a38e45ddd486da063efea624a97b19c972705377;hpb=f3ff1f46c8a04c4a60bbccd44e16d5880b386229;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
index a38e45ddd..0f1e91e49 100644
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonObjectFactoryImpl.java
@@ -21,37 +21,24 @@ public class JsonObjectFactoryImpl implements JsonObjectFactory,
 	private ClassLoader classLoader = getClass().getClassLoader();
 
 	private ObjectMapper objectMapper = new ObjectMapper();
-	private Map<String, Class> supportedTypes = new HashMap<String, Class>();
+	private Map<String, Class<?>> supportedTypes = new HashMap<String,  Class<?>>();
 
 	public Boolean supports(String type) {
 		if (supportedTypes.containsKey(type))
 			return true;
 
 		return loadClass(type) != null ? true : false;
-		// try {
-		// // Class.forName(type);
-		// Thread.currentThread().getContextClassLoader().loadClass(type);
-		// return true;
-		// } catch (ClassNotFoundException e) {
-		// return false;
-		// }
 	}
 
+	@SuppressWarnings("unchecked")
 	public <T> T readValue(String type, String str) {
-		final Class clss;
+		final  Class<?> clss;
 		if (supportedTypes.containsKey(type))
 			clss = supportedTypes.get(type);
 		else {
 			clss = loadClass(type);
 			if (clss == null)
 				throw new ArgeoServerException("Cannot find type " + type);
-			// try {
-			// // clss = Class.forName(type);
-			// clss = Thread.currentThread().getContextClassLoader()
-			// .loadClass(type);
-			// } catch (ClassNotFoundException e) {
-			// throw new ArgeoServerException("Cannot find type " + type, e);
-			// }
 		}
 
 		try {
@@ -62,12 +49,11 @@ public class JsonObjectFactoryImpl implements JsonObjectFactory,
 		}
 	}
 
-	public void setSupportedTypes(Map<String, Class> supportedTypes) {
+	public void setSupportedTypes(Map<String,  Class<?>> supportedTypes) {
 		this.supportedTypes = supportedTypes;
 	}
 
-	protected Class loadClass(String type) {
-		Class clss;
+	protected  Class<?> loadClass(String type) {
 //		try {
 //			return Class.forName(type);
 //		} catch (ClassNotFoundException e) {