serializer-gson: Change output ordering to match the order of Vanilla components

Author: zml2008

serializer-configurate3/src/test/java/net/kyori/adventure/serializer/configurate3/ComponentSerializerTest.java

@@ -43,7 +43,7 @@ void testSerializeToString() {
       .build()
       .serialize(Component.text("Hello", Style.style(TextDecoration.BOLD)));
 
-    assertEquals("{\"text\":\"Hello\",\"bold\":true}", serialized.getString());
+    assertEquals("{\"bold\":true,\"text\":\"Hello\"}", serialized.getString());
   }
 
   @Test

serializer-configurate4/src/test/java/net/kyori/adventure/serializer/configurate4/ComponentSerializerTest.java

@@ -43,7 +43,7 @@ void testSerializeToString() {
       .build()
       .serialize(Component.text("Hello", Style.style(TextDecoration.BOLD)));
 
-    assertEquals("{\"text\":\"Hello\",\"bold\":true}", serialized.getString());
+    assertEquals("{\"bold\":true,\"text\":\"Hello\"}", serialized.getString());
   }
 
   @Test

text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java

@@ -172,6 +172,25 @@ private static <C extends NBTComponent<C, B>, B extends NBTComponentBuilder<C, B
   @Override
   public JsonElement serialize(final Component src, final Type typeOfSrc, final JsonSerializationContext context) {
     final JsonObject object = new JsonObject();
+
+    if(src.hasStyling()) {
+      final JsonElement style = context.serialize(src.style());
+      if(style.isJsonObject()) {
+        for(final Map.Entry<String, JsonElement> entry : ((JsonObject) style).entrySet()) {
+          object.add(entry.getKey(), entry.getValue());
+        }
+      }
+    }
+
+    final List<Component> children = src.children();
+    if(!children.isEmpty()) {
+      final JsonArray extra = new JsonArray();
+      for(final Component child : children) {
+        extra.add(context.serialize(child));
+      }
+      object.add(EXTRA, extra);
+    }
+
     if(src instanceof TextComponent) {
       object.addProperty(TEXT, ((TextComponent) src).content());
     } else if(src instanceof TranslatableComponent) {
@@ -215,24 +234,6 @@ public JsonElement serialize(final Component src, final Type typeOfSrc, final Js
       throw notSureHowToSerialize(src);
     }
 
-    final List<Component> children = src.children();
-    if(!children.isEmpty()) {
-      final JsonArray extra = new JsonArray();
-      for(final Component child : children) {
-        extra.add(context.serialize(child));
-      }
-      object.add(EXTRA, extra);
-    }
-
-    if(src.hasStyling()) {
-      final JsonElement style = context.serialize(src.style());
-      if(style.isJsonObject()) {
-        for(final Map.Entry<String, JsonElement> entry : ((JsonObject) style).entrySet()) {
-          object.add(entry.getKey(), entry.getValue());
-        }
-      }
-    }
-
     return object;
   }
 

text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java

@@ -67,7 +67,7 @@ public void testPre116Downsamples() {
     final TextColor original = TextColor.color(0xAB2211);
     final NamedTextColor downsampled = NamedTextColor.nearestTo(original);
     final Component test = Component.text("meow", original);
-    assertEquals("{\"text\":\"meow\",\"color\":\"" + name(downsampled) + "\"}", GsonComponentSerializer.colorDownsamplingGson().serializer().toJson(test));
+    assertEquals("{\"color\":\"" + name(downsampled) + "\",\"text\":\"meow\"}", GsonComponentSerializer.colorDownsamplingGson().serializer().toJson(test));
   }
 
   @Test
@@ -76,7 +76,7 @@ public void testPre116DownsamplesInChildren() {
     final NamedTextColor downsampled = NamedTextColor.nearestTo(original);
     final Component test = Component.text(builder -> builder.content("hey").append(Component.text("there", original)));
 
-    assertEquals("{\"text\":\"hey\",\"extra\":[{\"text\":\"there\",\"color\":\"" + name(downsampled) + "\"}]}", GsonComponentSerializer.colorDownsamplingGson().serializer().toJson(test));
+    assertEquals("{\"extra\":[{\"color\":\"" + name(downsampled) + "\",\"text\":\"there\"}],\"text\":\"hey\"}", GsonComponentSerializer.colorDownsamplingGson().serializer().toJson(test));
   }
 
   private static String name(final NamedTextColor color) {