Remove BeanScope start() method as it can and should be internal

Author: rbygrave

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

@@ -220,11 +220,6 @@ default <T> List<T> getBeansByPriority(Class<T> interfaceType, Class<? extends A
    */
   <T> RequestScopeMatch<T> requestProvider(Class<T> type, String name);
 
-  /**
-   * Start the context firing any <code>@PostConstruct</code> methods.
-   */
-  void start();
-
   /**
    * Close the context firing any <code>@PreDestroy</code> methods.
    */

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

@@ -118,8 +118,6 @@ public BeanScope build() {
     }
 
     BeanScope beanScope = builder.build();
-    // entire graph built, fire postConstruct
-    beanScope.start();
     if (shutdownHook) {
       return new ShutdownAwareBeanScope(beanScope);
     }
@@ -162,59 +160,54 @@ public void run() {
   private static class ShutdownAwareBeanScope implements BeanScope {
 
     private final ReentrantLock lock = new ReentrantLock();
-    private final BeanScope context;
+    private final BeanScope beanScope;
     private final Hook hook;
     private boolean shutdown;
 
-    ShutdownAwareBeanScope(BeanScope context) {
-      this.context = context;
+    ShutdownAwareBeanScope(BeanScope beanScope) {
+      this.beanScope = beanScope;
       this.hook = new Hook(this);
       Runtime.getRuntime().addShutdownHook(hook);
     }
 
     @Override
     public RequestScopeBuilder newRequestScope() {
-      return context.newRequestScope();
+      return beanScope.newRequestScope();
     }
 
     @Override
     public <T> RequestScopeMatch<T> requestProvider(Class<T> type, String name) {
-      return context.requestProvider(type, name);
+      return beanScope.requestProvider(type, name);
     }
 
     @Override
     public <T> T get(Class<T> beanClass) {
-      return context.get(beanClass);
+      return beanScope.get(beanClass);
     }
 
     @Override
     public <T> T get(Class<T> beanClass, String name) {
-      return context.get(beanClass, name);
+      return beanScope.get(beanClass, name);
     }
 
     @Override
     public List<Object> listByAnnotation(Class<?> annotation) {
-      return context.listByAnnotation(annotation);
+      return beanScope.listByAnnotation(annotation);
     }
 
     @Override
     public <T> List<T> list(Class<T> interfaceType) {
-      return context.list(interfaceType);
+      return beanScope.list(interfaceType);
     }
 
     @Override
     public <T> List<T> listByPriority(Class<T> interfaceType) {
-      return context.listByPriority(interfaceType);
+      return beanScope.listByPriority(interfaceType);
     }
 
     @Override
     public <T> List<T> listByPriority(Class<T> interfaceType, Class<? extends Annotation> priority) {
-      return context.listByPriority(interfaceType, priority);
-    }
-
-    @Override
-    public void start() {
-      context.start();
+      return beanScope.listByPriority(interfaceType, priority);
     }
 
     @Override
@@ -224,7 +217,7 @@ public void close() {
         if (!shutdown) {
           Runtime.getRuntime().removeShutdownHook(hook);
         }
-        context.close();
+        beanScope.close();
       } finally {
         lock.unlock();
       }

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

@@ -96,8 +96,7 @@ public List<Object> listByAnnotation(Class<?> annotation) {
     return beans.all(annotation);
   }
 
-  @Override
-  public void start() {
+  DBeanScope start() {
     lock.lock();
     try {
       log.trace("firing postConstruct");
@@ -107,6 +106,7 @@ public void start() {
     } finally {
       lock.unlock();
     }
+    return this;
   }
 
   @Override

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

@@ -197,6 +197,6 @@ private void runInjectors() {
 
   public BeanScope build() {
     runInjectors();
-    return new DBeanScope(lifecycleList, beanMap, reqScopeProviders);
+    return new DBeanScope(lifecycleList, beanMap, reqScopeProviders).start();
   }
 }