Refactor

Author: wied03

build.savant

@@ -29,7 +29,7 @@ logbackVersion = "1.5.13"
 slf4jVersion = "2.0.13"
 testngVersion = "7.8.0"
 
-project(group: "org.primeframework", name: "prime-mvc", version: "5.7.0", licenses: ["ApacheV2_0"]) {
+project(group: "org.primeframework", name: "prime-mvc", version: "5.8.0", licenses: ["ApacheV2_0"]) {
   workflow {
     fetch {
       // Dependency resolution order:

src/main/java/org/primeframework/mvc/content/json/BaseJacksonContentHandler.java

@@ -55,6 +55,9 @@
  * @author Brian Pontarelli
  */
 public abstract class BaseJacksonContentHandler implements ContentHandler {
+  private static final Pattern invalidEnumerationValue = Pattern.compile("Cannot deserialize value of type `\\S+` from \\S+ (\\S+): not one of the values accepted for Enum class: \\[(.*)]$.*",
+                                                                         Pattern.DOTALL | Pattern.MULTILINE);
+
   private static final Logger logger = LoggerFactory.getLogger(BaseJacksonContentHandler.class);
 
   protected final ExpressionEvaluator expressionEvaluator;
@@ -205,17 +208,17 @@ private void addFieldError(InvalidFormatException e) {
     if (field.equals("")) {
       messageStore.add(new SimpleMessage(MessageType.ERROR, code, messageProvider.getMessage(code, "unknown", "Possible conversion error", e.getMessage())));
     } else {
-      Pattern stuff = Pattern.compile("Cannot deserialize value of type `\\S+` from \\S+ (\\S+): not one of the values accepted for Enum class: \\[(.*)]$.*",
-                                      Pattern.DOTALL | Pattern.MULTILINE);
       String messageText = e.getMessage();
-      Matcher m = stuff.matcher(messageText);
+      Matcher matchesEnumNotValidValue = invalidEnumerationValue.matcher(messageText);
       String message = null;
-      if (m.matches()) {
+      if (matchesEnumNotValidValue.matches()) {
         code = "[invalid]%s".formatted(field);
+        // if we have an invalid enum value, provide a better message
         message = messageProvider.getMessage(code,
-                                             m.group(1),
-                                             m.group(2));
+                                             matchesEnumNotValidValue.group(1),
+                                             matchesEnumNotValidValue.group(2));
       }
+      // otherwise, fall back to what we know
       if (message == null) {
         message = messageProvider.getMessage(code, field, "Possible conversion error", messageText);
       }