You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/10/06 13:36:40 UTC
[groovy] 15/22: GROOVY-8258: Rename class name
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-8258
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 9f92fc8615ddd111666e5351c025c403f18ef8bd
Author: Daniel Sun <su...@apache.org>
AuthorDate: Mon Oct 5 22:20:53 2020 +0800
GROOVY-8258: Rename class name
---
.../groovy/org/apache/groovy/linq/GinqGroovyMethods.groovy | 6 +++---
.../groovy/org/apache/groovy/linq/dsl/GinqAstBuilder.java | 12 ++++++------
.../groovy/org/apache/groovy/linq/dsl/GinqBuilder.groovy | 8 ++++----
.../main/groovy/org/apache/groovy/linq/dsl/GinqVisitor.java | 4 ++--
.../{RootExpression.java => SimpleGinqExpression.java} | 6 +++---
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/GinqGroovyMethods.groovy b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/GinqGroovyMethods.groovy
index a46b291..5e521bb 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/GinqGroovyMethods.groovy
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/GinqGroovyMethods.groovy
@@ -21,7 +21,7 @@ package org.apache.groovy.linq
import groovy.transform.CompileStatic
import org.apache.groovy.linq.dsl.GinqAstBuilder
import org.apache.groovy.linq.dsl.GinqBuilder
-import org.apache.groovy.linq.dsl.expression.RootExpression
+import org.apache.groovy.linq.dsl.expression.SimpleGinqExpression
import org.codehaus.groovy.ast.expr.ClosureExpression
import org.codehaus.groovy.ast.expr.Expression
import org.codehaus.groovy.ast.expr.MethodCallExpression
@@ -37,10 +37,10 @@ class GinqGroovyMethods {
GinqAstBuilder ginqAstBuilder = new GinqAstBuilder()
code.visit(ginqAstBuilder)
- RootExpression rootExpression = ginqAstBuilder.getRootExpression()
+ SimpleGinqExpression simpleGinqExpression = ginqAstBuilder.getSimpleGinqExpression()
GinqBuilder ginqBuilder = new GinqBuilder()
- MethodCallExpression selectMethodCallExpression = ginqBuilder.visitRootExpression(rootExpression)
+ MethodCallExpression selectMethodCallExpression = ginqBuilder.visitSimpleGinqExpression(simpleGinqExpression)
return selectMethodCallExpression
}
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqAstBuilder.java b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqAstBuilder.java
index f36e75c..0e75468 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqAstBuilder.java
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqAstBuilder.java
@@ -21,8 +21,8 @@ package org.apache.groovy.linq.dsl;
import org.apache.groovy.linq.dsl.expression.FilterableExpression;
import org.apache.groovy.linq.dsl.expression.FromExpression;
import org.apache.groovy.linq.dsl.expression.GinqExpression;
-import org.apache.groovy.linq.dsl.expression.RootExpression;
import org.apache.groovy.linq.dsl.expression.SelectExpression;
+import org.apache.groovy.linq.dsl.expression.SimpleGinqExpression;
import org.apache.groovy.linq.dsl.expression.WhereExpression;
import org.codehaus.groovy.GroovyBugError;
import org.codehaus.groovy.ast.CodeVisitorSupport;
@@ -36,11 +36,11 @@ import org.codehaus.groovy.ast.expr.MethodCallExpression;
* @since 4.0.0
*/
public class GinqAstBuilder extends CodeVisitorSupport {
- private RootExpression rootExpression = new RootExpression(); // store the result
+ private SimpleGinqExpression simpleGinqExpression = new SimpleGinqExpression(); // store the result
private GinqExpression ginqExpression; // store the return value
- public RootExpression getRootExpression() {
- return rootExpression;
+ public SimpleGinqExpression getSimpleGinqExpression() {
+ return simpleGinqExpression;
}
@Override
@@ -59,7 +59,7 @@ public class GinqAstBuilder extends CodeVisitorSupport {
Expression dataSourceExpr = ((ArgumentListExpression) call.getArguments()).getExpression(0);
FromExpression fromExpression = new FromExpression(aliasExpr, dataSourceExpr);
- rootExpression.addFromExpression(fromExpression);
+ simpleGinqExpression.addFromExpression(fromExpression);
ginqExpression = fromExpression;
return;
@@ -80,7 +80,7 @@ public class GinqAstBuilder extends CodeVisitorSupport {
if ("select".equals(methodName)) {
SelectExpression selectExpression = new SelectExpression(call.getArguments());
- rootExpression.setSelectExpression(selectExpression);
+ simpleGinqExpression.setSelectExpression(selectExpression);
ginqExpression = selectExpression;
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqBuilder.groovy b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqBuilder.groovy
index e5ee6e2..098bd41 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqBuilder.groovy
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqBuilder.groovy
@@ -22,7 +22,7 @@ import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import org.apache.groovy.linq.dsl.expression.FromExpression
import org.apache.groovy.linq.dsl.expression.GinqExpression
-import org.apache.groovy.linq.dsl.expression.RootExpression
+import org.apache.groovy.linq.dsl.expression.SimpleGinqExpression
import org.apache.groovy.linq.dsl.expression.SelectExpression
import org.apache.groovy.linq.dsl.expression.WhereExpression
import org.codehaus.groovy.ast.ClassHelper
@@ -44,9 +44,9 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt
@CompileStatic
class GinqBuilder implements GinqVisitor<Object> {
@Override
- MethodCallExpression visitRootExpression(RootExpression rootExpression) {
+ MethodCallExpression visitSimpleGinqExpression(SimpleGinqExpression simpleGinqExpression) {
List<MethodCallExpression> fromMethodCallExpressionList = new LinkedList<>()
- List<FromExpression> fromExpressionList = rootExpression.getFromExpressionList()
+ List<FromExpression> fromExpressionList = simpleGinqExpression.getFromExpressionList()
for (FromExpression fromExpression : (fromExpressionList)) {
MethodCallExpression methodCallExpression = this.visitFromExpression(fromExpression)
fromMethodCallExpressionList.add(methodCallExpression)
@@ -54,7 +54,7 @@ class GinqBuilder implements GinqVisitor<Object> {
MethodCallExpression selectMethodReceiver = fromMethodCallExpressionList.getLast()
- SelectExpression selectExpression = rootExpression.getSelectExpression()
+ SelectExpression selectExpression = simpleGinqExpression.getSelectExpression()
selectExpression.putNodeMetaData(__SELECT_METHOD_RECEIVER, selectMethodReceiver)
selectExpression.putNodeMetaData(__ALIAS_EXPR, fromExpressionList.get(fromExpressionList.size() - 1).aliasExpr)
MethodCallExpression selectMethodCallExpression = this.visitSelectExpression(selectExpression)
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqVisitor.java b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqVisitor.java
index 7072b5d..3ee3f4f 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqVisitor.java
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqVisitor.java
@@ -20,7 +20,7 @@ package org.apache.groovy.linq.dsl;
import org.apache.groovy.linq.dsl.expression.FromExpression;
import org.apache.groovy.linq.dsl.expression.GinqExpression;
-import org.apache.groovy.linq.dsl.expression.RootExpression;
+import org.apache.groovy.linq.dsl.expression.SimpleGinqExpression;
import org.apache.groovy.linq.dsl.expression.SelectExpression;
import org.apache.groovy.linq.dsl.expression.WhereExpression;
@@ -31,7 +31,7 @@ import org.apache.groovy.linq.dsl.expression.WhereExpression;
* @since 4.0.0
*/
public interface GinqVisitor<R> {
- R visitRootExpression(RootExpression rootExpression);
+ R visitSimpleGinqExpression(SimpleGinqExpression simpleGinqExpression);
R visitFromExpression(FromExpression fromExpression);
R visitWhereExpression(WhereExpression whereExpression);
R visitSelectExpression(SelectExpression selectExpression);
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/RootExpression.java b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/SimpleGinqExpression.java
similarity index 91%
rename from subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/RootExpression.java
rename to subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/SimpleGinqExpression.java
index ac8a45c..a8307eb 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/RootExpression.java
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/SimpleGinqExpression.java
@@ -28,13 +28,13 @@ import java.util.List;
*
* @since 4.0.0
*/
-public class RootExpression extends AbstractGinqExpression {
+public class SimpleGinqExpression extends AbstractGinqExpression {
private List<FromExpression> fromExpressionList = new ArrayList<>();
private SelectExpression selectExpression;
@Override
public <R> R accept(GinqVisitor<R> visitor) {
- return visitor.visitRootExpression(this);
+ return visitor.visitSimpleGinqExpression(this);
}
public List<FromExpression> getFromExpressionList() {
@@ -55,7 +55,7 @@ public class RootExpression extends AbstractGinqExpression {
@Override
public String toString() {
- return "RootExpression{" +
+ return "SimpleGinqExpression{" +
"fromExpressionList=" + fromExpressionList +
", selectExpression=" + selectExpression +
'}';