(groovy-dev-site) branch asf-site updated: 2024/06/17 06:01:40: Generated dev website from groovy-website@1f293ef
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-dev-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 85368f1 2024/06/17 06:01:40: Generated dev website from groovy-website@1f293ef 85368f1 is described below commit 85368f130af574640c57c82496859bbbced93e3d Author: jenkins AuthorDate: Mon Jun 17 06:01:40 2024 + 2024/06/17 06:01:40: Generated dev website from groovy-website@1f293ef --- blog/apache-groovy-2022-year-in.html | 2 +- blog/community-over-code-eu-2024.html | 439 ++ blog/community-over-code-na-2023.html | 2 +- blog/img/coceu2024_groovy_poster.jpg | Bin 0 -> 2027745 bytes blog/img/coceu2024_iris.png | Bin 0 -> 1168632 bytes blog/img/coceu2024_iris1.png | Bin 0 -> 403154 bytes blog/img/coceu2024_iris2.png | Bin 0 -> 1168576 bytes blog/img/coceu2024_iris3.png | Bin 0 -> 678103 bytes blog/img/coceu2024_iris4.png | Bin 0 -> 240257 bytes blog/img/coceu2024_iris5.png | Bin 0 -> 139948 bytes blog/img/coceu2024_iris6.png | Bin 0 -> 729219 bytes blog/img/coceu2024_iris7.png | Bin 0 -> 474498 bytes blog/img/coceu2024_micronaut.png | Bin 0 -> 891504 bytes blog/img/coceu2024_micronaut1.png | Bin 0 -> 192806 bytes blog/img/coceu2024_micronaut2.png | Bin 0 -> 206204 bytes blog/img/coceu2024_micronaut3.png | Bin 0 -> 130992 bytes blog/img/coceu2024_micronaut4.png | Bin 0 -> 230666 bytes blog/img/coceu2024_micronaut5.png | Bin 0 -> 225572 bytes blog/img/coceu2024_micronaut_groovy_spock.png | Bin 0 -> 134239 bytes blog/img/coceu2024_operator_overloading.png | Bin 0 -> 906204 bytes blog/img/coceu2024_posters.jpg| Bin 0 -> 50822 bytes blog/img/coceu2024_primitives.png | Bin 0 -> 948781 bytes blog/img/coceu2024_static_roman_numerals.png | Bin 0 -> 186719 bytes blog/img/coceu2024_tac_dinner.jpg | Bin 0 -> 948786 bytes blog/img/coceu2024_transforms.png | Bin 0 -> 860063 bytes blog/img/coceu2024_whiskey.png| Bin 0 -> 1592195 bytes blog/img/coceu2024_whiskey1.png | Bin 0 -> 1380587 bytes blog/img/coceu2024_whiskey2.png | Bin 0 -> 698641 bytes blog/img/coceu2024_whiskey3.png | Bin 0 -> 836600 bytes blog/img/coceu2024_whiskey4.png | Bin 0 -> 891702 bytes blog/img/coceu2024_why_groovy.png | Bin 0 -> 1321987 bytes 31 files changed, 441 insertions(+), 2 deletions(-) diff --git a/blog/apache-groovy-2022-year-in.html b/blog/apache-groovy-2022-year-in.html index 84f86e9..6f143ed 100644 --- a/blog/apache-groovy-2022-year-in.html +++ b/blog/apache-groovy-2022-year-in.html @@ -53,7 +53,7 @@ -Blog indexApache Groovy 2022 Year In ReviewReleases & ContributionsDownloadsBlogsBlog indexApache Groovy 2022 Year In ReviewReleases & ContributionsDownloadsBlogsThe Apache Groovy programming language - Blogs - Community Over Code (Europe) [...] + + + + + + + +Socialize + + Discuss on the mailing-list + + Groovy on Twitter + + Events and conferences + + Source code on GitHub + + Report issues in Jira + + Stack Overflow questions + + Slack Community + + + + + + + + + + + + Apache Groovy + + + +LearnDocumentationDownloadSupportContributeEcosystemBlog pos [...] +Socialize + + + + + + + + +Blog indexCommunity Over Code (Europe) 2024The Conference, Venue, and Host cityHighlights from the Groovy BoF [
(groovy-website) branch asf-site updated: draft coceu 2024 trip report
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 1f293ef draft coceu 2024 trip report 1f293ef is described below commit 1f293ef31bcd53eb7a2fc3ec827172cd5d5a7988 Author: Paul King AuthorDate: Mon Jun 17 15:40:46 2024 +1000 draft coceu 2024 trip report --- .../src/site/blog/community-over-code-eu-2024.adoc | 227 + site/src/site/blog/img/coceu2024_groovy_poster.jpg | Bin 0 -> 2027745 bytes site/src/site/blog/img/coceu2024_iris.png | Bin 0 -> 1168632 bytes site/src/site/blog/img/coceu2024_iris1.png | Bin 0 -> 403154 bytes site/src/site/blog/img/coceu2024_iris2.png | Bin 0 -> 1168576 bytes site/src/site/blog/img/coceu2024_iris3.png | Bin 0 -> 678103 bytes site/src/site/blog/img/coceu2024_iris4.png | Bin 0 -> 240257 bytes site/src/site/blog/img/coceu2024_iris5.png | Bin 0 -> 139948 bytes site/src/site/blog/img/coceu2024_iris6.png | Bin 0 -> 729219 bytes site/src/site/blog/img/coceu2024_iris7.png | Bin 0 -> 474498 bytes site/src/site/blog/img/coceu2024_micronaut.png | Bin 0 -> 891504 bytes site/src/site/blog/img/coceu2024_micronaut1.png| Bin 0 -> 192806 bytes site/src/site/blog/img/coceu2024_micronaut2.png| Bin 0 -> 206204 bytes site/src/site/blog/img/coceu2024_micronaut3.png| Bin 0 -> 130992 bytes site/src/site/blog/img/coceu2024_micronaut4.png| Bin 0 -> 230666 bytes site/src/site/blog/img/coceu2024_micronaut5.png| Bin 0 -> 225572 bytes .../blog/img/coceu2024_micronaut_groovy_spock.png | Bin 0 -> 134239 bytes .../blog/img/coceu2024_operator_overloading.png| Bin 0 -> 906204 bytes site/src/site/blog/img/coceu2024_posters.jpg | Bin 0 -> 50822 bytes site/src/site/blog/img/coceu2024_primitives.png| Bin 0 -> 948781 bytes .../blog/img/coceu2024_static_roman_numerals.png | Bin 0 -> 186719 bytes site/src/site/blog/img/coceu2024_tac_dinner.jpg| Bin 0 -> 948786 bytes site/src/site/blog/img/coceu2024_transforms.png| Bin 0 -> 860063 bytes site/src/site/blog/img/coceu2024_whiskey.png | Bin 0 -> 1592195 bytes site/src/site/blog/img/coceu2024_whiskey1.png | Bin 0 -> 1380587 bytes site/src/site/blog/img/coceu2024_whiskey2.png | Bin 0 -> 698641 bytes site/src/site/blog/img/coceu2024_whiskey3.png | Bin 0 -> 836600 bytes site/src/site/blog/img/coceu2024_whiskey4.png | Bin 0 -> 891702 bytes site/src/site/blog/img/coceu2024_why_groovy.png| Bin 0 -> 1321987 bytes 29 files changed, 227 insertions(+) diff --git a/site/src/site/blog/community-over-code-eu-2024.adoc b/site/src/site/blog/community-over-code-eu-2024.adoc new file mode 100644 index 000..e106105 --- /dev/null +++ b/site/src/site/blog/community-over-code-eu-2024.adoc @@ -0,0 +1,227 @@ += Community Over Code (Europe) 2024 +Paul King +:revdate: 2024-06-17T17:00:00+00:00 +:draft: true +:description: This post looks at the ASF Community Over Code EU conference in Bratislava, Slovakia, June 3-5 2024, with a particular focus on the Groovy Track. +:keywords: groovy, asf, apachecon, communityovercode + +This year's European edition of the ASF conference, https://communityovercode.org/[Community Over Code], +featured three in-person days of sessions (June 3-5) at the Halifax Convention Centre, including a Groovy track on the last day. + +NOTE: The presentation slides and audio/video (where available) are still being added onto the conference site. +If additional material becomes available, this post will be updated with links to the additional content. + +This post gives a short trip report on the conference mostly focussed on the Groovy track. + +== The Conference, Venue, and Host city + +The conference was hosted at the Radisson Blu Carlton in Bratislava, Slovakia. The facilities were great, +and it was a great city to visit. + +image:https://eu.communityovercode.org/images/blog/images-bratislava1.jpg[width=47%] +image:https://photos.apachecon.com/_data/i/upload/2024/06/05/20240605134031-d3953d86-xx.jpg[width=42%] +image:https://photos.apachecon.com/_data/i/upload/2024/06/10/20240610202025-1ac29b1e-xx.jpg[width=44.4%] +image:https://photos.apachecon.com/_data/i/upload/2024/06/05/20240605081228-926eecf0-xx.jpg[width=44.4%] +image:img/coceu2024_tac_dinner.jpg[width=55%] +image:https://photos.apachecon.com/_data/i/upload/2023/10/20/20231020033313-d56c0136-me.jpg[stickers,width=33%] + +Kudos to all involved for making the event a fruitful and rewarding one! + +== Highlights from the Groovy BoF and Groovy Track + +We had a very engaging Birds-of-a-Feather (BoF) session with various users of the +Groovy programming language including a large contingent from the https://ofbiz.apache.org/[Apache OFBiz] +project. We also discussed some of the reasons why Groovy is still
(groovy) branch dependabot/gradle/com.gradle.common-custom-user-data-gradle-plugin-2.0.2 deleted (was b51c8853d5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/gradle/com.gradle.common-custom-user-data-gradle-plugin-2.0.2 in repository https://gitbox.apache.org/repos/asf/groovy.git was b51c8853d5 Bump com.gradle.common-custom-user-data-gradle-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(groovy) branch master updated: Bump com.gradle.common-custom-user-data-gradle-plugin
This is an automated email from the ASF dual-hosted git repository.
goooler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new fb2084ddb5 Bump com.gradle.common-custom-user-data-gradle-plugin
fb2084ddb5 is described below
commit fb2084ddb5d5215b07ce4f7f2516588b88b33b08
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Jun 17 01:53:30 2024 +
Bump com.gradle.common-custom-user-data-gradle-plugin
Bumps com.gradle.common-custom-user-data-gradle-plugin from 2.0.1 to 2.0.2.
---
updated-dependencies:
- dependency-name: com.gradle.common-custom-user-data-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
settings.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings.gradle b/settings.gradle
index 844da3a879..530a872755 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -32,7 +32,7 @@ pluginManagement {
plugins {
// Before updating this, please check the compatibility from
https://docs.gradle.com/enterprise/compatibility/#develocity_compatibility and
https://ge.apache.org/scans.
id "com.gradle.develocity" version "3.17.5"
-id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.1'
+id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
}
apply from: 'gradle/build-scans.gradle'
(groovy) branch dependabot/gradle/com.gradle.common-custom-user-data-gradle-plugin-2.0.2 created (now b51c8853d5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/gradle/com.gradle.common-custom-user-data-gradle-plugin-2.0.2 in repository https://gitbox.apache.org/repos/asf/groovy.git at b51c8853d5 Bump com.gradle.common-custom-user-data-gradle-plugin No new revisions were added by this update.
(groovy) branch master updated: `CharSequence#isEmpty` is 15+
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 43df77319a `CharSequence#isEmpty` is 15+
43df77319a is described below
commit 43df77319ad3b65a02aa0fd092ee642daa0abb23
Author: Eric Milles
AuthorDate: Sun Jun 16 12:15:07 2024 -0500
`CharSequence#isEmpty` is 15+
---
src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
index f05065f25f..c0113b2681 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
@@ -3436,7 +3436,7 @@ public class StringGroovyMethods extends
DefaultGroovyMethodsSupport {
* @see #isAllWhitespace(CharSequence)
*/
public static boolean isBlank(final CharSequence self) {
-return self == null || self.isEmpty() || self.toString().isBlank();
+return self == null || self.length() == 0 || self.toString().isBlank();
}
/**
(groovy) branch master updated: leverage `String#isBlank` and `CharSequence#isEmpty`
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new f96d1587fe leverage `String#isBlank` and `CharSequence#isEmpty`
f96d1587fe is described below
commit f96d1587fe17b71e17a7607a41795b1407e9ae58
Author: Eric Milles
AuthorDate: Sun Jun 16 12:01:24 2024 -0500
leverage `String#isBlank` and `CharSequence#isEmpty`
---
.../java/org/codehaus/groovy/runtime/StringGroovyMethods.java| 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
index f5067671a9..f05065f25f 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
@@ -3436,10 +3436,7 @@ public class StringGroovyMethods extends
DefaultGroovyMethodsSupport {
* @see #isAllWhitespace(CharSequence)
*/
public static boolean isBlank(final CharSequence self) {
-if (self == null) {
-return true;
-}
-return matches(self, LazyInitializer.BLANK_PATTERN);
+return self == null || self.isEmpty() || self.toString().isBlank();
}
/**
@@ -3978,8 +3975,4 @@ public class StringGroovyMethods extends
DefaultGroovyMethodsSupport {
return
self.toString().toLowerCase().contains(searchString.toString().toLowerCase());
}
-
-private static class LazyInitializer {
-static final Pattern BLANK_PATTERN = Pattern.compile("\\s*");
-}
}
(groovy) 01/02: minor items
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0b9fd8d94a05f0fa8bfd354e4b536b88a965ccec
Author: Eric Milles
AuthorDate: Sun Jun 16 11:33:25 2024 -0500
minor items
---
.../groovy/grape/GrabAnnotationTransformation.java | 127 ++---
1 file changed, 60 insertions(+), 67 deletions(-)
diff --git a/src/main/java/groovy/grape/GrabAnnotationTransformation.java
b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
index 9cfec9dddc..b7d9e0a9f7 100644
--- a/src/main/java/groovy/grape/GrabAnnotationTransformation.java
+++ b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
@@ -54,7 +54,6 @@ import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -79,9 +78,10 @@ import static
org.codehaus.groovy.transform.AbstractASTTransformation.getMemberS
*/
@GroovyASTTransformation(phase=CompilePhase.CONVERSION)
public class GrabAnnotationTransformation extends ClassCodeVisitorSupport
implements ASTTransformation, CompilationUnitAware {
+
private static final String GRAB_CLASS_NAME = Grab.class.getName();
-private static final String GRAB_DOT_NAME =
GRAB_CLASS_NAME.substring(GRAB_CLASS_NAME.lastIndexOf('.'));
-private static final String GRAB_SHORT_NAME = GRAB_DOT_NAME.substring(1);
+private static final String GRAB_DOT_NAME = dotName(GRAB_CLASS_NAME);
+private static final String GRAB_SHORT_NAME = shortName(GRAB_DOT_NAME);
private static final String GRABEXCLUDE_CLASS_NAME =
GrabExclude.class.getName();
private static final String GRABEXCLUDE_DOT_NAME =
dotName(GRABEXCLUDE_CLASS_NAME);
@@ -102,12 +102,13 @@ public class GrabAnnotationTransformation extends
ClassCodeVisitorSupport implem
private static final ClassNode THREAD_CLASSNODE =
ClassHelper.make(Thread.class);
private static final ClassNode SYSTEM_CLASSNODE =
ClassHelper.make(System.class);
-private static final List GRABEXCLUDE_REQUIRED =
Arrays.asList("group", "module");
-private static final List GRABRESOLVER_REQUIRED =
Arrays.asList("name", "root");
-private static final List GRAB_REQUIRED = Arrays.asList("group",
"module", "version");
-private static final List GRAB_OPTIONAL =
Arrays.asList("classifier", "transitive", "conf", "ext", "type", "changing",
"force", "initClass");
-private static final List GRAB_BOOLEAN =
Arrays.asList("transitive", "changing", "force", "initClass");
-private static final Collection GRAB_ALL =
DefaultGroovyMethods.plus(GRAB_REQUIRED, GRAB_OPTIONAL);
+private static final List GRABEXCLUDE_REQUIRED = List.of("group",
"module");
+private static final List GRABRESOLVER_REQUIRED = List.of("name",
"root");
+private static final List GRAB_REQUIRED = List.of("group",
"module", "version");
+private static final List GRAB_OPTIONAL =
List.of("classifier", "transitive", "conf", "ext", "type", "changing", "force",
"initClass");
+private static final List GRAB_BOOLEAN =
List.of("transitive", "changing", "force", "initClass");
+private static final List GRAB_ALL =
DefaultGroovyMethods.plus(GRAB_REQUIRED, GRAB_OPTIONAL);
+
private static final Pattern IVY_PATTERN =
Pattern.compile("([a-zA-Z0-9-/._+=]+)#([a-zA-Z0-9-/._+=]+)(;([a-zA-Z0-9-/.\\(\\)\\[\\]\\{\\}_+=,:@][a-zA-Z0-9-/.\\(\\)\\]\\{\\}_+=,:@]*))?(\\[([a-zA-Z0-9-/._+=,]*)\\])?");
private static final Pattern ATTRIBUTES_PATTERN =
Pattern.compile("(.*;|^)([a-zA-Z0-9]+)=([a-zA-Z0-9.*\\[\\]\\-\\(\\),]*)$");
@@ -162,74 +163,65 @@ public class GrabAnnotationTransformation extends
ClassCodeVisitorSupport implem
}
@Override
-public void visit(ASTNode[] nodes, SourceUnit source) {
-sourceUnit = source;
+public void visit(final ASTNode[] nodes, final SourceUnit source) {
loader = null;
+sourceUnit = source;
initContextClassLoader = false;
-
-ModuleNode mn = (ModuleNode) nodes[0];
-
-allowShortGrab = true;
+allowShortGrab = true;
allowShortGrabExcludes = true;
-allowShortGrabConfig = true;
-allowShortGrapes = true;
+allowShortGrabConfig = true;
+allowShortGrapes = true;
allowShortGrabResolver = true;
-grabAliases = new HashSet();
-grabExcludeAliases = new HashSet();
-grabConfigAliases = new HashSet();
-grapesAliases = new HashSet();
-grabResolverAliases = new HashSet();
+grabAliases = new HashSet<>();
+grabExcludeAliases = new HashSet<>();
+grabConfigAliases = new HashSet<>();
+grapesAliases = new HashSet<>();
+grabResolverAliases = new HashSet<>();
+ModuleNode mn
(groovy) branch master updated (72f3295ca9 -> 8c6f1a7067)
This is an automated email from the ASF dual-hosted git repository. emilles pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from 72f3295ca9 Minor refactor new 0b9fd8d94a minor items new 8c6f1a7067 GROOVY-11409: package or import annotations apply to top-level class(es) The 2 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: .../groovy/grape/GrabAnnotationTransformation.java | 136 ++--- 1 file changed, 67 insertions(+), 69 deletions(-)
(groovy) 02/02: GROOVY-11409: package or import annotations apply to top-level class(es)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 8c6f1a70678ec95647f0961186c656616fd77bd5
Author: Eric Milles
AuthorDate: Sun Jun 16 11:54:04 2024 -0500
GROOVY-11409: package or import annotations apply to top-level class(es)
---
src/main/java/groovy/grape/GrabAnnotationTransformation.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/groovy/grape/GrabAnnotationTransformation.java
b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
index b7d9e0a9f7..fb318126e2 100644
--- a/src/main/java/groovy/grape/GrabAnnotationTransformation.java
+++ b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
@@ -210,7 +210,12 @@ public class GrabAnnotationTransformation extends
ClassCodeVisitorSupport implem
grapesAnnotations = new ArrayList<>();
grabResolverAnnotations = new ArrayList<>();
-visitClass(classNode);
+if (classNode.getOuterClass() == null) {
+visitClass(classNode);
+} else { // GROOVY-11409
+visitAnnotations(classNode);
+classNode.visitContents(this);
+}
List grabResolverInitializers = new ArrayList<>();
(groovy) 02/02: Minor refactor
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit c9e9330628a8e539f5328413e5e6bf859270130c
Author: Daniel Sun
AuthorDate: Sun Jun 16 07:09:18 2024 +0900
Minor refactor
(cherry picked from commit 72f3295ca94c768bf54f1bc6ad83ab4a0f5a1b80)
---
.../org/codehaus/groovy/vmplugin/v9/Java9.java | 27 ++
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
index 5a744c3e27..218fe87ef8 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
@@ -378,25 +378,22 @@ public class Java9 extends Java8 {
static {
ModuleFinder finder = ModuleFinder.ofSystem();
-Map map = new HashMap<>();
+Map packages = new HashMap<>(1024);
finder.findAll().stream()
.map(ModuleReference::descriptor)
-.forEach(md -> md.packages().forEach(pn -> map.putIfAbsent(pn,
md)));
+.forEach(md -> md.packages().forEach(pn ->
packages.putIfAbsent(pn, md)));
-Map> concealedPackagesToOpen = new
ConcurrentHashMap<>();
-Map> exportedPackagesToOpen = new
ConcurrentHashMap<>();
+Map> concealedPackagesToOpen = new
ConcurrentHashMap<>(64);
+Map> exportedPackagesToOpen = new
ConcurrentHashMap<>(64);
-Arrays.stream(JAVA8_PACKAGES())
-.forEach(pn -> {
-ModuleDescriptor descriptor = map.get(pn);
-if (descriptor != null && !isOpen(descriptor, pn)) {
-if (isExported(descriptor, pn)) {
-
exportedPackagesToOpen.computeIfAbsent(descriptor.name(), k -> new
HashSet<>()).add(pn);
-} else {
-
concealedPackagesToOpen.computeIfAbsent(descriptor.name(), k -> new
HashSet<>()).add(pn);
-}
-}
-});
+for (String j8pn : JAVA8_PACKAGES()) {
+ModuleDescriptor descriptor = packages.get(j8pn);
+if (descriptor == null || isOpen(descriptor, j8pn)) continue;
+
+Map> packagesToOpen =
+isExported(descriptor, j8pn) ? exportedPackagesToOpen :
concealedPackagesToOpen;
+packagesToOpen.computeIfAbsent(descriptor.name(), k -> new
HashSet<>(128)).add(j8pn);
+}
CONCEALED_PACKAGES_TO_OPEN = concealedPackagesToOpen;
EXPORTED_PACKAGES_TO_OPEN = exportedPackagesToOpen;
(groovy) 01/02: Replace Java-style array declaration
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit b7a6a413d7fc9484654a72e3e562dd54c640df78
Author: Daniel Sun
AuthorDate: Sat Jun 15 07:01:20 2024 +0900
Replace Java-style array declaration
(cherry picked from commit d9499ecdf994583c7e26501efdc2398eec5dd4b1)
---
.../groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java | 4 ++--
subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java | 2 +-
subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
index aedbd58644..afa6736b9b 100644
---
a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
+++
b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
@@ -454,7 +454,7 @@ public class StructuredSyntaxDocumentFilter extends
DocumentFilter {
* @param regexps
* @param style
*/
-public void putStyle(String regexps[], Style style) {
+public void putStyle(String[] regexps, Style style) {
putStyle(buildRegexp(regexps), style);
}
@@ -476,7 +476,7 @@ public class StructuredSyntaxDocumentFilter extends
DocumentFilter {
/**
* @param regexps
*/
-public void removeStyle(String regexps[]) {
+public void removeStyle(String[] regexps) {
removeStyle(buildRegexp(regexps));
}
diff --git a/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
index 1f6143bcad..1b3e6b3785 100644
--- a/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
+++ b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
@@ -71,7 +71,7 @@ public class GroovyMBean extends GroovyObjectSupport {
MBeanOperationInfo[] operationInfos = beanInfo.getOperations();
for (MBeanOperationInfo info : operationInfos) {
-String signature[] = createSignature(info);
+String[] signature = createSignature(info);
// Construct a simplistic key to support overloaded operations on
the MBean.
String operationKey = createOperationKey(info.getName(),
signature.length);
operations.put(operationKey, signature);
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
index c84dfd2164..ee16ac3366 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
@@ -4595,7 +4595,7 @@ public class Sql implements AutoCloseable {
}
private void clearStatementCache() {
-Statement statements[];
+Statement[] statements;
if (statementCache.isEmpty())
return;
statements = new Statement[statementCache.size()];
(groovy) branch GROOVY_4_0_X updated (972d0f23c6 -> c9e9330628)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git from 972d0f23c6 GROOVY-11401: STC: don't continue member search after map-based receiver new b7a6a413d7 Replace Java-style array declaration new c9e9330628 Minor refactor The 2 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: .../org/codehaus/groovy/vmplugin/v9/Java9.java | 27 ++ .../ui/text/StructuredSyntaxDocumentFilter.java| 4 ++-- .../src/main/java/groovy/jmx/GroovyMBean.java | 2 +- .../groovy-sql/src/main/java/groovy/sql/Sql.java | 2 +- 4 files changed, 16 insertions(+), 19 deletions(-)
