Changeset 448 for tapas/web

Timestamp:

04/02/12 18:07:58 (12 years ago)

Author:

vmipsl

Message:

WebException? Backoffice

Location:

tapas/web/src/com/ether

Files:

• ControllerBackoffice.java (modified) (9 diffs)
• WebException.java (modified) (1 diff)

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

@@ -30 +30 @@
     /** *********************************************************** **/
     /** *********************** VIEWS ***************************** **/
-    /** *********************************************************** **/
+    /**
+     * ********************************************************** *
+     */
     @ControllerMethod(view = VIEW_BO_INDEX, backofficeMethod = true, defaultView = VIEW_BO_INDEX)
     public Map<String, Object> home()
-            throws ServiceException
+            throws WebException
     {
         return new HashMap<String, Object>();
@@ -40 +42 @@
     @ControllerMethod(view = VIEW_BO_USER, backofficeMethod = true, defaultView = VIEW_BO_INDEX, jsonResult = true)
     public JSONObject viewUser()
-            throws ServiceException, WebException
+            throws WebException
     {
         final JSONObject jsonObject = sortUser( "lastName", null, "ALL", true, true, 5, 1 );
@@ -49 +51 @@
     /** *********************************************************** **/
     /** *********************** CALLS ***************************** **/
-    /** *********************************************************** **/
+    /**
+     * ********************************************************** *
+     */
     @ControllerMethod(jsonResult = true, backofficeMethod = true, defaultView = VIEW_BO_INDEX)
     public JSONObject addUser( @NotNull @ParamName(ParameterConstants.PARAMETER_NAME) final String lastName,
@@ -59 +63 @@
                                @Nullable @ParamName(ParameterConstants.PARAMETER_COUNTRY) final String country,
                                @NotNull @ParamName(ParameterConstants.PARAMETER_HAS_ACCESS) final Boolean hasAccessToBO )
-            throws WebException, ServiceException
+            throws WebException
     {
         try
@@ -84 +88 @@
             throw new WebException( WebException.WebCode.ERROR_ENCRYPT_PASSWORD, "This password cannot be encrypted" );
         }
+        catch( ServiceException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_NO_USER_FOUND, e );
+        }
 
         return getAllUsers();
@@ -90 +98 @@
     @ControllerMethod(jsonResult = true, backofficeMethod = true, defaultView = VIEW_BO_INDEX)
     public JSONObject removeUser( @NotNull @ParamName(ParameterConstants.PARAMETER_ID) final Integer userId )
-            throws WebException, ServiceException
-    {
-        _backofficeService.removeUserById( userId );
-
-        return getAllUsers();
+            throws WebException
+    {
+        try
+        {
+            _backofficeService.removeUserById( userId );
+            return getAllUsers();
+        }
+        catch( ServiceException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_TO_REMOVE_USER, e );
+        }
     }
 
@@ -108 +122 @@
                                   @NotNull @ParamName(ParameterConstants.PARAMETER_HAS_ACCESS) final Boolean hasAccessToBO,
                                   @NotNull @ParamName(ParameterConstants.PARAMETER_KEEP_SAME_PASSWORD) final Boolean keepSamePassword )
-            throws WebException, ServiceException
+            throws WebException
     {
         try
@@ -142 +156 @@
             throw new WebException( WebException.WebCode.ERROR_ENCRYPT_PASSWORD, "This password cannot be encrypted" );
         }
+        catch( ServiceException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_NO_USER_FOUND, e );
+        }
 
         return getAllUsers();
@@ -154 +172 @@
                                 @ParamName(ParameterConstants.PARAMETER_MAX_RESULTS) final Integer maxResults,
                                 @ParamName(ParameterConstants.PARAMETER_PAGE) final Integer page )
-            throws WebException, ServiceException
-    {
-        final UserFilter filter = new UserFilter( sort, searchText, sortAccessBoFalse, sortAccessBoTrue, maxResults, page );
-        if( !"ALL".equals( sortRole ) )
-            filter.setSortRole( UserRole.valueOf( sortRole ) );
-
-        final PaginatedResult<User> users = _backofficeService.searchUsers( filter );
-
-        final JSONObject result = new JSONObject();
-        result.put( "jSonUsers", getJsonHelper().toJSON( users.getPaginatedResults() ) );
-        result.put( "usersNumber", users.getTotalCount() );
-        return result;
+            throws WebException
+    {
+        try
+        {
+            final UserFilter filter = new UserFilter( sort, searchText, sortAccessBoFalse, sortAccessBoTrue, maxResults, page );
+            if( !"ALL".equals( sortRole ) )
+                filter.setSortRole( UserRole.valueOf( sortRole ) );
+
+            final PaginatedResult<User> users = _backofficeService.searchUsers( filter );
+
+            final JSONObject result = new JSONObject();
+            result.put( "jSonUsers", getJsonHelper().toJSON( users.getPaginatedResults() ) );
+            result.put( "usersNumber", users.getTotalCount() );
+            return result;
+        }
+        catch( ServiceException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_NO_USER_FOUND, e );
+        }
     }
 
     private JSONObject getAllUsers()
-            throws ServiceException
-    {
-        final List<User> users = _backofficeService.getAllUsersByNameOrder();
-
-        final JSONObject result = new JSONObject();
-        result.put( "jSonUsers", getJsonHelper().toJSON( users ) );
-        return result;
+            throws WebException
+    {
+        try
+        {
+            final List<User> users = _backofficeService.getAllUsersByNameOrder();
+
+            final JSONObject result = new JSONObject();
+            result.put( "jSonUsers", getJsonHelper().toJSON( users ) );
+            return result;
+        }
+        catch( ServiceException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_NO_USER_FOUND, e );
+        }
+
     }
 

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

@@ -45 +45 @@
         ERROR_ENCRYPT_PASSWORD,
         ERROR_EMAIL_CANNOT_BE_SEND,
-              ERROR_NO_OBSERVATORY_FOUND,
         ERROR_XML_CREATION,
-        ERROR_TO_READ_FILE_PROPERTIES
+        ERROR_NO_OBSERVATORY_FOUND,
+        ERROR_NO_USER_FOUND,
+        ERROR_TO_READ_FILE_PROPERTIES,
+        ERROR_TO_REMOVE_USER
     }