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 18:28:26 UTC
[groovy] branch GROOVY-8258 updated: GROOVY-8258: move classes
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 4d0c5ce GROOVY-8258: move classes
4d0c5ce is described below
commit 4d0c5ce5cf81322573083f917fdf63e463e89914
Author: Daniel Sun <su...@apache.org>
AuthorDate: Wed Oct 7 02:28:00 2020 +0800
GROOVY-8258: move classes
---
.../main/groovy/org/apache/groovy/linq/GinqGroovyMethods.groovy | 2 +-
.../linq/{dsl => provider/collection}/GinqAstWalker.groovy | 9 ++++++---
.../apache/groovy/linq/{ => provider/collection}/Queryable.java | 2 +-
.../linq/provider/{ => collection}/QueryableCollection.java | 3 +--
.../provider/{ => collection}/QueryableCollectionTest.groovy | 6 +++---
5 files changed, 12 insertions(+), 10 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 534810b..dcb3d75 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
@@ -20,8 +20,8 @@ package org.apache.groovy.linq
import groovy.transform.CompileStatic
import org.apache.groovy.linq.dsl.GinqAstBuilder
-import org.apache.groovy.linq.dsl.GinqAstWalker
import org.apache.groovy.linq.dsl.expression.SimpleGinqExpression
+import org.apache.groovy.linq.provider.collection.GinqAstWalker
import org.codehaus.groovy.ast.expr.ClosureExpression
import org.codehaus.groovy.ast.expr.Expression
import org.codehaus.groovy.ast.expr.MethodCallExpression
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqAstWalker.groovy b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/GinqAstWalker.groovy
similarity index 96%
rename from subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqAstWalker.groovy
rename to subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/GinqAstWalker.groovy
index ad0f720..59d6395 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/dsl/GinqAstWalker.groovy
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/GinqAstWalker.groovy
@@ -16,10 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.groovy.linq.dsl
+package org.apache.groovy.linq.provider.collection
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
+import org.apache.groovy.linq.dsl.GinqSyntaxError
+import org.apache.groovy.linq.dsl.GinqVisitor
+import org.apache.groovy.linq.dsl.SyntaxErrorReportable
import org.apache.groovy.linq.dsl.expression.DataSourceExpression
import org.apache.groovy.linq.dsl.expression.FilterExpression
import org.apache.groovy.linq.dsl.expression.FromExpression
@@ -145,7 +148,7 @@ class GinqAstWalker implements GinqVisitor<Object>, SyntaxErrorReportable {
@CompileDynamic
private MethodCallExpression constructFromMethodCallExpression(FromExpression fromExpression) {
macro {
- org.apache.groovy.linq.provider.QueryableCollection.from($v { fromExpression.dataSourceExpr })
+ org.apache.groovy.linq.provider.collection.QueryableCollection.from($v { fromExpression.dataSourceExpr })
}
}
@@ -155,7 +158,7 @@ class GinqAstWalker implements GinqVisitor<Object>, SyntaxErrorReportable {
OnExpression onExpression, WhereExpression whereExpression) {
MethodCallExpression innerJoinMethodCallExpression = macro {
- $v{receiver}.innerJoin(org.apache.groovy.linq.provider.QueryableCollection.from($v { innerJoinExpression.dataSourceExpr }))
+ $v{receiver}.innerJoin(org.apache.groovy.linq.provider.collection.QueryableCollection.from($v { innerJoinExpression.dataSourceExpr }))
}
((ArgumentListExpression) innerJoinMethodCallExpression.getArguments()).getExpressions().add(
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/Queryable.java b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/Queryable.java
similarity index 98%
rename from subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/Queryable.java
rename to subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/Queryable.java
index 56803ac..c727979 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/Queryable.java
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/Queryable.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.groovy.linq;
+package org.apache.groovy.linq.provider.collection;
import groovy.lang.Tuple2;
import groovy.transform.Internal;
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/QueryableCollection.java b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java
similarity index 99%
rename from subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/QueryableCollection.java
rename to subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java
index 815a1fa..6db3b3e 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/QueryableCollection.java
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java
@@ -16,12 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.groovy.linq.provider;
+package org.apache.groovy.linq.provider.collection;
import groovy.lang.Tuple;
import groovy.lang.Tuple2;
import groovy.transform.Internal;
-import org.apache.groovy.linq.Queryable;
import java.math.BigDecimal;
import java.util.Comparator;
diff --git a/subprojects/groovy-linq/src/test/groovy/org/apache/groovy/linq/provider/QueryableCollectionTest.groovy b/subprojects/groovy-linq/src/test/groovy/org/apache/groovy/linq/provider/collection/QueryableCollectionTest.groovy
similarity index 98%
rename from subprojects/groovy-linq/src/test/groovy/org/apache/groovy/linq/provider/QueryableCollectionTest.groovy
rename to subprojects/groovy-linq/src/test/groovy/org/apache/groovy/linq/provider/collection/QueryableCollectionTest.groovy
index 9bf8d76..13ff81d 100644
--- a/subprojects/groovy-linq/src/test/groovy/org/apache/groovy/linq/provider/QueryableCollectionTest.groovy
+++ b/subprojects/groovy-linq/src/test/groovy/org/apache/groovy/linq/provider/collection/QueryableCollectionTest.groovy
@@ -16,20 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.groovy.linq.provider
+package org.apache.groovy.linq.provider.collection
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
-import org.apache.groovy.linq.Queryable
+import org.apache.groovy.linq.provider.collection.Queryable
import org.junit.Test
import java.util.stream.Collectors
import java.util.stream.Stream
-import static org.apache.groovy.linq.provider.QueryableCollection.from
+import static org.apache.groovy.linq.provider.collection.QueryableCollection.from
@CompileStatic
class QueryableCollectionTest {