Merge pull request #35 from SentryMan/main

Unhandled Container Type Exception/Annotation Processor Tests

Author: rbygrave

.gitignore

@@ -4,5 +4,6 @@ build/
 *.iml
 .gradle
 *.prefs
-jsonb-generator/.classpath
-jsonb-generator/.project
+*.classpath
+*.project
+*.class

jsonb-generator/pom.xml

@@ -26,7 +26,6 @@
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
 

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

@@ -178,8 +178,12 @@ private String asTypeContainer() {
         return "Types.setOf(" + Util.shortName(param.topType()) + ".class)";
       case "java.util.stream.Stream":
         return "Types.streamOf(" + Util.shortName(param.topType()) + ".class)";
+      default:
+        throw new IllegalArgumentException(
+            "Unsupported Container Type "
+                + containerType
+                + ", only java.util List/Set/Stream allowed");
     }
-    return "FIXME: Unhandled Container Type " + containerType;
   }
 
   String firstParamType() {

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

@@ -0,0 +1,126 @@
+package io.avaje.jsonb.generator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Set;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+class ProcessorTest {
+
+  @AfterEach
+  void deleteGeneratedFiles() throws IOException {
+    try {
+      Paths.get("io.avaje.jsonb.Jsonb$GeneratedComponent").toAbsolutePath().toFile().delete();
+      Files.walk(Paths.get("io").toAbsolutePath())
+          .sorted(Comparator.reverseOrder())
+          .map(Path::toFile)
+          .forEach(File::delete);
+    } catch (final Exception e) {
+    }
+  }
+
+  @Test
+  void testGeneration() throws Exception {
+    final String source =
+        Paths.get("src/test/java/io/avaje/jsonb/generator/models/valid")
+            .toAbsolutePath()
+            .toString();
+
+    final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+    final StandardJavaFileManager manager = compiler.getStandardFileManager(null, null, null);
+
+    manager.setLocation(StandardLocation.SOURCE_PATH, Arrays.asList(new File(source)));
+
+    final Set<Kind> fileKinds = Collections.singleton(Kind.SOURCE);
+
+    final Iterable<JavaFileObject> files =
+        manager.list(StandardLocation.SOURCE_PATH, "", fileKinds, true);
+
+    final CompilationTask task =
+        compiler.getTask(
+            new PrintWriter(System.out), null, null, Arrays.asList("--release=8"), null, files);
+    task.setProcessors(Arrays.asList(new Processor()));
+
+    assertThat(task.call()).isTrue();
+  }
+
+  @Test
+  void testImportFail() throws Exception {
+
+    final Iterable<JavaFileObject> files = getInvalidSourceFile("InvalidImport");
+
+    final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+
+    final CompilationTask task =
+        compiler.getTask(
+            new PrintWriter(System.out), null, null, Arrays.asList("--release=8"), null, files);
+    task.setProcessors(Arrays.asList(new Processor()));
+
+    assertThat(task.call()).isFalse();
+    Files.walk(Paths.get("java").toAbsolutePath())
+        .sorted(Comparator.reverseOrder())
+        .map(Path::toFile)
+        .forEach(File::delete);
+  }
+
+  @Test
+  void testInvalidCollection() throws Exception {
+
+    final Iterable<JavaFileObject> files = getInvalidSourceFile("InvalidCollection");
+
+    final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+
+    final CompilationTask task =
+        compiler.getTask(
+            new PrintWriter(System.out), null, null, Arrays.asList("--release=8"), null, files);
+    task.setProcessors(Arrays.asList(new Processor()));
+
+    assertThatExceptionOfType(RuntimeException.class)
+        .isThrownBy(task::call)
+        .havingCause()
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  private Iterable<JavaFileObject> getInvalidSourceFile(String name) throws Exception {
+    final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+    final StandardJavaFileManager files = compiler.getStandardFileManager(null, null, null);
+
+    files.setLocation(
+        StandardLocation.SOURCE_PATH,
+        Arrays.asList(
+            new File(
+                Paths.get("src/test/java/io/avaje/jsonb/generator/models/invalid")
+                    .toAbsolutePath()
+                    .toString())));
+
+    final Set<Kind> fileKinds = Collections.singleton(Kind.SOURCE);
+    final Iterable<JavaFileObject> jfos =
+        files.list(StandardLocation.SOURCE_PATH, "", fileKinds, true);
+
+    for (final JavaFileObject jfo : jfos) {
+      if (jfo.getName().contains(name)) return Collections.singleton(jfo);
+    }
+
+    return null;
+  }
+}

jsonb-generator/src/test/java/io/avaje/jsonb/generator/models/invalid/InvalidCollection.java

@@ -0,0 +1,18 @@
+package io.avaje.jsonb.generator.models.invalid;
+
+import java.util.ArrayList;
+
+import io.avaje.jsonb.Json;
+
+@Json
+public class InvalidCollection {
+  private ArrayList<String> list;
+
+  public ArrayList<String> getList() {
+    return list;
+  }
+
+  public void setList(ArrayList<String> list) {
+    this.list = list;
+  }
+}

jsonb-generator/src/test/java/io/avaje/jsonb/generator/models/invalid/InvalidImport.java

@@ -0,0 +1,10 @@
+package io.avaje.jsonb.generator.models.invalid;
+
+import java.util.AbstractMap.SimpleImmutableEntry;
+
+import io.avaje.jsonb.Json;
+
+@Json
+@Json.Import(SimpleImmutableEntry.class)
+public class InvalidImport {
+}

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

@@ -0,0 +1,70 @@
+package io.avaje.jsonb.generator.models.valid;
+
+import java.util.List;
+
+import io.avaje.jsonb.Json;
+
+@Json
+public class TestClass {
+
+  private String s;
+
+  private int i;
+
+  private Integer integer;
+
+  private char ch;
+
+  private Character chara;
+
+  private List<String> list;
+
+
+  public String getS() {
+    return s;
+  }
+
+  public void setS(String s) {
+    this.s = s;
+  }
+
+  public int getI() {
+    return i;
+  }
+
+  public void setI(int i) {
+    this.i = i;
+  }
+
+  public Integer getInteger() {
+    return integer;
+  }
+
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+  public char getCh() {
+    return ch;
+  }
+
+  public void setCh(char ch) {
+    this.ch = ch;
+  }
+
+  public Character getChara() {
+    return chara;
+  }
+
+  public void setChara(Character chara) {
+    this.chara = chara;
+  }
+
+  public List<String> getList() {
+    return list;
+  }
+
+  public void setList(List<String> list) {
+    this.list = list;
+  }
+}