Changeset 399

Timestamp:

03/07/12 12:24:08 (12 years ago)

Author:

vmipsl

Message:

commit temporaire _ serialization json Tapas
PAS FINI !!

Location:

tapas

Files:

• common/implementation/com/ether/JSONHelperImpl.java (modified) (2 diffs)
• common/implementation/com/ether/Observation.java (added)
• common/implementation/com/ether/Preference.java (added)
• common/implementation/com/ether/Request.java (added)
• common/implementation/com/ether/Tapas.java (added)
• service/interface/com/ether/FormXML.java (added)
• service/interface/com/ether/tapas (added)
• web/init_script.jsp (modified) (2 diffs)
• web/src/com/ether/Controller.java (modified) (2 diffs)

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

@@ -13 +13 @@
 import org.springframework.beans.factory.InitializingBean;
 
-import java.lang.reflect.TypeVariable;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
@@ -79 +81 @@
         {
             final JSONArray jsonArray = JSONArray.fromObject( json, _jsonConfig );
-            if( beanClass.isArray() )
+            final Class<? super T> superclass = beanClass.getSuperclass();
+            if( superclass.isAssignableFrom( AbstractCollection.class ) )
             {
-                final Class<?> componentType = beanClass.getComponentType();
-                //json.sf.net does not support Long[] or long[]
-                if( Long.class.equals( componentType ) || Long.TYPE.equals( componentType ) )
+                final Tapas tapas = new Tapas();
+                final List<Request> requests = new ArrayList<Request>();
+                for( final Object jsonElement : jsonArray )
                 {
-                    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;
-                    }
+                    final Request request = fromJSON( (JSON) jsonElement, Request.class );
+                    requests.add( request );
                 }
-                return (T) JSONArray.toArray( jsonArray, componentType );
+                tapas.setRequests( requests );
+                return (T) tapas;
             }
-            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() );
-            }
+//
+//            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 );

tapas/web/init_script.jsp

@@ -31 +31 @@
         requestCreateXML: function()
         {
+            var bob = new Object();
+            bob.input1 = "eee";
+            bob.input2 = "rr";
+            var jsonBob = $.toJSON( bob );
+
             var jsonFormXml = this.serializeFormXMLToJson();
             if( jsonFormXml )
                 $.ajax( {
-                    url: "project?methodName=createUserRequest&jsonFormXML=" + jsonFormXml,
+                    url: "project?methodName=createUserRequest&jsonFormXml=" + jsonBob + "&jsonTapas=" + jsonFormXml,
                     success:jQuery.proxy( this.handleCreateXML, this )
                 } );
@@ -56 +61 @@
         serializeFormXMLToJson: function()
         {
-            var formXML = new Object();
-            formXML.input1 = $( "#1" ).val();
-            formXML.input2 = $( "#2" ).val();
+            var formXML = new Array();
+            var requestXML = new Object();
+
+            var preference = new Object();
+            preference.format = $( "#1" ).val();
+            preference.rayleigh_extinction = $( "#2" ).val();
+            preference.h2o_extinction = "h2o_extinction";
+            preference.o3_extinction = "o3_extinction";
+            preference.o2_extinction = "o2_extinction";
+            preference.co2_extinction = "co2_extinction";
+
+            var observation = new Object();
+            observation.date = "2012-02-24";
+
+            requestXML.preference = preference;
+            requestXML.observation = observation;
+            requestXML.atmosphere = "atmosphereZZZZ";
+
+            formXML[0] = requestXML;
+
             return $.toJSON( formXML );
         }

tapas/web/src/com/ether/Controller.java

@@ -5 +5 @@
 import com.ether.annotation.ParamName;
 import com.ether.annotation.UseJSON;
+import com.ether.Tapas;
 import net.sf.json.JSONObject;
 import org.apache.commons.logging.Log;
@@ -37 +38 @@
     /** *********************************************************** **/
     @ControllerMethod(jsonResult = true)
-    public JSONObject createUserRequest( @ParamName("jsonFormXML") @Mandatory @UseJSON final FormXML jsonFormXML )
+    public JSONObject createUserRequest( @ParamName("jsonFormXml") @Mandatory @UseJSON final FormXML jsonFormXML,
+                                         @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas jsonTapas )
             throws ServiceException
     {