Improve thread-dump info in debug dump

Author: TBlueF

common/src/main/java/de/bluecolored/bluemap/common/debug/StateDumper.java

@@ -29,6 +29,7 @@
 import com.google.gson.stream.JsonWriter;
 import de.bluecolored.bluemap.core.BlueMap;
 import de.bluecolored.bluemap.core.util.Key;
+import lombok.SneakyThrows;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -63,12 +64,6 @@ public void dump(Path file) throws IOException {
 
         Set<Object> alreadyDumped = Collections.newSetFromMap(new IdentityHashMap<>());
 
-        writer.name("threads").beginArray();
-        for (Thread thread : Thread.getAllStackTraces().keySet()) {
-            dumpInstance(thread, writer, alreadyDumped);
-        }
-        writer.endArray();
-
         writer.name("dump").beginObject();
         for (Object instance : instances) {
             Class<?> type = instance.getClass();
@@ -77,13 +72,23 @@ public void dump(Path file) throws IOException {
         }
         writer.endObject();
 
+        writer.name("threads").beginArray();
+        Thread.getAllStackTraces().keySet().stream()
+                .sorted(Comparator.comparing(Thread::getName))
+                .forEach(thread -> {
+                        alreadyDumped.remove(thread);
+                        dumpInstance(thread, writer, alreadyDumped);
+                });
+        writer.endArray();
+
         writer.endObject();
 
         writer.flush();
         writer.close();
     }
 
-    private void dumpInstance(Object instance, JsonWriter writer, Set<Object> alreadyDumped) throws IOException {
+    @SneakyThrows(IOException.class)
+    private void dumpInstance(Object instance, JsonWriter writer, Set<Object> alreadyDumped) {
 
         if (instance == null) {
             writer.nullValue();
@@ -255,6 +260,10 @@ private void dumpInstance(Object instance, JsonWriter writer, Set<Object> alread
                     writer.endArray();
                 } catch (SecurityException ignore) {}
 
+                writer.name("instance").beginObject();
+                dumpAnnotatedInstance(instance.getClass(), instance, writer, alreadyDumped);
+                writer.endObject();
+
                 return;
             }