refactor

Author: Tristan-WorkGH

src/main/java/org/gridsuite/useradmin/server/RestResponseEntityExceptionHandler.java

@@ -18,15 +18,14 @@
  */
 @ControllerAdvice
 public class RestResponseEntityExceptionHandler {
-
     @ExceptionHandler(value = { UserAdminException.class })
     protected ResponseEntity<Object> handleException(RuntimeException exception) {
-        if (exception instanceof UserAdminException) {
-            UserAdminException userAdminException = (UserAdminException) exception;
-            if (userAdminException.getType().equals(FORBIDDEN)) {
-                return ResponseEntity.status(HttpStatus.FORBIDDEN).body(userAdminException.getType());
-            }
+        if (exception instanceof UserAdminException userAdminException) {
+            return switch (userAdminException.getType()) {
+                case FORBIDDEN -> ResponseEntity.status(HttpStatus.FORBIDDEN).body(userAdminException.getType());
+            };
+        } else {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
     }
 }

src/main/java/org/gridsuite/useradmin/server/UserAdminException.java

@@ -6,11 +6,16 @@
  */
 package org.gridsuite.useradmin.server;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.util.Objects;
 
 /**
  * @author Etienne Homer <etienne.homer at rte-france.com>
  */
+@EqualsAndHashCode(callSuper = false)
+@Data
 public class UserAdminException extends RuntimeException {
     public enum Type {
         FORBIDDEN
@@ -22,9 +27,4 @@ public UserAdminException(Type type) {
         super(Objects.requireNonNull(type.name()));
         this.type = type;
     }
-
-    Type getType() {
-        return type;
-    }
-
 }