Merge pull request #45 from SentryMan/main

Add Json Alias annotation

Author: rbygrave

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

@@ -0,0 +1,27 @@
+package io.avaje.jsonb.generator;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+
+final class AliasReader {
+  private AliasReader() {}
+
+  private static final String JSON_ALIAS = "io.avaje.jsonb.Json.JsonAlias";
+
+  /** Read the Json.Alias annotation using annotation mirrors. */
+  static List<String> getAliases(Element element) {
+    for (final AnnotationMirror mirror : element.getAnnotationMirrors()) {
+      if (JSON_ALIAS.equals(mirror.getAnnotationType().toString())) {
+        return mirror.getElementValues().values().stream()
+            .flatMap(v -> ((List<?>) v.getValue()).stream())
+            .map(Object::toString)
+            .map(Util::trimQuotes)
+            .collect(Collectors.toList());
+      }
+    }
+    return null;
+  }
+}

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

@@ -31,6 +31,7 @@ class FieldReader {
   private boolean constructorParam;
   private boolean genericTypeParameter;
   private int genericTypeParamPosition;
+  private final List<String> aliases;
 
   FieldReader(Element element, NamingConvention namingConvention, TypeSubTypeMeta subType, List<String> genericTypeParams) {
     addSubType(subType);
@@ -39,6 +40,7 @@ class FieldReader {
     this.propertyName = PropertyReader.name(namingConvention, fieldName, element);
     this.publicField = element.getModifiers().contains(Modifier.PUBLIC);
     this.rawType = trimAnnotations(element.asType().toString());
+    this.aliases = AliasReader.getAliases(element);
 
     final PropertyIgnoreReader ignoreReader = new PropertyIgnoreReader(element);
     this.unmapped = ignoreReader.unmapped();
@@ -302,6 +304,15 @@ void writeFromJsonSwitch(Append writer, boolean defaultConstructor, String varNa
     if (unmapped) {
       return;
     }
+
+    if (aliases != null) {
+
+      for (final String alias : aliases) {
+        writer.append("        case \"%s\":", alias);
+        writer.eol();
+      }
+    }
+
     writer.append("        case \"%s\": {", propertyName).eol();
     if (!deserialize) {
       writer.append("          reader.skipValue();");

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

@@ -7,6 +7,9 @@
 @Json
 public class TestClass {
 
+  @Json.JsonAlias({"something", "something2"})
+  private String alias;
+
   private String s;
 
   private int i;
@@ -19,6 +22,13 @@ public class TestClass {
 
   private List<String> list;
 
+  public String getAlias() {
+    return alias;
+  }
+
+  public void setAlias(String alias) {
+    this.alias = alias;
+  }
 
   public String getS() {
     return s;

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

@@ -91,6 +91,24 @@
     String value();
   }
 
+  /**
+   * Define one or more alternative names for a property accepted
+   * during deserialization.
+   *
+   * <pre>{@code
+   * @Json.JsonAlias("$code")
+   * String referenceCode;
+   *
+   * }</pre>
+   */
+  @Retention(CLASS)
+  @Target({ElementType.FIELD})
+  @interface JsonAlias {
+
+    /** One or more secondary names to accept as aliases to the official name. */
+    String[] value();
+  }
+
   /**
    * Exclude the property from serialization, deserialization or both.
    * <p>