chore(tests): Use MockMVC (#3264)

--------- Co-authored-by: bonita-ci <[email protected]>
bonitasoft · Nov 26, 2024 · 07bce7b · 07bce7b
1 parent 5d0c685
commit 07bce7b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/bpm/bonita-common/src/main/java/org/bonitasoft/engine/bpm/BaseRestElement.java b/bpm/bonita-common/src/main/java/org/bonitasoft/engine/bpm/BaseRestElement.java
@@ -13,12 +13,14 @@
  **/
 package org.bonitasoft.engine.bpm;
 
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
  * Interface <code>BaseRestElement</code> identifies a <code>BonitaObject</code> that can be used in the REST API.
  */
+@JsonPropertyOrder(alphabetic = true)
 public interface BaseRestElement extends BaseElement {
 
     /**

diff --git a/...a-web-server/src/main/java/org/bonitasoft/web/rest/server/api/AbstractRESTController.java b/...a-web-server/src/main/java/org/bonitasoft/web/rest/server/api/AbstractRESTController.java
@@ -13,12 +13,16 @@
  **/
 package org.bonitasoft.web.rest.server.api;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import lombok.extern.slf4j.Slf4j;
 import org.bonitasoft.console.common.server.utils.SessionUtil;
 import org.bonitasoft.engine.session.APISession;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 import org.springframework.web.server.ResponseStatusException;
 
 /**
@@ -35,24 +39,11 @@ public APISession getApiSession(HttpSession session) {
         return apiSession;
     }
 
-    protected long getParameterAsLong(String parameterValue, String errorMessage) {
-        try {
-            return Long.parseLong(parameterValue);
-        } catch (NumberFormatException e) {
-            log.debug(errorMessage, e);
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
-                    errorMessage);
-        }
-    }
-
-    protected int getParameterAsInt(String parameterValue, String errorMessage) {
-        try {
-            return Integer.parseInt(parameterValue);
-        } catch (NumberFormatException e) {
-            log.debug(errorMessage, e);
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
-                    errorMessage);
-        }
+    @ResponseStatus(value = HttpStatus.BAD_REQUEST, reason = "Bad request")
+    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
+    public void handleBadRequestError(HttpServletRequest req, MethodArgumentTypeMismatchException ex) {
+        String error = "[" + req.getPathInfo() + "] " + ex.getName() + ": " + ex.getMessage();
+        log.debug(error);
     }
 
 }