#68 - Fix for JPMS case where requires java.annotation is missing (so module path issue)

Author: rbygrave

inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java

@@ -115,6 +115,8 @@ private void init() {
       String annType = annotationType.toString();
       if (qualifier != null) {
         this.name = Util.shortName(annType);
+      } else if (annType.indexOf('.') == -1) {
+        context.logWarn("skip when no package on annotation " + annType);
       } else {
         if (IncludeAnnotations.include(annType)) {
           importTypes.add(annType);
@@ -377,7 +379,7 @@ private Set<String> importTypes() {
       importTypes.add(generated);
     }
     importTypes.add(Constants.BUILDER);
-    if (Util.notVoid(type)) {
+    if (Util.validImportType(type)) {
       importTypes.add(type);
     }
     requestParams.addImports(importTypes);
@@ -386,7 +388,7 @@ private Set<String> importTypes() {
 
   void writeImports(Append writer) {
     for (String importType : importTypes()) {
-      if (Util.notVoid(importType)) {
+      if (Util.validImportType(importType)) {
         writer.append("import %s;", importType).eol();
       }
     }

inject-generator/src/main/java/io/avaje/inject/generator/SimpleFactoryWriter.java

@@ -96,7 +96,7 @@ private void writePackage() {
     writer.append(Constants.IMPORT_BUILDERFACTORY).eol();
 
     for (String type : ordering.getImportTypes()) {
-      if (Util.notVoid(type)) {
+      if (Util.validImportType(type)) {
         writer.append("import %s;", type).eol();
       }
     }

inject-generator/src/main/java/io/avaje/inject/generator/Util.java

@@ -13,8 +13,8 @@ static boolean isVoid(String type) {
     return "void".equalsIgnoreCase(type);
   }
 
-  static boolean notVoid(String type) {
-    return !isVoid(type);
+  static boolean validImportType(String type) {
+    return type.indexOf('.') > 0;
   }
 
   static String classOfMethod(String method) {

inject-generator/src/test/java/io/avaje/inject/generator/UtilTest.java

@@ -3,7 +3,9 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class UtilTest {
 
@@ -38,4 +40,16 @@ public void addForInterface() {
     assertEquals("Bar", Util.addForInterface("com.foo.Bar"));
   }
 
+  @Test
+  public void validImportType() {
+    assertTrue(Util.validImportType("my.Foo"));
+    assertTrue(Util.validImportType("other.pack.Foo"));
+  }
+
+  @Test
+  public void validImportType_not() {
+    assertFalse(Util.validImportType("void"));
+    assertFalse(Util.validImportType("Foo"));
+    assertFalse(Util.validImportType("NoPackage"));
+  }
 }