This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new 766869fb56 GROOVY-11674: Grails reproducible build (order trait
methods - minor refactor)
766869fb56 is described below
commit 766869fb564b146b30cd3de27d7656ebd141f14e
Author: Paul King <[email protected]>
AuthorDate: Wed Jun 4 18:49:24 2025 +1000
GROOVY-11674: Grails reproducible build (order trait methods - minor
refactor)
---
.../java/org/codehaus/groovy/transform/trait/TraitComposer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
b/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
index 5bfb78f0be..f569980f4b 100644
--- a/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
+++ b/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
@@ -126,7 +126,7 @@ public abstract class TraitComposer {
Map<String, ClassNode> genericsSpec =
GenericsUtils.createGenericsSpec(trait,
GenericsUtils.createGenericsSpec(cNode));
List<MethodNode> hMethods = new
ArrayList<>(helperClassNode.getMethods());
- if (!hMethods.isEmpty()) {
+ if (hMethods.size() > 1) {
hMethods.sort(Comparator.comparing(MethodNodeUtils::methodDescriptorWithoutReturnType));
}
for (MethodNode methodNode : hMethods) {
@@ -179,7 +179,7 @@ public abstract class TraitComposer {
List<MethodNode> declaredMethods = new LinkedList<>();
int pos = 0; // keep direct getters at start but in declaration
order
List<MethodNode> fhMethods = new
ArrayList<>(fieldHelperClassNode.getMethods());
- if (!fhMethods.isEmpty()) {
+ if (fhMethods.size() > 1) {
fhMethods.sort(Comparator.comparing(MethodNodeUtils::methodDescriptorWithoutReturnType));
}
for (MethodNode declaredMethod : fhMethods) {
@@ -192,7 +192,7 @@ public abstract class TraitComposer {
if (staticFieldHelperClassNode != null) {
List<MethodNode> sfhMethods = new
ArrayList<>(staticFieldHelperClassNode.getMethods());
- if (!sfhMethods.isEmpty()) {
+ if (sfhMethods.size() > 1) {
sfhMethods.sort(Comparator.comparing(MethodNodeUtils::methodDescriptorWithoutReturnType));
}
for (MethodNode declaredMethod : sfhMethods) {
