Merge branch 'feature/101' into javax.main

Author: rbygrave

inject-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>3.3</version>
+    <version>3.4</version>
   </parent>
 
   <artifactId>avaje-inject-generator</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>3.3</version>
+      <version>3.4</version>
     </dependency>
 
     <!-- test dependencies -->

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

@@ -108,6 +108,7 @@ void read(boolean factory) {
       constructor.checkRequest(requestParams);
     }
     for (FieldReader fields : injectFields) {
+      fields.addImports(importTypes);
       fields.checkRequest(requestParams);
     }
     for (MethodReader methods : injectMethods) {

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

@@ -1,13 +1,15 @@
 package io.avaje.inject.generator;
 
 import javax.lang.model.element.Element;
+import java.util.Set;
 
 class FieldReader {
 
   private final Element element;
   private final String name;
   private final UtilType type;
   private final boolean nullable;
+  private final String fieldType;
   private boolean requestParam;
   private String requestParamName;
 
@@ -16,27 +18,28 @@ class FieldReader {
     this.name = Util.getNamed(element);
     this.nullable = Util.isNullable(element);
     this.type = Util.determineType(element.asType());
+    this.fieldType = Util.unwrapProvider(type.rawType());
   }
 
   String getFieldName() {
     return element.getSimpleName().toString();
   }
 
+  void addImports(Set<String> importTypes) {
+    importTypes.add(fieldType);
+  }
+
   String builderGetDependency() {
     StringBuilder sb = new StringBuilder();
     sb.append("b.").append(type.getMethod(nullable));
-    sb.append(getFieldType()).append(".class");
+    sb.append(nm(fieldType)).append(".class");
     if (name != null) {
       sb.append(",\"").append(name).append("\"");
     }
     sb.append(")");
     return sb.toString();
   }
 
-  private String getFieldType() {
-    return Util.unwrapProvider(type.rawType());
-  }
-
   /**
    * Check for request scoped dependency.
    */
@@ -53,7 +56,7 @@ void checkRequest(BeanRequestParams requestParams) {
   void writeRequestDependency(Append writer) {
     if (!requestParam) {
       // just add as field dependency
-      requestParamName = writer.nextName(getFieldName().toLowerCase());//"dep");
+      requestParamName = writer.nextName(getFieldName().toLowerCase());
       final String shortType = nm(type.rawType());
       writer.append("  @Inject").eol();
       writer.append("  %s %s;", shortType, requestParamName).eol().eol();

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

@@ -61,10 +61,11 @@ String getBuildName() {
     if (Util.isVoid(type)) {
       return "void_" + Util.trimMethod(method);
     } else {
+      String trimType = Util.trimMethod(type);
       if (name != null) {
-        return shortType + "_" + name;
+        return trimType + "_" + name;
       } else {
-        return shortType;
+        return trimType;
       }
     }
   }

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

@@ -16,22 +16,27 @@ class TypeAppender {
     this.importTypes = importTypes;
   }
 
-  boolean isEmpty() {
-    return count == 0;
+  void add(String type) {
+    addType(type);
   }
 
   void add(List<String> types) {
     for (String type : types) {
       if (!GenericType.isGeneric(type)) {
-        importTypes.add(type);
-        if (count++ > 0) {
+        if (count > 0) {
           sb.append(", ");
         }
-        sb.append(Util.shortName(type)).append(".class");
+        addType(type);
       }
     }
   }
 
+  private void addType(String type) {
+    count++;
+    importTypes.add(type);
+    sb.append(Util.shortName(type)).append(".class");
+  }
+
   String asString() {
     return sb.toString();
   }

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

@@ -17,12 +17,17 @@ class TypeExtendsReader {
    * The implied qualifier name based on naming convention.
    */
   private String qualifierName;
+  private String baseTypeRaw;
 
   TypeExtendsReader(TypeElement baseType, ProcessingContext context) {
     this.baseType = baseType;
     this.context = context;
   }
 
+  String getBaseType() {
+    return baseTypeRaw;
+  }
+
   List<String> getExtendsTypes() {
     return extendsTypes;
   }
@@ -34,6 +39,7 @@ String getQualifierName() {
   void process() {
     String base = Util.unwrapProvider(baseType.getQualifiedName().toString());
     if (!GenericType.isGeneric(base)) {
+      baseTypeRaw = base;
       extendsTypes.add(base);
     }
     TypeElement superElement = superOf(baseType);

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

@@ -70,10 +70,16 @@ String getName() {
 
   private void initRegistrationTypes() {
     TypeAppender appender = new TypeAppender(importTypes);
-    appender.add(interfaceReader.getInterfaceTypes());
-    if (appender.isEmpty()) {
+    List<String> interfaceTypes = interfaceReader.getInterfaceTypes();
+    if (interfaceTypes.isEmpty()) {
       // only register extends type if no interfaces implemented
       appender.add(extendsReader.getExtendsTypes());
+    } else {
+      String baseType = extendsReader.getBaseType();
+      if (!interfaceTypes.contains(baseType)) {
+        appender.add(baseType);
+      }
+      appender.add(interfaceTypes);
     }
     if (forBean) {
       appender.add(annotationReader.getAnnotationTypes());

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

@@ -125,13 +125,13 @@ static String commonParent(String currentTop, String aPackage) {
   public static String getNamed(Element p) {
     Named named = p.getAnnotation(Named.class);
     if (named != null) {
-      return named.value();
+      return named.value().toLowerCase();
     }
     for (AnnotationMirror annotationMirror : p.getAnnotationMirrors()) {
       DeclaredType annotationType = annotationMirror.getAnnotationType();
       Qualifier qualifier = annotationType.asElement().getAnnotation(Qualifier.class);
       if (qualifier != null) {
-        return Util.shortName(annotationType.toString());
+        return Util.shortName(annotationType.toString()).toLowerCase();
       }
     }
     return null;

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

@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -52,4 +53,9 @@ public void validImportType_not() {
     assertFalse(Util.validImportType("Foo"));
     assertFalse(Util.validImportType("NoPackage"));
   }
+
+  @Test
+  void shortMethod() {
+    assertThat(Util.shortMethod("foo.bar.processMe")).isEqualTo("bar.processMe");
+  }
 }

inject-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>3.3</version>
+    <version>3.4</version>
   </parent>
 
   <artifactId>avaje-inject-test</artifactId>

inject-test/src/test/java/org/example/coffee/BeanContext_Builder_mockitoSpyTest.java

@@ -140,8 +140,7 @@ public void withMockitoSpy_whenOnlySecondary_expect_spyUsed() {
 
       // these are the same (secondary only)
       WidgetSecondary widgetSecondary = context.getBean(WidgetSecondary.class);
-      //assertThat(widget).isSameAs(widgetSecondary);
-      assertThat(widgetSecondary).isNull();
+      assertThat(widget).isSameAs(widgetSecondary);
     }
   }
 
@@ -161,11 +160,9 @@ public void withMockitoSpy_whenSecondary_expect_spyUsed() {
       assertThat(result).isEqualTo("SomeImpl");
 
       SomeImpl someImpl = context.getBean(SomeImpl.class);
-      SomeImplBean someImplBean = context.getBean(SomeImplBean.class);
       assertThat(someImpl).isNull();
-      assertThat(someImplBean).isNull();
-      //assertThat(something).isSameAs(someImpl);
-      //assertThat(someImpl).isNotSameAs(someImplBean);
+      SomeImplBean someImplBean = context.getBean(SomeImplBean.class);
+      assertThat(something).isNotSameAs(someImplBean);
     }
   }
 

inject-test/src/test/java/org/example/coffee/factory/DFact.java

@@ -0,0 +1,4 @@
+package org.example.coffee.factory;
+
+public class DFact implements IDFact {
+}

inject-test/src/test/java/org/example/coffee/factory/IDFact.java

@@ -0,0 +1,4 @@
+package org.example.coffee.factory;
+
+public interface IDFact {
+}

inject-test/src/test/java/org/example/coffee/factory/MyFactory.java

@@ -12,6 +12,11 @@ public class MyFactory {
 
   String methods = "";
 
+  @Bean
+  DFact buildDFact() {
+    return new DFact();
+  }
+
   @Bean
   CFact buildCFact() {
     return new CFact();

inject-test/src/test/java/org/example/coffee/factory/MyFactoryTest.java

@@ -25,4 +25,13 @@ public void factoryMethod_createsConcreteImplementation() {
     DesEngi buildDesi2 = SystemContext.getBean(DesEngi.class, "BuildDesi2");
     assertThat(buildDesi2.ignite()).isEqualTo("MyEngi");
   }
+
+  @Test
+  public void factoryMethod_objectInterface() {
+    DFact dfact = SystemContext.getBean(DFact.class);
+    assertThat(dfact).isNotNull();
+
+    IDFact idfact = SystemContext.getBean(IDFact.class);
+    assertThat(idfact).isSameAs(dfact);
+  }
 }

inject/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-inject-parent</artifactId>
-    <version>3.3</version>
+    <version>3.4</version>
   </parent>
 
   <artifactId>avaje-inject</artifactId>

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-inject-parent</artifactId>
-  <version>3.3</version>
+  <version>3.4</version>
   <packaging>pom</packaging>
   <name>avaje inject parent</name>
   <description>parent pom for avaje inject library</description>