Changeset 400 for tapas/common

Timestamp:

03/08/12 15:19:16 (12 years ago)

Author:

vmipsl

Message:

objet Tapas entier avec sérialization

Location:

tapas/common

Files:

• implementation/com/ether/JSONHelperImpl.java (modified) (2 diffs)
• implementation/log4j.xml (modified) (1 diff)
• interface/com/ether/Pair.java (added)

tapas/common/implementation/com/ether/JSONHelperImpl.java

@@ -13 +13 @@
 import org.springframework.beans.factory.InitializingBean;
 
-import java.util.AbstractCollection;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 
@@ -78 +75 @@
     public <T> T fromJSON( @NotNull final JSON json, @NotNull final Class<T> beanClass )
     {
-        if( json.isArray() )
-        {
-            final JSONArray jsonArray = JSONArray.fromObject( json, _jsonConfig );
-            final Class<? super T> superclass = beanClass.getSuperclass();
-            if( superclass.isAssignableFrom( AbstractCollection.class ) )
-            {
-                final Tapas tapas = new Tapas();
-                final List<Request> requests = new ArrayList<Request>();
-                for( final Object jsonElement : jsonArray )
-                {
-                    final Request request = fromJSON( (JSON) jsonElement, Request.class );
-                    requests.add( request );
-                }
-                tapas.setRequests( requests );
-                return (T) tapas;
-            }
-//
-//            if( beanClass.isArray() )
-//            {
-//                final Class<?> componentType = beanClass.getComponentType();
-//                //json.sf.net does not support Long[] or long[]
-//                if( Long.class.equals( componentType ) || Long.TYPE.equals( componentType ) )
-//                {
-//                    final Integer[] integers = (Integer[]) JSONArray.toArray( jsonArray, Integer.class );
-//                    if( Long.class.equals( componentType ) )
-//                    {
-//                        final Long[] resultArray = new Long[integers.length];
-//                        for( int i = 0; i < integers.length; ++i )
-//                            resultArray[i] = integers[i].longValue();
-//                        return (T) resultArray;
-//                    }
-//                    if( Long.TYPE.equals( componentType ) )
-//                    {
-//                        final long[] resultArray = new long[integers.length];
-//                        for( int i = 0; i < integers.length; ++i )
-//                            resultArray[i] = integers[i].longValue();
-//                        return (T) resultArray;
-//                    }
-//                }
-//                return (T) JSONArray.toArray( jsonArray, componentType );
-//            }
-//            if( beanClass.isAssignableFrom( Collection.class ) )
-//            {
-//                final TypeVariable<Class<T>>[] typeParameters = beanClass.getTypeParameters();
-//                if( null == typeParameters || typeParameters.length != 1 || null == typeParameters[0] )
-//                    return (T) JSONArray.toCollection( jsonArray );
-//                return (T) JSONArray.toCollection( jsonArray, typeParameters[0].getGenericDeclaration() );
-//            }
-        }
         final JSONObject jsonObject = JSONObject.fromObject( json, _jsonConfig );
-        return (T) JSONObject.toBean( jsonObject, beanClass );
-//        return (T) JSONObject.toBean( jsonObject, beanClass, _mapClassesForDeserialization.get( beanClass ) );
+        return (T) JSONObject.toBean( jsonObject, beanClass, _mapClassesForDeserialization.get( beanClass ) );
     }
 

tapas/common/implementation/log4j.xml

@@ -10 +10 @@
 
     <appender name="file" class="org.apache.log4j.FileAppender">
-        <param name="file" value="/home_local/workspace/tapas/web/log4j.log"/>
+        <param name="file" value="/home_local/workspaces/log4j_tapas.log"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="LOG4J %p %d{ISO8601} - %c{1} - %m%n"/>