#29 - Fix Annotated Fields - extract FieldReader.trimAnnotations() and add unit and component tests

Author: rbygrave

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

@@ -33,17 +33,8 @@ class FieldReader {
     addSubType(subType);
     this.fieldName = element.getSimpleName().toString();
     this.propertyName = PropertyReader.name(namingConvention, fieldName, element);
-
     this.publicField = element.getModifiers().contains(Modifier.PUBLIC);
-
-    final String type = element.asType().toString();
-    if (type.contains("@")) {
-      final String[] split = type.split(" ");
-
-      this.rawType = type.substring(0, type.indexOf("@")) + split[split.length - 1];
-    } else {
-      this.rawType = type;
-    }
+    this.rawType = trimAnnotations(element.asType().toString());
 
     final PropertyIgnoreReader ignoreReader = new PropertyIgnoreReader(element);
     this.unmapped = ignoreReader.unmapped();
@@ -73,6 +64,14 @@ class FieldReader {
     }
   }
 
+  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;
   }
@@ -160,7 +159,7 @@ void writeDebug(Append writer) {
     }
     if (!deserialize) {
       writer.append(" ignoreDeserialize");
-    }else if (constructorParam) {
+    } else if (constructorParam) {
       writer.append(" constructor");
     } else if (setter != null) {
       writer.append(" setter:%s ", setter);

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"));
+  }
+}