This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new ad477e1e6e minor refactor: keep some of the groovydoc map data
structures ordered for greater repeatability
ad477e1e6e is described below
commit ad477e1e6efe72980878a34a5843de155398c474
Author: Paul King <[email protected]>
AuthorDate: Fri May 2 07:03:37 2025 +1000
minor refactor: keep some of the groovydoc map data structures ordered for
greater repeatability
---
.../src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java | 6 +++---
.../org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 3 +--
.../org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java | 7 +++----
.../groovy/tools/groovydoc/antlr4/GroovydocJavaVisitor.java | 6 +++---
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
b/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
index 2b4aa64700..08cd7474d4 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
@@ -52,8 +52,8 @@ import org.codehaus.groovy.tools.groovydoc.SimpleGroovyType;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -73,7 +73,7 @@ public class GroovydocVisitor extends ClassCodeVisitorSupport
{
private final List<LinkArgument> links;
private String packagePath;
private SimpleGroovyClassDoc currentClassDoc = null;
- private Map<String, GroovyClassDoc> classDocs = new HashMap<>();
+ private Map<String, GroovyClassDoc> classDocs = new LinkedHashMap<>();
private final Properties properties;
private static final String FS = "/";
@@ -95,7 +95,7 @@ public class GroovydocVisitor extends ClassCodeVisitorSupport
{
@Override
public void visitClass(ClassNode node) {
- final Map<String, String> aliases = new HashMap<>();
+ final Map<String, String> aliases = new LinkedHashMap<>();
final List<String> imports = new ArrayList<>();
for (ImportNode iNode : node.getModule().getImports()) {
String name = iNode.getClassName();
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
index d56904deca..7a8c1cc593 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
@@ -35,7 +35,6 @@ import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
@@ -114,7 +113,7 @@ public class SimpleGroovyClassDoc extends
SimpleGroovyAbstractableElementDoc imp
interfaceNames = new ArrayList<>();
interfaceClasses = new ArrayList<>();
nested = new ArrayList<>();
- resolvedExternalClassesCache = new HashMap<>();
+ resolvedExternalClassesCache = new LinkedHashMap<>();
}
public SimpleGroovyClassDoc(List<String> importedClassesAndPackages,
Map<String, String> aliases, String name) {
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
index 7f1b563c9a..2c71e49dcf 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
@@ -24,7 +24,6 @@ import org.codehaus.groovy.groovydoc.GroovyRootDoc;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -41,7 +40,7 @@ public class SimpleGroovyRootDoc extends SimpleGroovyDoc
implements GroovyRootDo
private final Map<String, GroovyClassDoc> classDocs;
private final Map<String, String> equivalentPackageImports;
private List<GroovyClassDoc> classDocValues = null;
- private final Map<String, GroovyClassDoc> cachedResolvedClasses = new
HashMap<String, GroovyClassDoc>();
+ private final Map<String, GroovyClassDoc> cachedResolvedClasses = new
LinkedHashMap<>();
private final ClassNamedCache classNamedCache;
private String description = "";
@@ -50,7 +49,7 @@ public class SimpleGroovyRootDoc extends SimpleGroovyDoc
implements GroovyRootDo
super(name);
packageDocs = new LinkedHashMap<String, GroovyPackageDoc>();
classDocs = new LinkedHashMap<String, GroovyClassDoc>();
- equivalentPackageImports = new HashMap<String, String>();
+ equivalentPackageImports = new LinkedHashMap<String, String>();
classNamedCache = new ClassNamedCache(classDocs);
}
@@ -165,7 +164,7 @@ public class SimpleGroovyRootDoc extends SimpleGroovyDoc
implements GroovyRootDo
private static class ClassNamedCache {
private final Map<String, GroovyClassDoc> classDocs;
- private final Map<Entry, GroovyClassDoc> store = new HashMap<>();
+ private final Map<Entry, GroovyClassDoc> store = new LinkedHashMap<>();
private ClassNamedCache(final Map<String, GroovyClassDoc> classDocs) {
this.classDocs = classDocs;
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/antlr4/GroovydocJavaVisitor.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/antlr4/GroovydocJavaVisitor.java
index 91acd2ef40..06e11279f5 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/antlr4/GroovydocJavaVisitor.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/antlr4/GroovydocJavaVisitor.java
@@ -57,7 +57,7 @@ import
org.codehaus.groovy.tools.groovydoc.SimpleGroovyProgramElementDoc;
import org.codehaus.groovy.tools.groovydoc.SimpleGroovyType;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -65,9 +65,9 @@ import java.util.Optional;
public class GroovydocJavaVisitor extends VoidVisitorAdapter<Object> {
private final List<LinkArgument> links;
private SimpleGroovyClassDoc currentClassDoc = null;
- private Map<String, GroovyClassDoc> classDocs = new HashMap<>();
+ private Map<String, GroovyClassDoc> classDocs = new LinkedHashMap<>();
private String packagePath;
- private final Map<String, String> aliases = new HashMap<>();
+ private final Map<String, String> aliases = new LinkedHashMap<>();
private List<String> imports = new ArrayList<>();
private static final String FS = "/";
