Merge pull request #30 from avaje/SentryMan-handle-annotated-types

Fix for annotated fields - e.g. @SiZe @NotNull etc

Author: rbygrave

.gitignore

@@ -3,3 +3,6 @@ build/
 .idea/
 *.iml
 .gradle
+*.prefs
+jsonb-generator/.classpath
+jsonb-generator/.project

blackbox-test/pom.xml

@@ -20,6 +20,13 @@
 
   <dependencies>
 
+    <!-- for testing fields with third party annotations -->
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>2.0.1.Final</version>
+    </dependency>
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>

blackbox-test/src/main/java/org/example/customer/WithAnnotations.java

@@ -0,0 +1,29 @@
+package org.example.customer;
+
+import io.avaje.jsonb.Json;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+@Json
+public class WithAnnotations {
+
+  @Size(max = 50)
+  final String one;
+
+  @NotNull @Size(min = 5, max = 10)
+  final String two;
+
+  public WithAnnotations(String one, String two) {
+    this.one = one;
+    this.two = two;
+  }
+
+  public String one() {
+    return one;
+  }
+
+  public String two() {
+    return two;
+  }
+}

blackbox-test/src/test/java/org/example/customer/WithAnnotationsTest.java

@@ -0,0 +1,24 @@
+package org.example.customer;
+
+import io.avaje.jsonb.Jsonb;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class WithAnnotationsTest {
+
+  Jsonb jsonb = Jsonb.builder().build();
+
+  @Test
+  void toJsonFromJson() {
+    var bean = new WithAnnotations("foo","bar");
+    String asJson = jsonb.toJson(bean);
+    assertThat(asJson).isEqualTo("{\"one\":\"foo\",\"two\":\"bar\"}");
+
+    WithAnnotations fromJson = jsonb.type(WithAnnotations.class).fromJson(asJson);
+
+    assertThat(fromJson.one()).isEqualTo("foo");
+    assertThat(fromJson.two()).isEqualTo("bar");
+  }
+
+}

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

@@ -1,15 +1,15 @@
 package io.avaje.jsonb.generator;
 
-import javax.lang.model.element.Element;
-import javax.lang.model.element.Modifier;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+
 class FieldReader {
 
   private final Map<String, TypeSubTypeMeta> subTypes = new LinkedHashMap<>();
-  private final Element element;
   private final boolean publicField;
   private final String rawType;
   private final GenericType genericType;
@@ -30,14 +30,13 @@ class FieldReader {
   private boolean constructorParam;
 
   FieldReader(Element element, NamingConvention namingConvention, TypeSubTypeMeta subType) {
-    this.element = element;
     addSubType(subType);
     this.fieldName = element.getSimpleName().toString();
     this.propertyName = PropertyReader.name(namingConvention, fieldName, element);
-    this.rawType = element.asType().toString();
     this.publicField = element.getModifiers().contains(Modifier.PUBLIC);
+    this.rawType = trimAnnotations(element.asType().toString());
 
-    PropertyIgnoreReader ignoreReader = new PropertyIgnoreReader(element);
+    final PropertyIgnoreReader ignoreReader = new PropertyIgnoreReader(element);
     this.unmapped = ignoreReader.unmapped();
     this.raw = ignoreReader.raw();
     this.serialize = ignoreReader.serialize();
@@ -56,15 +55,23 @@ class FieldReader {
       primitive = false;
     } else {
       genericType = GenericType.parse(rawType);
-      String shortType = genericType.shortType();
+      final String shortType = genericType.shortType();
       primitive = PrimitiveUtil.isPrimitive(shortType);
       defaultValue = !primitive ? "null" : PrimitiveUtil.defaultValue(shortType);
-      String typeWrapped = PrimitiveUtil.wrap(shortType);
+      final String typeWrapped = PrimitiveUtil.wrap(shortType);
       adapterShortType = "JsonAdapter<" + typeWrapped + ">";
       adapterFieldName = (primitive ? "p" : "") + Util.initLower(genericType.shortName()) + "JsonAdapter";
     }
   }
 
+  static String trimAnnotations(String type) {
+    int pos = type.indexOf("@");
+    if (pos == -1) {
+      return type;
+    }
+    return type.substring(0, pos) + type.substring(type.lastIndexOf(' ') + 1);
+  }
+
   void position(int pos) {
     position = pos;
   }
@@ -118,10 +125,10 @@ void addImports(Set<String> importTypes) {
 
   void cascadeTypes(Set<String> types) {
     if (!raw && !unmapped) {
-      String topType = genericType.topType();
-      if (topType.equals("java.util.List") || topType.equals("java.util.Set")) {
+      final String topType = genericType.topType();
+      if ("java.util.List".equals(topType) || "java.util.Set".equals(topType)) {
         types.add(genericType.firstParamType());
-      } else if (topType.equals("java.util.Map")) {
+      } else if ("java.util.Map".equals(topType)) {
         types.add(genericType.secondParamType());
       } else {
         types.add(topType);
@@ -152,16 +159,14 @@ void writeDebug(Append writer) {
     }
     if (!deserialize) {
       writer.append(" ignoreDeserialize");
+    } else if (constructorParam) {
+      writer.append(" constructor");
+    } else if (setter != null) {
+      writer.append(" setter:%s ", setter);
+    } else if (publicField) {
+      writer.append(" publicField");
     } else {
-      if (constructorParam) {
-        writer.append(" constructor");
-      } else if (setter != null) {
-        writer.append(" setter:%s ", setter);
-      } else if (publicField) {
-        writer.append(" publicField");
-      } else {
-        writer.append(" ERROR?? no constructor, setter and not a public field?");
-      }
+      writer.append(" ERROR?? no constructor, setter and not a public field?");
     }
     if (!subTypes.isEmpty()) {
       writer.append(" subTypes %s", subTypes.keySet());
@@ -181,7 +186,7 @@ void writeConstructor(Append writer) {
     if (raw) {
       writer.append("    this.%s = jsonb.rawAdapter();", adapterFieldName).eol();
     } else {
-      String asType = genericType.asTypeDeclaration();
+      final String asType = genericType.asTypeDeclaration();
       writer.append("    this.%s = jsonb.adapter(%s);", adapterFieldName, asType).eol();
     }
   }
@@ -227,11 +232,11 @@ void writeFromJsonVariables(Append writer) {
   }
 
   private String pad(String value) {
-    int pad = 10 - value.length();
+    final int pad = 10 - value.length();
     if (pad < 1) {
       return value;
     }
-    StringBuilder sb = new StringBuilder(10).append(value);
+    final StringBuilder sb = new StringBuilder(10).append(value);
     for (int i = 0; i < pad; i++) {
       sb.append(" ");
     }
@@ -285,7 +290,7 @@ void writeViewBuilder(Append writer, String shortName) {
     if (getter == null) {
       writer.append("    builder.add(\"%s\", %s, builder.field(%s.class, \"%s\"));", fieldName, adapterFieldName, shortName, fieldName).eol();
     } else {
-      String topType = genericType.topType();
+      final String topType = genericType.topType();
       writer.append("    builder.add(\"%s\", %s, builder.method(%s.class, \"%s\", %s.class));", fieldName, adapterFieldName, shortName, getter.getName(), topType).eol();
     }
   }

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

@@ -0,0 +1,16 @@
+package io.avaje.jsonb.generator;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class FieldReaderTest {
+
+  @Test
+  void trimAnnotations() {
+    assertEquals("java.lang.String", FieldReader.trimAnnotations("java.lang.String"));
+    assertEquals("java.lang.String", FieldReader.trimAnnotations("java.lang.@javax.validation.constraints.Email String"));
+    assertEquals("java.lang.String", FieldReader.trimAnnotations("java.lang.@javax.validation.constraints.NotNull,@javax.validation.constraints.Size(min=2, max=150) String"));
+    assertEquals("java.lang.String", FieldReader.trimAnnotations("java.lang.@javax.validation.constraints.Email,@javax.validation.constraints.Size(max=100) String"));
+  }
+}