[groovy] branch GROOVY-8258 updated: GROOVY-8258: trivial refactoring

[sunlan]

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


The following commit(s) were added to refs/heads/GROOVY-8258 by this push:
     new aec5eea  GROOVY-8258: trivial refactoring
aec5eea is described below

commit aec5eeacb984fdb8bed384757c27fad63249acfe
Author: Daniel Sun <sun...@apache.org>
AuthorDate: Tue Oct 6 22:15:31 2020 +0800

    GROOVY-8258: trivial refactoring
---
 .../org/apache/groovy/linq/dsl/GinqAstBuilder.java       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 e3b70c6..0101390 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
@@ -23,6 +23,7 @@ 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.InnerJoinExpression;
+import org.apache.groovy.linq.dsl.expression.JoinExpression;
 import org.apache.groovy.linq.dsl.expression.OnExpression;
 import org.apache.groovy.linq.dsl.expression.SelectExpression;
 import org.apache.groovy.linq.dsl.expression.SimpleGinqExpression;
@@ -85,17 +86,16 @@ public class GinqAstBuilder extends CodeVisitorSupport {
             Expression aliasExpr = binaryExpression.getLeftExpression();
             Expression dataSourceExpr = binaryExpression.getRightExpression();
 
+            FilterableExpression filterableExpression = null;
             if ("from".equals(methodName)) {
-                FromExpression fromExpression = new FromExpression(aliasExpr, 
dataSourceExpr);
-                fromExpression.setSourcePosition(call);
-                simpleGinqExpression.setFromExpression(fromExpression);
-                ginqExpression = fromExpression;
+                filterableExpression = new FromExpression(aliasExpr, 
dataSourceExpr);
+                simpleGinqExpression.setFromExpression((FromExpression) 
filterableExpression);
             } else if ("innerJoin".equals(methodName)) {
-                InnerJoinExpression innerJoinExpression = new 
InnerJoinExpression(aliasExpr, dataSourceExpr);
-                innerJoinExpression.setSourcePosition(call);
-                simpleGinqExpression.addJoinExpression(innerJoinExpression);
-                ginqExpression = innerJoinExpression;
+                filterableExpression = new InnerJoinExpression(aliasExpr, 
dataSourceExpr);
+                simpleGinqExpression.addJoinExpression((JoinExpression) 
filterableExpression);
             }
+            filterableExpression.setSourcePosition(call);
+            ginqExpression = filterableExpression;
 
             return;
         }