minor refactor: keep some of the groovydoc map data structures ordered for greater repeatability

Author: paulk-asert

subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java

@@ -53,8 +53,8 @@
 
 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;
@@ -74,7 +74,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 = "/";
 
@@ -96,7 +96,7 @@ protected SourceUnit getSourceUnit() {
 
     @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();

subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java

@@ -34,7 +34,6 @@
 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;
@@ -113,7 +112,7 @@ public SimpleGroovyClassDoc(List<String> importedClassesAndPackages, Map<String,
         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) {

subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java

@@ -24,7 +24,6 @@
 
 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<>();
+    private final Map<String, GroovyClassDoc> cachedResolvedClasses = new LinkedHashMap<>();
     private final ClassNamedCache classNamedCache;
 
     private String description = "";
@@ -50,7 +49,7 @@ public SimpleGroovyRootDoc(String name) {
         super(name);
         packageDocs = new LinkedHashMap<>();
         classDocs = new LinkedHashMap<>();
-        equivalentPackageImports = new HashMap<>();
+        equivalentPackageImports = new LinkedHashMap<>();
         classNamedCache = new ClassNamedCache(classDocs);
     }
 
@@ -175,7 +174,7 @@ public void resolve() {
 
     private static final 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;

subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/antlr4/GroovydocJavaVisitor.java

@@ -57,17 +57,17 @@
 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;
 
 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 = "/";