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 2021/06/13 07:13:29 UTC

[groovy] branch master updated (051c130 -> 8dce303)

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.


    from 051c130  Try to workaround javadoc bug
     new 6e041d3  Install graphviz
     new 7f4edba  Workaround javadoc bug
     new 8dce303  Fix javadoc issues

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/gradle-snapshot-distribution.yml  |  2 ++
 .../groovy/runtime/StreamGroovyMethods.java         |  4 ++--
 .../collection/runtime/QueryableHelper.groovy       | 21 +++++++--------------
 3 files changed, 11 insertions(+), 16 deletions(-)

[groovy] 03/03: Fix javadoc issues

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 8dce30382dd4ac8c98bfe5db1b83b3095899b6bd
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Jun 13 15:10:57 2021 +0800

    Fix javadoc issues
---
 src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
index fa82132..c4054bc 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
@@ -62,7 +62,7 @@ public class StreamGroovyMethods {
      *
      * <pre class="groovyTestCase">
      * import java.util.stream.Stream
-     * assert (Stream.of(1) + Stream.&lt;Integer>empty()).toList() == [1]
+     * assert (Stream.of(1) + Stream.&lt;Integer&gt;empty()).toList() == [1]
      * assert (Stream.of(1) + Stream.of(2)).toList() == [1,2]
      * assert (Stream.of(1) + [2].stream()).toList() == [1,2]
      * </pre>
@@ -243,7 +243,7 @@ public class StreamGroovyMethods {
      *
      * <pre class="groovyTestCase">
      * class Items implements Iterable<String> {
-     *   Iterator&lt;String> iterator() {
+     *   Iterator&lt;String&gt; iterator() {
      *     ['one', 'two'].iterator()
      *   }
      * }

[groovy] 01/03: Install graphviz

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 6e041d383e78bba3abc5f53f28edbc634645ea15
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Jun 13 14:29:05 2021 +0800

    Install graphviz
---
 .github/workflows/gradle-snapshot-distribution.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/gradle-snapshot-distribution.yml b/.github/workflows/gradle-snapshot-distribution.yml
index da967b2..14eab42 100644
--- a/.github/workflows/gradle-snapshot-distribution.yml
+++ b/.github/workflows/gradle-snapshot-distribution.yml
@@ -31,6 +31,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
+      - name: Install graphviz
+        run: sudo apt-get install -y graphviz
       - name: Build and package
         run: ./gradlew clean dist --no-build-cache --no-scan --refresh-dependencies
         timeout-minutes: 60

[groovy] 02/03: Workaround javadoc bug

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 7f4edbaf2aede26e7cce82551a53f08ff857f5e6
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Jun 13 14:43:14 2021 +0800

    Workaround javadoc bug
---
 .../collection/runtime/QueryableHelper.groovy       | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableHelper.groovy b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableHelper.groovy
index 709549a..16940c6 100644
--- a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableHelper.groovy
+++ b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableHelper.groovy
@@ -23,7 +23,6 @@ import groovy.transform.CompileStatic
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
-import java.util.concurrent.ThreadFactory
 import java.util.concurrent.TimeUnit
 import java.util.function.Function
 import java.util.function.Supplier
@@ -127,19 +126,13 @@ class QueryableHelper {
     private QueryableHelper() {}
 
     private static class ThreadPoolHolder {
-        static final ExecutorService THREAD_POOL
-        static {
-            THREAD_POOL = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), new ThreadFactory() {
-                private int seq
-                @Override
-                Thread newThread(Runnable r) {
-                    Thread t = new Thread(r)
-                    t.setName("ginq-thread-" + seq++)
-                    t.setDaemon(true)
-                    return t
-                }
-            })
-        }
+        static int seq
+        static final ExecutorService THREAD_POOL = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), (Runnable r) -> {
+            Thread t = new Thread(r)
+            t.setName("ginq-thread-" + seq++)
+            t.setDaemon(true)
+            return t
+        })
         private ThreadPoolHolder() {}
     }
 }