chore(text-serializer-json): fix style errors and rebase issus

api/src/main/java/net/kyori/adventure/util/Services.java

@@ -76,7 +76,7 @@ private Services() {
    * <p>When used in tandem with {@link #serviceWithFallback(Class)}, classes that implement this interface
    * will be ignored in favour of classes that do not implement this interface.</p>
    *
-   * @since 4.13.0
+   * @since 4.14.0
    */
   public interface Fallback {
   }
@@ -89,8 +89,8 @@ public interface Fallback {
    * @param type the service type
    * @param <P> the service type
    * @return a service, or {@link Optional#empty()}
-   * @since 4.13.0
    * @see Fallback
+   * @since 4.14.0
    */
   public static <P> @NotNull Optional<P> serviceWithFallback(final @NotNull Class<P> type) {
     final ServiceLoader<P> loader = Services0.loader(type);

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

@@ -31,7 +31,7 @@
 /**
  * Implementation of the JSON component serializer provider.
  *
- * @since 4.13.0
+ * @since 4.14.0
  */
 @ApiStatus.Internal
 public final class JsonComponentSerializerProviderImpl implements JsonComponentSerializer.Provider, Services.Fallback {

text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JsonComponentConstants.java

@@ -28,7 +28,7 @@
 /**
  * Constants to aid in the creation and testing of JSON component serializers.
  *
- * @since 4.13.0
+ * @since 4.14.0
  */
 @ApiStatus.Internal
 public final class JsonComponentConstants {

text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JsonComponentSerializer.java

@@ -32,14 +32,14 @@
 /**
  * A JSON component serializer.
  *
- * @since 4.13.0
+ * @since 4.14.0
  */
 public interface JsonComponentSerializer extends ComponentSerializer<Component, Component, String> {
   /**
    * Gets a component serializer for JSON serialization and deserialization.
    *
    * @return a JSON component serializer
-   * @since 4.13.0
+   * @since 4.14.0
    */
   static @NotNull JsonComponentSerializer json() {
     return JsonComponentSerializerImpl.Instances.INSTANCE;
@@ -48,7 +48,7 @@ public interface JsonComponentSerializer extends ComponentSerializer<Component,
   /**
    * A {@link JsonComponentSerializer} service provider.
    *
-   * @since 4.13.0
+   * @since 4.14.0
    */
   @ApiStatus.Internal
   @PlatformAPI
@@ -57,7 +57,7 @@ interface Provider {
      * Provides a standard {@link JsonComponentSerializer}.
      *
      * @return a {@link JsonComponentSerializer}
-     * @since 4.13.0
+     * @since 4.14.0
      */
     @ApiStatus.Internal
     @PlatformAPI

text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JsonComponentSerializerImpl.java

@@ -33,12 +33,12 @@ final class JsonComponentSerializerImpl implements JsonComponentSerializer {
   private static final Optional<Provider> SERVICE = Services.serviceWithFallback(Provider.class);
 
   @Override
-  public @NotNull Component deserialize(@NotNull String input) {
+  public @NotNull Component deserialize(final @NotNull String input) {
     throw new UnsupportedOperationException("No JsonComponentSerializer implementation found");
   }
 
   @Override
-  public @NotNull String serialize(@NotNull Component component) {
+  public @NotNull String serialize(final @NotNull Component component) {
     throw new UnsupportedOperationException("No JsonComponentSerializer implementation found");
   }
 

text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * A common abstraction providing an API to serializer components with multiple JSON libraries.
+ */
+package net.kyori.adventure.text.serializer.json;

text-serializer-json/src/testFixtures/java/net/kyori/adventure/text/serializer/json/JsonComponentSerializerTest.java

@@ -61,6 +61,7 @@ void testDeserializeArray() {
       )
     );
   }
+
   // https://github.com/KyoriPowered/adventure/issues/414
   @Test
   @SuppressWarnings("deprecation")

text-serializer-json/src/testFixtures/java/net/kyori/adventure/text/serializer/json/SerializerTest.java

@@ -50,7 +50,7 @@ final Component deserialize(final JsonElement json) {
   }
 
   final void testStyle(final Style style, final Consumer<? super JsonObject> consumer) {
-    testObject(Component.text("", style), object -> {
+    this.testObject(Component.text("", style), object -> {
       object.addProperty(JsonComponentConstants.TEXT, "");
       consumer.accept(object);
     });
@@ -59,15 +59,15 @@ final void testStyle(final Style style, final Consumer<? super JsonObject> consu
   final void testArray(final Component component, final Consumer<? super JsonArray> consumer) {
     final JsonArray json = array(consumer);
 
-    assertEquals(json, serialize(component));
-    assertEquals(component, deserialize(json));
+    assertEquals(json, this.serialize(component));
+    assertEquals(component, this.deserialize(json));
   }
 
   final void testObject(final Component component, final Consumer<? super JsonObject> consumer) {
     final JsonObject json = object(consumer);
 
-    assertEquals(json, serialize(component));
-    assertEquals(component, deserialize(json));
+    assertEquals(json, this.serialize(component));
+    assertEquals(component, this.deserialize(json));
   }
 
   static JsonArray array(final Consumer<? super JsonArray> consumer) {