Merge branch 'java-11' into java-record-support

# Conflicts:
#	.gitignore
#	src/test/resources/compiler/exceptions/error.html

Author: chbloemer

.gitignore

@@ -7,6 +7,6 @@ target/
 !.idea/runConfigurations/
 *.iml
 release.properties
-.serena
 bin/
-.claude/settings.local.json
+.serena
+.claude/settings.local.json

pom.xml

@@ -78,6 +78,8 @@
         <maven.compiler.target>17</maven.compiler.target>
         <graalvm.version>25.0.0</graalvm.version>
         <java.version>17</java.version>
+        <!-- Disable SHA1 checksums for Maven Central Portal (only SHA256/SHA512 accepted) -->
+        <maven.deploy.checksums>sha256,sha512</maven.deploy.checksums>
     </properties>
 
     <profiles>

src/main/java/de/neuland/pug4j/expression/JexlExpressionHandler.java

@@ -13,16 +13,10 @@
 import org.apache.commons.logging.LogFactory;
 
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class JexlExpressionHandler extends AbstractExpressionHandler {
 
     private static final int MAX_ENTRIES = 5000;
-    private static Pattern plusplus = Pattern.compile("([a-zA-Z0-9-_]*[a-zA-Z0-9])\\+\\+\\s*;{0,1}\\s*$");
-    private static Pattern isplusplus = Pattern.compile("\\+\\+\\s*;{0,1}\\s*$");
-    private static Pattern minusminus = Pattern.compile("([a-zA-Z0-9-_]*[a-zA-Z0-9])--\\s*;{0,1}\\s*$");
-    private static Pattern isminusminus = Pattern.compile("--\\s*;{0,1}\\s*$");
     private JexlEngine jexl;
     private final JexlExpressionHandlerOptions options = new JexlExpressionHandlerOptions();
     private final RecordWrapperUberspect pugUberspect = new RecordWrapperUberspect(LogFactory.getLog(JexlExpressionHandler.class),
@@ -81,12 +75,6 @@ public Object evaluateExpression(String expression, PugModel model) throws Expre
         try {
             saveLocalVariableName(expression, model);
             expression = removeVar(expression);
-            if (isplusplus.matcher(expression).find()) {
-                expression = convertPlusPlusExpression(expression);
-            }
-            if (isminusminus.matcher(expression).find()) {
-                expression = convertMinusMinusExpression(expression);
-            }
             JexlScript e = jexl.createScript(expression);
             MapContext jexlContext = new MapContext(model);
             return e.execute(jexlContext);
@@ -95,24 +83,6 @@ public Object evaluateExpression(String expression, PugModel model) throws Expre
         }
     }
 
-    private String convertMinusMinusExpression(String expression) {
-        Matcher matcher = minusminus.matcher(expression);
-        if (matcher.find(0) && matcher.groupCount() == 1) {
-            String a = matcher.group(1);
-            expression = a + " = " + a + " - 1";
-        }
-        return expression;
-    }
-
-    private String convertPlusPlusExpression(String expression) {
-        Matcher matcher = plusplus.matcher(expression);
-        if (matcher.find(0) && matcher.groupCount() == 1) {
-            String a = matcher.group(1);
-            expression = a + " = " + a + " + 1";
-        }
-        return expression;
-    }
-
     private String removeVar(String expression) {
         expression = expression.replace("var ", ";");
         expression = expression.replace("let ", ";");

src/test/java/de/neuland/pug4j/benchmark/TemplateBenchmark.java

@@ -1,7 +1,6 @@
 package de.neuland.pug4j.benchmark;
 
 import de.neuland.pug4j.PugConfiguration;
-import de.neuland.pug4j.PugConfigurationCaffeine;
 import de.neuland.pug4j.template.ClasspathTemplateLoader;
 import de.neuland.pug4j.template.PugTemplate;
 import org.openjdk.jmh.Main;
@@ -29,35 +28,23 @@ public class TemplateBenchmark {
 
     HashMap<String, Object> model = new HashMap<>();
 
-    PugConfigurationCaffeine jadeCaffeine = new PugConfigurationCaffeine();
 
-    PugConfiguration jade = new PugConfiguration();
+    PugConfiguration pug = new PugConfiguration();
 
     @Setup(Level.Invocation)
     public void setUp() {
-        jadeCaffeine.setTemplateLoader(templateLoader);
-        jade.setTemplateLoader(templateLoader);
+        pug.setTemplateLoader(templateLoader);
         model.put("pageName", "Jade");
         model.put("books", books);
     }
 
-    @Benchmark
-    public void templatesCaffeine() throws Exception {
-
-        Writer writer = new StringWriter();
-        PugTemplate template =
-            jadeCaffeine.getTemplate("benchmark/simple" + templateId);
-        jadeCaffeine.renderTemplate(template, model, writer);
-
-    }
-
     @Benchmark
     public void templates() throws Exception {
 
         Writer writer = new StringWriter();
         PugTemplate template =
-            jade.getTemplate("benchmark/simple" + templateId);
-        jade.renderTemplate(template, model, writer);
+            pug.getTemplate("benchmark/simple" + templateId);
+        pug.renderTemplate(template, model, writer);
 
     }