Merge pull request #160 from frascu/fix/parsing-fields-with-annotations

Fix build error by parsing fields having annotations
speedment · Jul 26, 2021 · d5f3e74 · d5f3e74
2 parents 22420a7 + d622e09
commit d5f3e74
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/...rc/main/java/com/speedment/jpastreamer/fieldgenerator/internal/typeparser/TypeParser.java b/...rc/main/java/com/speedment/jpastreamer/fieldgenerator/internal/typeparser/TypeParser.java
@@ -49,6 +49,10 @@ private Type render(Node node) {
     }
 
     private Node parseNode(String s) {
+        // Remove annotations in the type
+        if (s.startsWith("@")) {
+            s = s.substring(s.indexOf(' ') + 1);
+        }
         // Base case returns leaf without children
         if (!(s.contains("<") || s.contains(","))) {
             return new Node(SimpleType.create(s));

diff --git a/...est/java/com/speedment/jpastreamer/fieldgenerator/internal/typeparser/TypeParserTest.java b/...est/java/com/speedment/jpastreamer/fieldgenerator/internal/typeparser/TypeParserTest.java
@@ -105,4 +105,38 @@ void renderMapOfMapOfListOfSetOfDoubleAndIntegerAndLong() {
         assertEquals(expected, actual);
     }
 
+    @Test
+    void renderStringWithAnnotations() {
+        String type = "@javax.validation.constraints.Email,@javax.validation.constraints.Size(max=255) java.lang.String";
+        SimpleType expected = SimpleType.create("java.lang.String");
+        Type actual = typeParser.render(type);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void renderStringWithAnnotation() {
+        String type = "@javax.validation.constraints.Size(max=255) java.lang.String";
+        SimpleType expected = SimpleType.create("java.lang.String");
+        Type actual = typeParser.render(type);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void renderMapOfStringWithAnnotations() {
+        String type = "@javax.validation.constraints.Email,@javax.validation.constraints.Size(max=255) java.util.Map<java.lang.String>";
+        SimpleParameterizedType expected = SimpleParameterizedType.create(
+                SimpleType.create("java.util.Map"), SimpleType.create("java.lang.String"));
+        Type actual = typeParser.render(type);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void renderMapOfStringWithAnnotation() {
+        String type = "@javax.validation.constraints.Size(max=255) java.util.Map<java.lang.String>";
+        SimpleParameterizedType expected = SimpleParameterizedType.create(
+                SimpleType.create("java.util.Map"), SimpleType.create("java.lang.String"));
+        Type actual = typeParser.render(type);
+        assertEquals(expected, actual);
+    }
+
 }