(shardingsphere) branch master updated: Fix placeholder replacement in inline expression parsers (#37190)

[zhangliang]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 56cfe089d8f Fix placeholder replacement in inline expression parsers 
(#37190)
56cfe089d8f is described below

commit 56cfe089d8fb1dc59138978c72a156c5088f7111
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Nov 27 01:38:50 2025 +0800

    Fix placeholder replacement in inline expression parsers (#37190)
---
 .../infra/expr/espresso/EspressoInlineExpressionParser.java        | 7 +++----
 .../infra/expr/groovy/GroovyInlineExpressionParser.java            | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/infra/expr/type/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java
 
b/infra/expr/type/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java
index c574a66ce30..70e476eaf6d 100644
--- 
a/infra/expr/type/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java
+++ 
b/infra/expr/type/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.expr.espresso;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
-import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
 import org.apache.shardingsphere.infra.expr.core.GroovyUtils;
 import org.apache.shardingsphere.infra.expr.spi.InlineExpressionParser;
 
@@ -29,6 +28,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -44,8 +44,7 @@ public final class EspressoInlineExpressionParser implements 
InlineExpressionPar
     
     static {
         URL groovyJarUrl = 
EspressoInlineExpressionParser.class.getClassLoader().getResource("build/libs/groovy.jar");
-        ShardingSpherePreconditions.checkNotNull(groovyJarUrl, 
NullPointerException::new);
-        JAVA_CLASSPATH = groovyJarUrl.getPath();
+        JAVA_CLASSPATH = Objects.requireNonNull(groovyJarUrl).getPath();
     }
     
     @Override
@@ -65,7 +64,7 @@ public final class EspressoInlineExpressionParser implements 
InlineExpressionPar
      * @return result inline expression with {@code $}
      */
     private String handlePlaceHolder(final String inlineExpression) {
-        return inlineExpression.contains("$->{") ? 
inlineExpression.replaceAll("\\$->\\{", "\\$\\{") : inlineExpression;
+        return inlineExpression.contains("$->{") ? 
inlineExpression.replaceAll("\\$->\\{", "\\${") : inlineExpression;
     }
     
     @Override
diff --git 
a/infra/expr/type/groovy/src/main/java/org/apache/shardingsphere/infra/expr/groovy/GroovyInlineExpressionParser.java
 
b/infra/expr/type/groovy/src/main/java/org/apache/shardingsphere/infra/expr/groovy/GroovyInlineExpressionParser.java
index 7578049d155..2142f24dbd5 100644
--- 
a/infra/expr/type/groovy/src/main/java/org/apache/shardingsphere/infra/expr/groovy/GroovyInlineExpressionParser.java
+++ 
b/infra/expr/type/groovy/src/main/java/org/apache/shardingsphere/infra/expr/groovy/GroovyInlineExpressionParser.java
@@ -89,7 +89,7 @@ public final class GroovyInlineExpressionParser implements 
InlineExpressionParse
      * @return result inline expression with {@code $}
      */
     private String handlePlaceHolder(final String inlineExpression) {
-        return inlineExpression.contains("$->{") ? 
inlineExpression.replaceAll("\\$->\\{", "\\$\\{") : inlineExpression;
+        return inlineExpression.contains("$->{") ? 
inlineExpression.replaceAll("\\$->\\{", "\\${") : inlineExpression;
     }
     
     /**