fix : downgrade version and fix issues

rajadilipkolli · Nov 23, 2023 · 015a1a7 · 015a1a7
1 parent 242cced
commit 015a1a7
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 31 deletions.
diff --git a/...etailProblemHandlingControllerAdvice.java → ...key/exception/GlobalExceptionHandler.java b/...etailProblemHandlingControllerAdvice.java → ...key/exception/GlobalExceptionHandler.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 import java.util.Objects;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ProblemDetail;
@@ -12,7 +14,8 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ControllerAdvice
-public class ErrorDetailProblemHandlingControllerAdvice {
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class GlobalExceptionHandler {
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
@@ -37,6 +40,5 @@ ProblemDetail onException(MethodArgumentNotValidException methodArgumentNotValid
         return problemDetail;
     }
 
-    static record ApiValidationError(
-            String object, String field, Object rejectedValue, String message) {}
+    record ApiValidationError(String object, String field, Object rejectedValue, String message) {}
 }
diff --git a/boot-opensearch-sample/pom.xml b/boot-opensearch-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.1.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.opensearch</groupId>

diff --git a/boot-rest-docs-sample/pom.xml b/boot-rest-docs-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.1.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.restdocs</groupId>

diff --git a/...etailProblemHandlingControllerAdvice.java → ...ate/exception/GlobalExceptionHandler.java b/...etailProblemHandlingControllerAdvice.java → ...ate/exception/GlobalExceptionHandler.java
@@ -13,7 +13,7 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ControllerAdvice
-public class ErrorDetailProblemHandlingControllerAdvice {
+public class GlobalExceptionHandler {
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
@@ -40,6 +40,5 @@ ProblemDetail onException(MethodArgumentNotValidException methodArgumentNotValid
         return problemDetail;
     }
 
-    static record ApiValidationError(
-            String object, String field, Object rejectedValue, String message) {}
+    record ApiValidationError(String object, String field, Object rejectedValue, String message) {}
 }
diff --git a/httpClients/boot-web-client-webflux/pom.xml b/httpClients/boot-web-client-webflux/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.1.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.rest.webclient</groupId>

diff --git a/...etailProblemHandlingControllerAdvice.java → ...nce/exception/GlobalExceptionHandler.java b/...etailProblemHandlingControllerAdvice.java → ...nce/exception/GlobalExceptionHandler.java
@@ -1,9 +1,10 @@
 package com.example.custom.sequence.exception;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
-import lombok.AllArgsConstructor;
-import lombok.Data;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ProblemDetail;
@@ -13,8 +14,9 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
+@Order(Ordered.HIGHEST_PRECEDENCE)
 @ControllerAdvice
-public class ErrorDetailProblemHandlingControllerAdvice {
+public class GlobalExceptionHandler {
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
@@ -32,28 +34,14 @@ ProblemDetail onException(MethodArgumentNotValidException methodArgumentNotValid
                                             fieldError.getObjectName(),
                                             fieldError.getField(),
                                             fieldError.getRejectedValue(),
-                                            Objects.requireNonNull(fieldError.getDefaultMessage()));
+                                            Objects.requireNonNull(
+                                                    fieldError.getDefaultMessage(), ""));
                                 })
+                        .sorted(Comparator.comparing(ApiValidationError::field))
                         .toList();
         problemDetail.setProperty("violations", validationErrorsList);
         return problemDetail;
     }
 
-    @Data
-    @AllArgsConstructor
-    static class ApiValidationError {
-
-        private String object;
-
-        private String field;
-
-        private Object rejectedValue;
-
-        private String message;
-
-        ApiValidationError(String object, String message) {
-            this.object = object;
-            this.message = message;
-        }
-    }
+    record ApiValidationError(String object, String field, Object rejectedValue, String message) {}
 }
diff --git a/jpa/boot-data-keyset-pagination/pom.xml b/jpa/boot-data-keyset-pagination/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.1.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.keysetpagination</groupId>