GROOVY-11674: Grails reproducible build (order trait methods - minor refactor)

Author: paulk-asert

src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java

@@ -126,7 +126,7 @@ private static void applyTrait(final ClassNode trait, final ClassNode cNode, fin
         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 @@ private static void applyTrait(final ClassNode trait, final ClassNode cNode, fin
             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 @@ private static void applyTrait(final ClassNode trait, final ClassNode cNode, fin
 
             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) {