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:32:48 UTC
[groovy] branch GROOVY-8258 updated: GROOVY-8258: adjust the
visibility of Java classes to avoid being used directly
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 c0771dd GROOVY-8258: adjust the visibility of Java classes to avoid being used directly
c0771dd is described below
commit c0771dd767496e093a4a150e7a249258ef13dbde
Author: Daniel Sun <su...@apache.org>
AuthorDate: Wed Oct 7 02:32:24 2020 +0800
GROOVY-8258: adjust the visibility of Java classes to avoid being used directly
---
.../apache/groovy/linq/provider/collection/GinqAstWalker.groovy | 8 ++++----
.../org/apache/groovy/linq/provider/collection/Queryable.java | 2 +-
.../groovy/linq/provider/collection/QueryableCollection.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/GinqAstWalker.groovy b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/GinqAstWalker.groovy
index 59d6395..2a7295e 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/GinqAstWalker.groovy
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/GinqAstWalker.groovy
@@ -58,10 +58,10 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt
@CompileStatic
class GinqAstWalker implements GinqVisitor<Object>, SyntaxErrorReportable {
- private final SourceUnit sourceUnit;
+ private final SourceUnit sourceUnit
- public GinqAstWalker(SourceUnit sourceUnit) {
- this.sourceUnit = sourceUnit;
+ GinqAstWalker(SourceUnit sourceUnit) {
+ this.sourceUnit = sourceUnit
}
@Override
@@ -125,7 +125,7 @@ class GinqAstWalker implements GinqVisitor<Object>, SyntaxErrorReportable {
"`on` clause is expected for `innerJoin`",
innerJoinExpression.getLineNumber(), innerJoinExpression.getColumnNumber()
)
- );
+ )
}
OnExpression onExpression = (OnExpression) filterExpressionList.get(0)
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/Queryable.java b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/Queryable.java
index c727979..88ebc32 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/Queryable.java
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/Queryable.java
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
* @since 4.0.0
*/
@Internal
-public interface Queryable<T> {
+interface Queryable<T> {
<U> Queryable<Tuple2<T, U>> innerJoin(Queryable<? extends U> queryable, BiPredicate<? super T, ? super U> joiner);
<U> Queryable<Tuple2<T, U>> leftJoin(Queryable<? extends U> queryable, BiPredicate<? super T, ? super U> joiner);
diff --git a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java
index 6db3b3e..4180afa 100644
--- a/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java
+++ b/subprojects/groovy-linq/src/main/groovy/org/apache/groovy/linq/provider/collection/QueryableCollection.java
@@ -41,7 +41,7 @@ import java.util.stream.StreamSupport;
* @since 4.0.0
*/
@Internal
-public class QueryableCollection<T> implements Queryable<T>, Iterable<T> {
+class QueryableCollection<T> implements Queryable<T>, Iterable<T> {
private final Iterable<T> sourceIterable;
private Stream<T> sourceStream;