Add shardingsphere-infra-expr-type module (#28561)

* Revise javadoc on InlineExpressionParser

* Add shardingsphere-infra-expr-type module

* Fix javadoc

* Refactor PureListInlineExpressionParser

* Refactor PureListInlineExpressionParser

* Remove useless javadoc

* Simply refactor

infra/expr/core/src/test/java/org/apache/shardingsphere/infra/expr/core/fixture/CustomInlineExpressionParserFixture.java

@@ -29,7 +29,7 @@ public final class CustomInlineExpressionParserFixture implements InlineExpressi
 
     @Override
     public void init(final Properties props) {
-        this.inlineExpression = props.getProperty(INLINE_EXPRESSION_KEY);
+        inlineExpression = props.getProperty(INLINE_EXPRESSION_KEY);
     }
 
     @Override

infra/expr/pom.xml

@@ -30,8 +30,6 @@
     <modules>
         <module>spi</module>
         <module>core</module>
-        <module>groovy</module>
-        <module>purelist</module>
-        <module>espresso</module>
+        <module>type</module>
     </modules>
 </project>

infra/expr/spi/src/main/java/org/apache/shardingsphere/infra/expr/spi/InlineExpressionParser.java

@@ -36,10 +36,9 @@ public interface InlineExpressionParser extends TypedSPI {
 
     /**
      * This method is used to return the inlineExpression String itself. In some cases, you may want to do
-     * additional processing on inlineExpression to return a specific value, in which case you need to override this
-     * method.
+     * additional processing on inlineExpression to return a specific value, in which case you need to override this method.
      *
-     * @return result processed inline expression defined by the SPI implementation.
+     * @return result processed inline expression defined by the SPI implementation
      */
     String handlePlaceHolder();
 
@@ -54,8 +53,7 @@ public interface InlineExpressionParser extends TypedSPI {
      * Evaluate closure.
      *
      * @return closure
-     * @throws UnsupportedOperationException In most cases, users should not implement this method, and the return value
-     *                                       of this method can only be a Groovy Closure.
+     * @throws UnsupportedOperationException In most cases, users should not implement this method, and the return value of this method can only be a Groovy closure
      */
     default Closure<?> evaluateClosure() {
         throw new UnsupportedOperationException("This SPI implementation does not support the use of this method.");

infra/expr/espresso/pom.xml → infra/expr/type/espresso/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere</groupId>
-        <artifactId>shardingsphere-infra-expr</artifactId>
+        <artifactId>shardingsphere-infra-expr-type</artifactId>
         <version>5.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>shardingsphere-infra-expr-espresso</artifactId>
@@ -85,7 +85,7 @@
                                 </artifactItem>
                             </artifactItems>
                             <stripVersion>true</stripVersion>
-                            <outputDirectory>${project.build.outputDirectory}/espresso-need-libs</outputDirectory>
+                            <outputDirectory>target/classes/espresso-need-libs</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>

infra/expr/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java → infra/expr/type/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java

@@ -52,15 +52,9 @@ public final class EspressoInlineExpressionParser implements InlineExpressionPar
         JAVA_CLASSPATH = dir + File.separator + "groovy.jar";
     }
 
-    /**
-     * Initialize SPI.
-     *
-     * @param props A Properties instance that carries inlineExpression.
-     *              And for compatibility reasons, inlineExpression allows to be null.
-     */
     @Override
     public void init(final Properties props) {
-        this.inlineExpression = props.getProperty(INLINE_EXPRESSION_KEY);
+        inlineExpression = props.getProperty(INLINE_EXPRESSION_KEY);
     }
 
     @Override

infra/expr/groovy/pom.xml → infra/expr/type/groovy/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere</groupId>
-        <artifactId>shardingsphere-infra-expr</artifactId>
+        <artifactId>shardingsphere-infra-expr-type</artifactId>
         <version>5.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>shardingsphere-infra-expr-groovy</artifactId>

infra/expr/groovy/src/main/java/org/apache/shardingsphere/infra/expr/groovy/GroovyInlineExpressionParser.java → infra/expr/type/groovy/src/main/java/org/apache/shardingsphere/infra/expr/groovy/GroovyInlineExpressionParser.java

@@ -51,15 +51,9 @@ public final class GroovyInlineExpressionParser implements InlineExpressionParse
 
     private String inlineExpression;
 
-    /**
-     * Initialize SPI.
-     *
-     * @param props A Properties instance that carries inlineExpression.
-     *              And for compatibility reasons, inlineExpression allows to be null.
-     */
     @Override
     public void init(final Properties props) {
-        this.inlineExpression = props.getProperty(INLINE_EXPRESSION_KEY);
+        inlineExpression = props.getProperty(INLINE_EXPRESSION_KEY);
     }
 
     @Override

infra/expr/type/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.shardingsphere</groupId>
+        <artifactId>shardingsphere-infra-expr</artifactId>
+        <version>5.4.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>shardingsphere-infra-expr-type</artifactId>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+
+    <modules>
+        <module>groovy</module>
+        <module>purelist</module>
+        <module>espresso</module>
+    </modules>
+</project>

infra/expr/purelist/pom.xml → infra/expr/type/purelist/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere</groupId>
-        <artifactId>shardingsphere-infra-expr</artifactId>
+        <artifactId>shardingsphere-infra-expr-type</artifactId>
         <version>5.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>shardingsphere-infra-expr-purelist</artifactId>

infra/expr/purelist/src/main/java/org/apache/shardingsphere/infra/expr/purelist/PureListInlineExpressionParser.java → infra/expr/type/purelist/src/main/java/org/apache/shardingsphere/infra/expr/purelist/PureListInlineExpressionParser.java

@@ -34,15 +34,9 @@ public final class PureListInlineExpressionParser implements InlineExpressionPar
 
     private String inlineExpression;
 
-    /**
-     * Initialize SPI.
-     *
-     * @param props A Properties instance that carries inlineExpression.
-     *              And for compatibility reasons, inlineExpression allows to be null.
-     */
     @Override
     public void init(final Properties props) {
-        this.inlineExpression = props.getProperty(INLINE_EXPRESSION_KEY);
+        inlineExpression = props.getProperty(INLINE_EXPRESSION_KEY);
     }
 
     @Override
@@ -60,7 +54,7 @@ private List<String> split(final String inlineExpression) {
         StringBuilder segment = new StringBuilder();
         for (int i = 0; i < inlineExpression.length(); i++) {
             char each = inlineExpression.charAt(i);
-            if (each == SPLITTER) {
+            if (SPLITTER == each) {
                 result.add(segment.toString().trim());
                 segment.setLength(0);
             } else {