Changeset 440 for tapas/web/src

Timestamp:

03/26/12 17:00:15 (12 years ago)

Author:

rboipsl

Message:

ajout anotations
usermandatory

Location:

tapas/web/src/com/ether

Files:

• Controller.java (modified) (4 diffs)
• ControllerEther.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import com.ether.tapas.Observatory;
 import com.ether.tapas.Tapas;
+import com.ether.user.User;
 import com.ether.user.UserRole;
 import net.sf.json.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -33 +35 @@
             throws WebException
     {
-
         try
         {
@@ -58 +59 @@
     /** *********************** CALLS ***************************** **/
     /** *********************************************************** **/
-    @ControllerMethod(jsonResult = true)
-    public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas )
+    @ControllerMethod(jsonResult = true, userMandatory = true)
+    public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user ) // TODO rajouter parametre USER
             throws WebException
     {
@@ -65 +66 @@
             throw new WebException( WebException.WebCode.ERROR_JSON_TAPAS_IS_NULL, "Serialization error : jsonTapas is null", WebException.getExceptionThrowable() );
 
+        //TODO recuperer le USER via ControllerEther
+
         //appel a createxml
-        getTapasService().createXMLRequest( javaTapas );
+        getTapasService().createXMLRequest( javaTapas ); // en 2ieme parametre
+
+        //appel a runtime
+        //mettre une methode dans tapas service pour appel au shell system
+
 
         final JSONObject result = new JSONObject();

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

@@ -120 +120 @@
             final String defaultView = ( null != methodDescription.getDefaultView() && !"".equals( methodDescription.getDefaultView() ) ) ? methodDescription.getDefaultView() : methodDescription.getView();
 
+
             if( methodDescription.isRequestMandatory() )
-                params[params.length - 1] = request;
+                params[params.length - 1] = request; //params = parametre de la methode du Controller
+
 
             if( methodDescription.isLoginMandatory() )
@@ -128 +130 @@
                 if( null == user )
                     return new ModelAndView( defaultView, "errors", "login.error.unknown" );
+            }
+
+            if (methodDescription.isUserMandatory()) {
+                final User user = (User) request.getSession().getAttribute( "SES_USER" );
+
+                if( null == user )
+                    return new ModelAndView( defaultView, "errors", "login.error.unknown" );
+                else
+                    params[params.length - 1] = user;
+
             }