[groovy] branch GROOVY-8258 updated: GROOVY-8258: tweak AST

[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 0c5ea13  GROOVY-8258: tweak AST
0c5ea13 is described below

commit 0c5ea13e9b5c0f355b625c8fbd2ab1dca73ed85c
Author: Daniel Sun <sun...@apache.org>
AuthorDate: Tue Oct 6 22:01:53 2020 +0800

    GROOVY-8258: tweak AST
---
 .../{JoinExpression.java => DataSourceExpression.java}   | 16 +++-------------
 .../groovy/linq/dsl/expression/FromExpression.java       | 16 ++--------------
 .../groovy/linq/dsl/expression/JoinExpression.java       | 15 ++-------------
 3 files changed, 7 insertions(+), 40 deletions(-)

diff --git 
a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/JoinExpression.java
 
b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/DataSourceExpression.java
similarity index 75%
copy from 
subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/JoinExpression.java
copy to 
subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/DataSourceExpression.java
index 85debc4..9961f14 100644
--- 
a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/JoinExpression.java
+++ 
b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/DataSourceExpression.java
@@ -21,32 +21,22 @@ package org.apache.groovy.linq.dsl.expression;
 import org.codehaus.groovy.ast.expr.Expression;
 
 /**
- * Represents join expression
+ * Represents data source expression
  *
  * @since 4.0.0
  */
-public abstract class JoinExpression extends FilterableExpression {
-    protected OnExpression onExpression;
+public abstract class DataSourceExpression extends FilterableExpression {
     protected Expression aliasExpr;
     protected Expression dataSourceExpr;
 
-    public JoinExpression(Expression aliasExpr, Expression dataSourceExpr) {
+    public DataSourceExpression(Expression aliasExpr, Expression 
dataSourceExpr) {
         this.aliasExpr = aliasExpr;
         this.dataSourceExpr = dataSourceExpr;
     }
 
-    public OnExpression getOnExpression() {
-        return onExpression;
-    }
-
-    public void setOnExpression(OnExpression onExpression) {
-        this.onExpression = onExpression;
-    }
-
     public Expression getAliasExpr() {
         return aliasExpr;
     }
-
     public Expression getDataSourceExpr() {
         return dataSourceExpr;
     }
diff --git 
a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/FromExpression.java
 
b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/FromExpression.java
index b880cf8..6dd48d2 100644
--- 
a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/FromExpression.java
+++ 
b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/FromExpression.java
@@ -26,13 +26,9 @@ import org.codehaus.groovy.ast.expr.Expression;
  *
  * @since 4.0.0
  */
-public class FromExpression extends FilterableExpression {
-    private final Expression aliasExpr;
-    private final Expression dataSourceExpr;
-
+public class FromExpression extends DataSourceExpression {
     public FromExpression(Expression aliasExpr, Expression dataSourceExpr) {
-        this.aliasExpr = aliasExpr;
-        this.dataSourceExpr = dataSourceExpr;
+        super(aliasExpr, dataSourceExpr);
     }
 
     @Override
@@ -40,14 +36,6 @@ public class FromExpression extends FilterableExpression {
         return visitor.visitFromExpression(this);
     }
 
-    public Expression getAliasExpr() {
-        return aliasExpr;
-    }
-
-    public Expression getDataSourceExpr() {
-        return dataSourceExpr;
-    }
-
     @Override
     public String toString() {
         return "FromExpression{" +
diff --git 
a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/JoinExpression.java
 
b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/JoinExpression.java
index 85debc4..4a98b36 100644
--- 
a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/JoinExpression.java
+++ 
b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/expression/JoinExpression.java
@@ -25,14 +25,11 @@ import org.codehaus.groovy.ast.expr.Expression;
  *
  * @since 4.0.0
  */
-public abstract class JoinExpression extends FilterableExpression {
+public abstract class JoinExpression extends DataSourceExpression {
     protected OnExpression onExpression;
-    protected Expression aliasExpr;
-    protected Expression dataSourceExpr;
 
     public JoinExpression(Expression aliasExpr, Expression dataSourceExpr) {
-        this.aliasExpr = aliasExpr;
-        this.dataSourceExpr = dataSourceExpr;
+        super(aliasExpr, dataSourceExpr);
     }
 
     public OnExpression getOnExpression() {
@@ -42,12 +39,4 @@ public abstract class JoinExpression extends 
FilterableExpression {
     public void setOnExpression(OnExpression onExpression) {
         this.onExpression = onExpression;
     }
-
-    public Expression getAliasExpr() {
-        return aliasExpr;
-    }
-
-    public Expression getDataSourceExpr() {
-        return dataSourceExpr;
-    }
 }