Add BeanTypes registerTypes, for separate set of types that are excluded from isBeanAbsent()

These register types are not included in the isBeanAbsent() check

Author: rbygrave

blackbox-test-inject/src/main/java/org/example/myapp/beantypes/LimitedFactory.java

@@ -7,14 +7,15 @@
 import org.jspecify.annotations.Nullable;
 
 import java.io.Serializable;
+import java.util.GregorianCalendar;
 import java.util.Optional;
 
 @Factory
 public class LimitedFactory {
 
   @Bean
   @Named("factory")
-  @BeanTypes(LimitedInterface.class)
+  @BeanTypes(value = LimitedInterface.class, registerTypes = GregorianCalendar.class)
   BeanTypeComponent bean() {
     return new BeanTypeComponent();
   }

blackbox-test-inject/src/main/java/org/example/myapp/lazy/generic/LazyGenericImpl.java

@@ -1,5 +1,6 @@
 package org.example.myapp.lazy.generic;
 
+import java.util.Calendar;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import io.avaje.inject.BeanScope;
@@ -13,7 +14,7 @@
 @Lazy
 @Singleton
 @Named("single")
-@BeanTypes(LazyGenericInterface.class)
+@BeanTypes(value = LazyGenericInterface.class, registerTypes = Calendar.class)
 public class LazyGenericImpl implements LazyGenericInterface<String> {
 
   AtomicBoolean initialized;

blackbox-test-inject/src/test/java/org/example/myapp/beantypes/BeanTypeComponentTest.java

@@ -3,10 +3,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import org.example.myapp.lazy.generic.LazyGenericImpl;
 import org.junit.jupiter.api.Test;
 
 import io.avaje.inject.BeanScope;
 
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
 class BeanTypesTest {
 
   @Test
@@ -17,6 +21,14 @@ void testBeanTypesRestrictingInjection() {
       assertThat(scope.get(AbstractSuperClass.class)).isNotNull();
       assertThat(scope.get(LimitedInterface.class)).isNotNull();
       assertThat(scope.get(CharSequence.class)).isEqualTo("IAmNullable");
+
+      Object extraTypeGregorianCalendar = scope.get(Calendar.class);
+      assertThat(extraTypeGregorianCalendar).isNotNull();
+      assertThat(extraTypeGregorianCalendar).isInstanceOf(LazyGenericImpl.class);
+
+      Object extraTypeCalendar = scope.get(GregorianCalendar.class);
+      assertThat(extraTypeCalendar).isNotNull();
+      assertThat(extraTypeCalendar).isInstanceOf(BeanTypeComponent.class);
     }
   }
 }

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

@@ -39,7 +39,7 @@ final class AssistBeanReader {
     this.beanType = beanType;
     this.type = beanType.getQualifiedName().toString();
     this.typeReader =
-      new TypeReader(List.of(), UType.parse(beanType.asType()), beanType, importTypes, false);
+      new TypeReader(List.of(), List.of(), UType.parse(beanType.asType()), beanType, importTypes, false);
 
     typeReader.process();
     qualifierName = typeReader.name();

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

@@ -71,14 +71,22 @@ final class BeanReader {
     this.primary = PrimaryPrism.isPresent(actualType);
     this.secondary = !primary && SecondaryPrism.isPresent(actualType);
     this.priority = Util.priority(actualType);
+
     var beanTypes =
       BeanTypesPrism.getOptionalOn(actualType)
         .map(BeanTypesPrism::value)
         .or(() -> proxy ? Optional.of(List.of(actualType.asType())) : Optional.empty());
     beanTypes.ifPresent(t -> Util.validateBeanTypes(actualType, t));
+
+    var extraTypes =
+      BeanTypesPrism.getOptionalOn(actualType)
+        .map(BeanTypesPrism::registerTypes)
+        .orElse(List.of());
+
     this.typeReader =
       new TypeReader(
         beanTypes.orElse(List.of()),
+        extraTypes,
         UType.parse(beanType.asType()),
         beanType,
         importTypes,
@@ -149,7 +157,12 @@ private boolean shouldDelay() {
       .stream()
       .flatMap(List::stream);
 
-    return Stream.of(constructors, fields, methods, interfaces, superClass, beanTypes)
+    var beanRegisterTypes = BeanTypesPrism.getOptionalOn(beanType)
+      .map(BeanTypesPrism::registerTypes)
+      .stream()
+      .flatMap(List::stream);
+
+    return Stream.of(constructors, fields, methods, interfaces, superClass, beanTypes, beanRegisterTypes)
       .flatMap(s -> s)
       .map(TypeMirror::getKind)
       .anyMatch(TypeKind.ERROR::equals);
@@ -356,6 +369,10 @@ void buildBeanAbsent(Append writer) {
     }
     writer.append(typeReader.typesRegister());
     writer.append(")) {").eol();
+    String extraTypesRegister = typeReader.extraTypesRegister();
+    if (extraTypesRegister != null) {
+      writer.append("      builder.registerTypes(%s);", extraTypesRegister).eol();
+    }
   }
 
   void buildRegister(Append writer) {

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

@@ -141,9 +141,14 @@ final class MethodReader {
     } else {
       var beanTypes = BeanTypesPrism.getOptionalOn(element).map(BeanTypesPrism::value);
       beanTypes.ifPresent(t -> Util.validateBeanTypes(element, t));
+
+      var extraTypes = BeanTypesPrism.getOptionalOn(element)
+        .map(BeanTypesPrism::registerTypes)
+        .orElse(List.of());
+
       this.typeReader =
           new TypeReader(
-              beanTypes.orElse(List.of()), genericType, returnElement, importTypes, element);
+              beanTypes.orElse(List.of()), extraTypes, genericType, returnElement, importTypes, element);
       typeReader.process();
       MethodLifecycleReader lifecycleReader = new MethodLifecycleReader(returnElement, initMethod, destroyMethod);
       this.initMethod = lifecycleReader.initMethod();
@@ -475,6 +480,12 @@ void buildAddFor(Append writer) {
       }
     }
     writer.append(")) {").eol();
+    if (typeReader != null) {
+      String extraTypesRegister = typeReader.extraTypesRegister();
+      if (extraTypesRegister != null) {
+        writer.append("      builder.registerTypes(%s);", extraTypesRegister).eol();
+      }
+    }
   }
 
   boolean methodThrows() {

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

@@ -46,8 +46,9 @@ private static Stream<UType> allComponentTypes(UType u) {
         Stream.of(u), componentTypes.stream().flatMap(TypeAppender::allComponentTypes));
   }
 
-  void add(List<UType> sourceTypes) {
+  TypeAppender add(List<UType> sourceTypes) {
     sourceTypes.forEach(this::add);
+    return this;
   }
 
   void addSimpleType(String classType) {

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

@@ -21,35 +21,41 @@ final class TypeReader {
   private final TypeAnnotationReader annotationReader;
   private Set<UType> genericTypes;
   private String typesRegister;
+  private String extraTypesRegister;
   private final List<UType> injectsTypes;
+  private final List<UType> extraTypes;
 
   TypeReader(
       List<TypeMirror> injectsTypes,
+      List<TypeMirror> extraTypes,
       UType genericType,
       TypeElement beanType,
       ImportTypeMap importTypes,
       boolean factory) {
-    this(injectsTypes, genericType, true, beanType, importTypes, factory, beanType);
+    this(injectsTypes, extraTypes, genericType, true, beanType, importTypes, factory, beanType);
   }
 
   TypeReader(
       List<TypeMirror> injectsTypes,
+      List<TypeMirror> extraTypes,
       UType genericType,
       TypeElement returnElement,
       ImportTypeMap importTypes,
       ExecutableElement source) {
-    this(injectsTypes, genericType, false, returnElement, importTypes, false, source);
+    this(injectsTypes, extraTypes, genericType, false, returnElement, importTypes, false, source);
   }
 
   private TypeReader(
       List<TypeMirror> injectsTypes,
+      List<TypeMirror> extraTypes,
       UType genericType,
       boolean forBean,
       TypeElement beanType,
       ImportTypeMap importTypes,
       boolean factory,
       Element source) {
     this.injectsTypes = injectsTypes.stream().map(UType::parse).collect(toList());
+    this.extraTypes = extraTypes.stream().map(UType::parse).collect(toList());
     this.forBean = forBean;
     this.beanType = beanType;
     this.importTypes = importTypes;
@@ -63,6 +69,10 @@ String typesRegister() {
     return typesRegister;
   }
 
+  String extraTypesRegister() {
+    return extraTypesRegister;
+  }
+
   List<String> provides() {
     var provides = providedTypes();
     provides.addAll(autoProvides());
@@ -156,6 +166,12 @@ private void initRegistrationTypes() {
       appender.add(extendsReader.provides());
     } else {
       appender.add(injectsTypes);
+      if (!extraTypes.isEmpty()) {
+        this.extraTypesRegister =
+          new TypeAppender(importTypes)
+            .add(extraTypes)
+            .asString();
+      }
     }
     this.genericTypes = appender.genericTypes();
     this.typesRegister = appender.asString();

inject/src/main/java/io/avaje/inject/BeanTypes.java

@@ -7,5 +7,14 @@
 @Target({ElementType.METHOD, ElementType.TYPE})
 public @interface BeanTypes {
 
+  /** The types the component will register to. */
   Class<?>[] value();
+
+  /**
+   * Extra types to register the component to that are not included in the
+   * <code>isBeanAbsent()</code> check. For testing purposes, when providing
+   * test doubles, these types are not checked.
+   */
+  Class<?>[] registerTypes() default {};
+
 }

inject/src/main/java/io/avaje/inject/spi/Builder.java

@@ -57,6 +57,11 @@ default boolean isBeanAbsent(Type... types) {
     return isBeanAbsent(null, types);
   }
 
+  /**
+   * Register extra types that the next registered bean implements and provides.
+   */
+  void registerTypes(Type... types);
+
   /**
    * Register the next bean as having Primary priority.
    * Highest priority, wired over any other matching beans.