You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/07/27 04:09:02 UTC
[groovy] 01/02: GROOVY-10704: retain order of inherited methods
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 400233cda8572840782c29a78eb4356f10be530c
Author: musketyr <vl...@orany.cz>
AuthorDate: Tue Jul 26 08:25:33 2022 +0200
GROOVY-10704: retain order of inherited methods
to ensure the generated trait classes are the same for the same source code
---
src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java b/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java
index 510888e91b..0e968f14e2 100644
--- a/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java
+++ b/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java
@@ -36,8 +36,8 @@ import java.lang.reflect.Modifier;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -165,7 +165,7 @@ public class ClassNodeUtils {
public static Map<String, MethodNode> getDeclaredMethodsFromSuper(final ClassNode cNode) {
ClassNode parent = cNode.getSuperClass();
if (parent == null) {
- return new HashMap<>();
+ return new LinkedHashMap<>();
}
return parent.getDeclaredMethodsMap();
}
@@ -197,7 +197,7 @@ public class ClassNodeUtils {
* @return A map of methods
*/
public static Map<String, MethodNode> getDeclaredMethodsFromInterfaces(final ClassNode cNode) {
- Map<String, MethodNode> methodsMap = new HashMap<>();
+ Map<String, MethodNode> methodsMap = new LinkedHashMap<>();
addDeclaredMethodsFromInterfaces(cNode, methodsMap);
return methodsMap;
}