commit a0df5898fab16f7e84eff7b66cbebba7a2af7277
author Matt Benson <mbenson@apache.org> Sat Feb 16 13:52:43 2019 -0600
committer Matt Benson <mbenson@apache.org> Sat Feb 16 13:52:43 2019 -0600
tree 95895b0c9dd7384dcf6138c2af7d1be2459fa96d
parent 0ac9e6fce5f77b64571f9bfbe60c51ac0fe11e2d

BVAL-170: improve speed of message interpolation when the pattern clearly cannot contain an EL expression; thanks to Thomas Andraschko

bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java

diff --git a/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java b/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java
index 3248f8a..40797de 100644
--- a/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java
+++ b/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java
@@ -61,25 +61,26 @@
     @Override
     public String interpolate(final String message, final Map<String, Object> annotationParameters,
         final Object validatedValue) {
-        try {
-            if (EvaluationType.IMMEDIATE.regex.matcher(message).find()) {
-                final BValELContext context = new BValELContext();
-                final VariableMapper variables = context.getVariableMapper();
-                annotationParameters.forEach(
-                    (k, v) -> variables.setVariable(k, expressionFactory.createValueExpression(v, Object.class)));
-
-                variables.setVariable("validatedValue",
-                    expressionFactory.createValueExpression(validatedValue, Object.class));
-
-                // Java Bean Validation does not support EL expressions that look like JSP "deferred" expressions
-                return expressionFactory.createValueExpression(context,
-                    EvaluationType.DEFERRED.regex.matcher(message).replaceAll("\\$0"), String.class).getValue(context)
-                    .toString();
+        if (message.contains("${") || message.contains("#{")) {
+            try {
+                if (EvaluationType.IMMEDIATE.regex.matcher(message).find()) {
+                    final BValELContext context = new BValELContext();
+                    final VariableMapper variables = context.getVariableMapper();
+                    annotationParameters.forEach(
+                        (k, v) -> variables.setVariable(k, expressionFactory.createValueExpression(v, Object.class)));
+    
+                    variables.setVariable("validatedValue",
+                        expressionFactory.createValueExpression(validatedValue, Object.class));
+    
+                    // Java Bean Validation does not support EL expressions that look like JSP "deferred" expressions
+                    return expressionFactory.createValueExpression(context,
+                        EvaluationType.DEFERRED.regex.matcher(message).replaceAll("\\$0"), String.class).getValue(context)
+                        .toString();
+                }
+            } catch (final Exception e) {
+                // no-op
             }
-        } catch (final Exception e) {
-            // no-op
         }
-
         return message;
     }