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=1e803ce121e8cb3541869a4aef9cfd3d9082878c;hb=490d9907457c43acfa965e7979ce5974bc1ba6ca;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..1e803ce12 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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.server.json;
 
 import java.util.HashMap;
@@ -5,7 +21,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.server.ArgeoServerException;
+import org.argeo.ArgeoException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.osgi.framework.BundleContext;
 import org.springframework.beans.factory.InitializingBean;
@@ -21,77 +37,39 @@ 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);
-			// }
+				throw new ArgeoException("Cannot find type " + type);
 		}
 
 		try {
 			return (T) objectMapper.readValue(str, clss);
 		} catch (Exception e) {
-			throw new ArgeoServerException("Cannot deserialize " + str
+			throw new ArgeoException("Cannot deserialize " + str
 					+ " (type=" + type + ")", e);
 		}
 	}
 
-	public void setSupportedTypes(Map<String, Class> supportedTypes) {
+	public void setSupportedTypes(Map<String, Class<?>> supportedTypes) {
 		this.supportedTypes = supportedTypes;
 	}
 
-	protected Class loadClass(String type) {
-		Class clss;
-//		try {
-//			return Class.forName(type);
-//		} catch (ClassNotFoundException e) {
-//			if (log.isDebugEnabled())
-//				log.debug("Class.forName failed: " + e);
-//		}
-//
-//		try {
-//			return Thread.currentThread().getContextClassLoader().loadClass(
-//					type);
-//		} catch (ClassNotFoundException e) {
-//			if (log.isDebugEnabled())
-//				log
-//						.debug("Thread.currentThread().getContextClassLoader().loadClass failed: "
-//								+ e);
-//		}
-//
-//		try {
-//			return getClass().getClassLoader().loadClass(type);
-//		} catch (ClassNotFoundException e) {
-//			if (log.isDebugEnabled())
-//				log.debug("getClass().getClassLoader().loadClass failed: " + e);
-//		}
-//
+	protected Class<?> loadClass(String type) {
 		try {
 			return classLoader.loadClass(type);
 		} catch (ClassNotFoundException e) {