Changeset 396 for tapas/common
- Timestamp:
- 03/05/12 16:23:47 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tapas/common/implementation/com/ether/JSONHelperImpl.java
r376 r396 1 1 package com.ether; 2 3 import java.lang.reflect.TypeVariable;4 import java.util.Collection;5 import java.util.Collections;6 import java.util.Map;7 2 8 3 import net.sf.json.JSON; … … 12 7 import net.sf.json.JsonConfig; 13 8 import net.sf.json.processors.JsonBeanProcessor; 14 15 9 import org.apache.commons.logging.Log; 16 10 import org.apache.commons.logging.LogFactory; … … 18 12 import org.jetbrains.annotations.Nullable; 19 13 import org.springframework.beans.factory.InitializingBean; 14 15 import java.lang.reflect.TypeVariable; 16 import java.util.Collection; 17 import java.util.Collections; 18 import java.util.Map; 20 19 21 20 @SuppressWarnings("rawtypes") … … 28 27 } 29 28 30 29 public void afterPropertiesSet() 31 30 throws Exception 32 31 { … … 113 112 } 114 113 final JSONObject jsonObject = JSONObject.fromObject( json, _jsonConfig ); 115 return (T) JSONObject.toBean( jsonObject, beanClass, _mapClassesForDeserialization.get( beanClass ) ); 114 return (T) JSONObject.toBean( jsonObject, beanClass ); 115 // return (T) JSONObject.toBean( jsonObject, beanClass, _mapClassesForDeserialization.get( beanClass ) ); 116 116 } 117 117 … … 141 141 } 142 142 143 private static final Log LOGGER = LogFactory.getLog( JSONHelperImpl.class);143 private static final Log LOGGER = LogFactory.getLog( JSONHelperImpl.class ); 144 144 145 145 private Map<Class, JsonBeanProcessor> _mapping = Collections.emptyMap();
Note: See TracChangeset
for help on using the changeset viewer.