address comments

pkgs/jnigen/java/src/main/java/com/github/dart_lang/jnigen/apisummarizer/Main.java

@@ -116,13 +116,13 @@ public static void main(String[] args) throws FileNotFoundException {
 
     switch (options.backend) {
       case DOCLET:
-        JsonWriter.writeJSON(runDoclet(javaDoc, sourceFiles, options), output);
+        JsonWriter.writeJSON(runDoclet(javaDoc, sourceFiles, options).values(), output);
         break;
       case ASM:
-        JsonWriter.writeJSON(AsmSummarizer.run(classStreamProviders), output);
+        JsonWriter.writeJSON(AsmSummarizer.run(classStreamProviders).values(), output);
         break;
       case AUTO:
-        Map<String, ClassDecl> classes = new HashMap<>();
+        Map<String, ClassDecl> classes = new LinkedHashMap<>();
         // Preferring DOCLET as the source of summary a class exists in
         // both ASM and DOCLET.
         if (!classStreamProviders.isEmpty()) {
@@ -131,7 +131,7 @@ public static void main(String[] args) throws FileNotFoundException {
         if (!sourceFiles.isEmpty()) {
           classes.putAll(runDoclet(javaDoc, sourceFiles, options));
         }
-        JsonWriter.writeJSON(classes, output);
+        JsonWriter.writeJSON(classes.values(), output);
         break;
     }
   }

pkgs/jnigen/java/src/main/java/com/github/dart_lang/jnigen/apisummarizer/disasm/AsmClassVisitor.java

@@ -26,7 +26,7 @@ public Map<String, ClassDecl> getVisited() {
     return visited;
   }
 
-  Map<String, ClassDecl> visited = new HashMap<>();
+  Map<String, ClassDecl> visited = new LinkedHashMap<>();
   Stack<ClassDecl> visiting = new Stack<>();
 
   /// Actual access for the inner classes as originally defined.
@@ -65,8 +65,8 @@ public void visitInnerClass(String name, String outerName, String innerName, int
     actualAccess.put(binaryName, access);
 
     if (visited.containsKey(binaryName)) {
-      // If the order of visit is outer first inner second.
-      // We still want to correct the modifiers.
+      // If the order of visit is outerClass-first, innerClass-second then only
+      // correct the modifiers.
       visited.get(binaryName).modifiers = TypeUtils.access(access);
     }
   }

pkgs/jnigen/java/src/main/java/com/github/dart_lang/jnigen/apisummarizer/doclet/SummarizerDoclet.java

@@ -62,7 +62,7 @@ public static class SummaryCollector {
 
   public class SummarizingScanner extends ElementScanner9<Void, SummaryCollector> {
     List<Package> packages = new ArrayList<>();
-    Map<String, ClassDecl> types = new HashMap<>();
+    Map<String, ClassDecl> types = new LinkedHashMap<>();
     ElementBuilders builders = new ElementBuilders(utils);
 
     // Each element in collector is a stack

pkgs/jnigen/java/src/main/java/com/github/dart_lang/jnigen/apisummarizer/util/JsonWriter.java

@@ -6,10 +6,10 @@
 import com.github.dart_lang.jnigen.apisummarizer.elements.ClassDecl;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Map;
+import java.util.Collection;
 
 public class JsonWriter {
-  public static void writeJSON(Map<String, ClassDecl> classes, OutputStream output) {
+  public static void writeJSON(Collection<ClassDecl> classes, OutputStream output) {
     var mapper = new ObjectMapper();
     Log.info("Writing JSON for %d classes", classes.size());
     mapper.enable(SerializationFeature.INDENT_OUTPUT);

pkgs/jnigen/lib/src/elements/elements.dart

@@ -33,9 +33,13 @@ class Classes implements Element<Classes> {
 
   final Map<String, ClassDecl> decls;
 
-  factory Classes.fromJson(Map<String, dynamic> json) {
-    return Classes(
-        json.map((key, value) => MapEntry(key, ClassDecl.fromJson(value))));
+  factory Classes.fromJson(List<dynamic> json) {
+    final decls = <String, ClassDecl>{};
+    for (final declJson in json) {
+      final classDecl = ClassDecl.fromJson(declJson);
+      decls[classDecl.binaryName] = classDecl;
+    }
+    return Classes(decls);
   }
 
   @override