#97 - Followup Refactor simplifying register methods

This means we only declare the qualifier and types once in generated code which makes more sense

Author: rbygrave

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

@@ -295,14 +295,7 @@ void buildRegister(Append writer) {
       writer.append("%s $bean = ", shortName);
     }
     String flags = primary ? "Primary" : secondary ? "Secondary" : "";
-    writer.append("builder.register%s(bean, ", flags);
-    if (name == null) {
-      writer.append("null, ");
-    } else {
-      writer.append("\"%s\", ", name);
-    }
-    // add interfaces and annotations
-    writer.append(typeReader.getTypesRegister()).append(");").eol();
+    writer.append("builder.register%s(bean);", flags).eol();
   }
 
   void buildAddLifecycle(Append writer) {

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

@@ -125,17 +125,7 @@ void builderBuildAddBean(Append writer) {
       if (beanLifeCycle || hasLifecycleMethods()) {
         writer.append("%s $bean = ", shortName);
       }
-      writer.append("builder.register(bean, ");
-      if (name == null) {
-        writer.append("null, ");
-      } else {
-        writer.append("\"%s\", ", name);
-      }
-      if (typeReader != null) {
-        writer.append(typeReader.getTypesRegister());
-      }
-      writer.append(");").eol();
-
+      writer.append("builder.register(bean);").eol();
       if (beanLifeCycle) {
         writer.append("      builder.addLifecycle($bean);").eol();
       } else if (hasLifecycleMethods()) {

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

@@ -83,25 +83,20 @@ static Builder newBuilder(String name, String[] provides, String[] dependsOn) {
 
   /**
    * Register the bean instance into the context.
-   * <p>
-   * Beans are added in an appropriate order to satisfy dependencies.
-   * </p>
    *
-   * @param bean  The bean instance that has been created.
-   * @param name  The (optional) name of the instance.
-   * @param types Interfaces and class level annotations this bean provides or associates to.
+   * @param bean The bean instance that has been created.
    */
-  <T> T register(T bean, String name, Class<?>... types);
+  <T> T register(T bean);
 
   /**
    * Register the bean as a Primary bean.
    */
-  <T> T registerPrimary(T bean, String name, Class<?>... types);
+  <T> T registerPrimary(T bean);
 
   /**
    * Register the bean as a secondary bean.
    */
-  <T> T registerSecondary(T bean, String name, Class<?>... types);
+  <T> T registerSecondary(T bean);
 
   /**
    * Add a lifecycle bean.

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

@@ -2,9 +2,7 @@
 
 import io.avaje.inject.BeanEntry;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static io.avaje.inject.BeanEntry.*;
 
@@ -16,6 +14,8 @@ class DBeanMap {
 
   private final Map<String, DContextEntry> beans = new LinkedHashMap<>();
 
+  private NextBean nextBean;
+
   /**
    * Create for context builder.
    */
@@ -42,21 +42,21 @@ private void addSuppliedBean(SuppliedBean supplied) {
     }
   }
 
-  void registerPrimary(Object bean, String name, Class<?>... types) {
-    registerWith(PRIMARY, bean, name, types);
+  void registerPrimary(Object bean) {
+    registerWith(PRIMARY, bean);
   }
 
-  void registerSecondary(Object bean, String name, Class<?>... types) {
-    registerWith(SECONDARY, bean, name, types);
+  void registerSecondary(Object bean) {
+    registerWith(SECONDARY, bean);
   }
 
-  void register(Object bean, String name, Class<?>... types) {
-    registerWith(NORMAL, bean, name, types);
+  void register(Object bean) {
+    registerWith(NORMAL, bean);
   }
 
-  void registerWith(int flag, Object bean, String name, Class<?>... types) {
-    DContextEntryBean entryBean = DContextEntryBean.of(bean, name, flag);
-    for (Class<?> type : types) {
+  void registerWith(int flag, Object bean) {
+    DContextEntryBean entryBean = DContextEntryBean.of(bean, nextBean.name, flag);
+    for (Class<?> type : nextBean.types) {
       beans.computeIfAbsent(type.getCanonicalName(), s -> new DContextEntry()).add(entryBean);
     }
   }
@@ -101,4 +101,28 @@ private boolean isSuppliedType(String qualifierName, Class<?> type) {
     DContextEntry entry = beans.get(type.getCanonicalName());
     return entry != null && entry.isSupplied(qualifierName);
   }
+
+  /**
+   * Store the qualifier name and type for the next bean to register.
+   */
+  void nextBean(String name, Class<?>[] types) {
+    nextBean = new NextBean(name, types);
+  }
+
+  /**
+   * Return the types of the bean being processed/registered.
+   */
+  Class<?>[] types() {
+    return nextBean.types;
+  }
+
+  private static class NextBean {
+    final String name;
+    final Class<?>[] types;
+
+    NextBean(String name, Class<?>[] types) {
+      this.name = name;
+      this.types = types;
+    }
+  }
 }

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

@@ -108,6 +108,7 @@ public boolean isAddBeanFor(Class<?>... types) {
 
   @Override
   public boolean isAddBeanFor(String name, Class<?>... types) {
+    beanMap.nextBean(name, types);
     if (parent == null) {
       return true;
     }
@@ -173,32 +174,32 @@ public <T> T enrich(T bean, Class<?>[] types) {
   }
 
   @Override
-  public <T> T register(T bean, String name, Class<?>... types) {
+  public <T> T register(T bean) {
     if (parent != null) {
       // enrichment only exist on top level builder
-      bean = parent.enrich(bean, types);
+      bean = parent.enrich(bean, beanMap.types());
     }
-    beanMap.register(bean, name, types);
+    beanMap.register(bean);
     return bean;
   }
 
   @Override
-  public <T> T registerPrimary(T bean, String name, Class<?>... types) {
+  public <T> T registerPrimary(T bean) {
     if (parent != null) {
       // enrichment only exist on top level builder
-      bean = parent.enrich(bean, types);
+      bean = parent.enrich(bean, beanMap.types());
     }
-    beanMap.registerPrimary(bean, name, types);
+    beanMap.registerPrimary(bean);
     return bean;
   }
 
   @Override
-  public <T> T registerSecondary(T bean, String name, Class<?>... types) {
+  public <T> T registerSecondary(T bean) {
     if (parent != null) {
       // enrichment only exist on top level builder
-      bean = parent.enrich(bean, types);
+      bean = parent.enrich(bean, beanMap.types());
     }
-    beanMap.registerSecondary(bean, name, types);
+    beanMap.registerSecondary(bean);
     return bean;
   }