+/*
+ * 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;
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;
.getLog(JsonObjectFactoryImpl.class);
private BundleContext bundleContext;
- private BundleDelegatingClassLoader classLoader;
+ 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) {