Simplify Builder part 2 - removing unnecessary methods etc

Author: rbygrave

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

@@ -148,7 +148,7 @@ void buildNewBuilder(Append writer) {
     writer.append(";").eol();
     writer.append("    this.dependsOn = ", contextDependsOn);
     buildStringArray(writer, contextDependsOn, true);
-    writer.append(";").eol().eol();
+    writer.append(";").eol();
   }
 
   void buildAtContextModule(Append writer) {

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

@@ -102,7 +102,7 @@ private void writeBuildMethods() {
   private void writeCreateMethod() {
     writer.append(CODE_COMMENT_CREATE_CONTEXT).eol();
     writer.append("  @Override").eol();
-    writer.append("  public void createContext(Builder builder) {").eol();
+    writer.append("  public void build(Builder builder) {").eol();
     writer.append("    this.builder = builder;").eol();
     writer.append("    // create beans in order based on constructor dependencies").eol();
     writer.append("    // i.e. \"provides\" followed by \"dependsOn\"").eol();

inject-test/src/test/java/io/avaje/inject/BeanContextBuilderTest.java

@@ -128,7 +128,7 @@ public String[] getDependsOn() {
     }
 
     @Override
-    public void createContext(Builder parent) {
+    public void build(Builder parent) {
 
     }
   }

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

@@ -77,27 +77,6 @@ static BeanContextBuilder newBuilder() {
     return new DBeanContextBuilder();
   }
 
-  /**
-   * Return the module name of the bean context.
-   *
-   * @see ContextModule
-   */
-  String getName();
-
-  /**
-   * Return the names of module features this bean context provides.
-   *
-   * @see ContextModule
-   */
-  String[] getProvides();
-
-  /**
-   * Return the names of modules this bean context depends on.
-   *
-   * @see ContextModule
-   */
-  String[] getDependsOn();
-
   /**
    * Return a single bean given the type.
    *

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

@@ -8,15 +8,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 
@@ -120,12 +112,12 @@ public BeanContext build() {
         " Refer to https://avaje.io/inject#gradle");
     }
     log.debug("building context with modules {}", moduleNames);
-    Builder rootBuilder = Builder.newRootBuilder(suppliedBeans, enrichBeans);
+    Builder builder = Builder.newBuilder(suppliedBeans, enrichBeans);
     for (BeanContextFactory factory : factoryOrder.factories()) {
-      factory.createContext(rootBuilder);
+      factory.build(builder);
     }
 
-    BeanContext beanContext = rootBuilder.build();
+    BeanContext beanContext = builder.build();
     // entire graph built, fire postConstruct
     beanContext.start();
     if (shutdownHook) {
@@ -180,21 +172,6 @@ private static class ShutdownAwareBeanContext implements BeanContext {
       Runtime.getRuntime().addShutdownHook(hook);
     }
 
-    @Override
-    public String getName() {
-      return context.getName();
-    }
-
-    @Override
-    public String[] getProvides() {
-      return context.getProvides();
-    }
-
-    @Override
-    public String[] getDependsOn() {
-      return context.getDependsOn();
-    }
-
     @Override
     public <T> T getBean(Class<T> beanClass) {
       return context.getBean(beanClass);

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

@@ -1,7 +1,5 @@
 package io.avaje.inject.spi;
 
-import io.avaje.inject.BeanContext;
-
 /**
  * This is the service loader interface defining the bean contexts that can be created.
  */
@@ -23,7 +21,7 @@ public interface BeanContextFactory {
   String[] getDependsOn();
 
   /**
-   * Create and return the BeanContext.
+   * Build all the beans.
    */
-  void createContext(Builder parent);
+  void build(Builder builder);
 }

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

@@ -21,34 +21,14 @@ public interface Builder {
    * @param enrichBeans   The list of classes we want to have with mockito spy enhancement
    */
   @SuppressWarnings("rawtypes")
-  static Builder newRootBuilder(List<SuppliedBean> suppliedBeans, List<EnrichBean> enrichBeans) {
+  static Builder newBuilder(List<SuppliedBean> suppliedBeans, List<EnrichBean> enrichBeans) {
     if (suppliedBeans.isEmpty() && enrichBeans.isEmpty()) {
       // simple case, no mocks or spies
       return new DBuilder();
     }
     return new DBuilderExtn(suppliedBeans, enrichBeans);
   }
 
-  /**
-   * Return the name of the (module) context this builder is creating.
-   */
-  String getName();
-
-  /**
-   * Return the names of module features that this module provides.
-   */
-  String[] getProvides();
-
-  /**
-   * Return the names of modules that this module depends on.
-   */
-  String[] getDependsOn();
-
-  /**
-   * Set a parent builder that can provide cross-module dependencies.
-   */
-  void setParent(Builder parent);
-
   /**
    * Return true if the bean should be created and registered with the context.
    * <p/>
@@ -97,11 +77,6 @@ static Builder newRootBuilder(List<SuppliedBean> suppliedBeans, List<EnrichBean>
    */
   void addInjector(Consumer<Builder> injector);
 
-  /**
-   * Add a child context.
-   */
-  void addChild(BeanContextFactory factory);
-
   /**
    * Get an optional dependency.
    */

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

@@ -17,42 +17,16 @@ class DBeanContext implements BeanContext {
   private static final Logger log = LoggerFactory.getLogger(DBeanContext.class);
 
   private final ReentrantLock lock = new ReentrantLock();
-
-  private final String name;
-
-  private final String[] provides;
-
-  private final String[] dependsOn;
-
   private final List<BeanLifecycle> lifecycleList;
-
   private final DBeanMap beans;
 
   private boolean closed;
 
-  DBeanContext(String name, String[] provides, String[] dependsOn, List<BeanLifecycle> lifecycleList, DBeanMap beans) {//}, Map<String, BeanContext> children) {
-    this.name = name;
-    this.provides = provides;
-    this.dependsOn = dependsOn;
+  DBeanContext(List<BeanLifecycle> lifecycleList, DBeanMap beans) {
     this.lifecycleList = lifecycleList;
     this.beans = beans;
   }
 
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public String[] getProvides() {
-    return provides;
-  }
-
-  @Override
-  public String[] getDependsOn() {
-    return dependsOn;
-  }
-
   @Override
   public <T> T getBean(Class<T> beanClass) {
     return getBean(beanClass, null);
@@ -130,9 +104,7 @@ public List<Object> getBeansWithAnnotation(Class<?> annotation) {
   public void start() {
     lock.lock();
     try {
-      if (name != null) {
-        log.debug("firing postConstruct on beans in context:{}", name);
-      }
+      log.trace("firing postConstruct");
       for (BeanLifecycle bean : lifecycleList) {
         bean.postConstruct();
       }
@@ -148,9 +120,7 @@ public void close() {
       if (!closed) {
         // we only allow one call to preDestroy
         closed = true;
-        if (name != null) {
-          log.debug("firing preDestroy on beans in context:{}", name);
-        }
+        log.trace("firing preDestroy");
         for (BeanLifecycle bean : lifecycleList) {
           bean.preDestroy();
         }

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

@@ -2,23 +2,13 @@
 
 import io.avaje.inject.BeanContext;
 import io.avaje.inject.BeanEntry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import jakarta.inject.Provider;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+
+import java.util.*;
 import java.util.function.Consumer;
 
 class DBuilder implements Builder {
 
-  private static final Logger log = LoggerFactory.getLogger(DBuilder.class);
-
   /**
    * List of Lifecycle beans.
    */
@@ -34,21 +24,6 @@ class DBuilder implements Builder {
    */
   final DBeanMap beanMap = new DBeanMap();
 
-  /**
-   * The context/module name.
-   */
-  private final String name;
-
-  /**
-   * The module features this context provides.
-   */
-  private final String[] provides;
-
-  /**
-   * The other modules this context dependsOn (that should be built prior).
-   */
-  private final String[] dependsOn;
-
   /**
    * Debug of the current bean being wired - used in injection errors.
    */
@@ -59,51 +34,22 @@ class DBuilder implements Builder {
    */
   private boolean runningPostConstruct;
 
-  /**
-   * Create for the root builder.
-   */
-  DBuilder() {
-    this.name = null;
-    this.provides = null;
-    this.dependsOn = null;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public String[] getProvides() {
-    return provides;
-  }
-
-  @Override
-  public String[] getDependsOn() {
-    return dependsOn;
-  }
-
-  @Override
-  public void setParent(Builder parent) {
-    //this.parent = parent;
-  }
-
   @Override
   public boolean isAddBeanFor(Class<?>... types) {
     return isAddBeanFor(null, types);
   }
 
-  protected void next(String name, Class<?>... types) {
-    injectTarget = firstOf(types);
-    beanMap.nextBean(name, types);
-  }
-
   @Override
   public boolean isAddBeanFor(String name, Class<?>... types) {
     next(name, types);
     return true;
   }
 
+  protected void next(String name, Class<?>... types) {
+    injectTarget = firstOf(types);
+    beanMap.nextBean(name, types);
+  }
+
   private Class<?> firstOf(Class<?>[] types) {
     return types != null && types.length > 0 ? types[0] : null;
   }
@@ -133,11 +79,6 @@ private <T> T getMaybe(Class<T> beanClass, String name) {
     return (entry == null) ? null : entry.getBean();
   }
 
-  @Override
-  public void addChild(BeanContextFactory factory) {
-    factory.createContext(this);
-  }
-
   /**
    * Return the bean to register potentially with spy enhancement.
    */
@@ -238,9 +179,6 @@ public <T> T get(Class<T> cls, String name) {
   }
 
   private void runInjectors() {
-    if (name != null) {
-      log.debug("perform field injection in context:{}", name);
-    }
     runningPostConstruct = true;
     for (Consumer<Builder> injector : injectors) {
       injector.accept(this);
@@ -249,6 +187,6 @@ private void runInjectors() {
 
   public BeanContext build() {
     runInjectors();
-    return new DBeanContext(name, provides, dependsOn, lifecycleList, beanMap);
+    return new DBeanContext(lifecycleList, beanMap);
   }
 }

inject/src/test/java/io/avaje/inject/BeanContextBuilderTest.java

@@ -128,7 +128,7 @@ public String[] getDependsOn() {
     }
 
     @Override
-    public void createContext(Builder parent) {
+    public void build(Builder parent) {
 
     }
   }