Rename @Json.JsonAlias -> @Json.Alias with deprecation

To be more consistent with the other json annotations

Author: rob-bygrave

blackbox-test/src/main/java/org/example/customer/alias/WithAlias.java

@@ -3,6 +3,6 @@
 import io.avaje.jsonb.Json;
 
 @Json
-public record WithAlias(int id, @Json.JsonAlias({"something", "something2"}) String alias, String message) {
+public record WithAlias(int id, @Json.Alias({"something", "something2"}) String alias, String message) {
 
 }

jsonb-generator/src/main/java/io/avaje/jsonb/generator/FieldReader.java

@@ -2,11 +2,7 @@
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.Modifier;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.*;
 
 final class FieldReader {
 
@@ -41,13 +37,15 @@ final class FieldReader {
         .map(Util::escapeQuotes)
         .orElse(namingConvention.from(fieldName));
 
-    this.aliases =
-      JsonAliasPrism.getOptionalOn(element)
-        .map(JsonAliasPrism::value)
-        .stream()
-        .flatMap(List::stream)
-        .map(Util::escapeQuotes)
-        .collect(Collectors.toList());
+    this.aliases = initAliases(element);
+  }
+
+  private static List<String> initAliases(Element element) {
+    return AliasPrism.getOptionalOn(element)
+      .map(a -> Util.escapeQuotes(a.value()))
+      .orElse(JsonAliasPrism.getOptionalOn(element)
+        .map(a -> Util.escapeQuotes(a.value()))
+        .orElse(Collections.emptyList()));
   }
 
   void position(int pos) {

jsonb-generator/src/main/java/io/avaje/jsonb/generator/Util.java

@@ -2,6 +2,8 @@
 
 import static io.avaje.jsonb.generator.ProcessingContext.element;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -103,6 +105,14 @@ static String initCap(String input) {
     }
   }
 
+  static List<String> escapeQuotes(List<String> all) {
+    List<String> escaped = new ArrayList<>(all.size());
+    for (String raw : all) {
+      escaped.add(Util.escapeQuotes(raw));
+    }
+    return escaped;
+  }
+
   static String escapeQuotes(String input) {
     return input.replaceAll("^\"|\"$", "\\\\\"");
   }

jsonb-generator/src/main/java/io/avaje/jsonb/generator/package-info.java

@@ -2,6 +2,7 @@
 @GeneratePrism(io.avaje.jsonb.Json.class)
 @GeneratePrism(io.avaje.jsonb.Json.Import.class)
 @GeneratePrism(value = io.avaje.jsonb.Json.Import.List.class, name = "ImportListPrism")
+@GeneratePrism(io.avaje.jsonb.Json.Alias.class)
 @GeneratePrism(io.avaje.jsonb.Json.JsonAlias.class)
 @GeneratePrism(io.avaje.jsonb.Json.Ignore.class)
 @GeneratePrism(io.avaje.jsonb.Json.Property.class)

jsonb-generator/src/test/java/io/avaje/jsonb/generator/UtilTest.java

@@ -1,9 +1,12 @@
 package io.avaje.jsonb.generator;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 class UtilTest {
 
   @Test
@@ -21,4 +24,23 @@ void initLower() {
     assertEquals("url", Util.initLower("URL"));
     assertEquals("initCap", Util.initLower("InitCap"));
   }
+
+  @Test
+  void escapeQuotes() {
+    assertEquals("\\\"Hi\\\"", Util.escapeQuotes("\"Hi\""));
+    assertEquals("\\\"\\\"", Util.escapeQuotes("\"\""));
+
+    assertEquals("\\\"Hi", Util.escapeQuotes("\"Hi"));
+    assertEquals("Hi\\\"", Util.escapeQuotes("Hi\""));
+  }
+
+  @Test
+  void escapeQuotesList() {
+    assertThat(Util.escapeQuotes(List.of("a", "b"))).containsOnly("a", "b");
+    assertThat(Util.escapeQuotes(List.of("\"a\""))).containsOnly("\\\"a\\\"");
+    assertThat(Util.escapeQuotes(List.of("\"a\"", "\"b\""))).containsOnly("\\\"a\\\"", "\\\"b\\\"");
+
+    assertThat(Util.escapeQuotes(List.of("\"a\"", "b"))).containsOnly("\\\"a\\\"", "b");
+    assertThat(Util.escapeQuotes(List.of("a", "\"b\""))).containsOnly("a", "\\\"b\\\"");
+  }
 }

jsonb-generator/src/test/java/io/avaje/jsonb/generator/models/valid/TestClass.java

@@ -8,7 +8,7 @@
 @Json
 public class TestClass {
 
-  @Json.JsonAlias({"something", "something2"})
+  @Json.Alias({"something", "something2"})
   private String alias;
 
   private String s;

jsonb/src/main/java/io/avaje/jsonb/Json.java

@@ -119,13 +119,25 @@
    * during deserialization.
    *
    * <pre>{@code
-   * @Json.JsonAlias("$code")
+   * @Json.Alias("$code")
    * String referenceCode;
    *
    * }</pre>
    */
   @Retention(CLASS)
   @Target({ElementType.FIELD})
+  @interface Alias {
+
+    /** One or more secondary names to accept as aliases to the official name. */
+    String[] value();
+  }
+
+  /**
+   * Deprecate - migrate to {@link Json.Alias}.
+   */
+  @Deprecated
+  @Retention(CLASS)
+  @Target({ElementType.FIELD})
   @interface JsonAlias {
 
     /** One or more secondary names to accept as aliases to the official name. */