Refactor internals, replace synchronized with ReentrantLock

Author: rbygrave

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

@@ -17,6 +17,7 @@
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 
 /**
@@ -163,6 +164,7 @@ public void run() {
    */
   private static class ShutdownAwareBeanContext implements BeanContext {
 
+    private final ReentrantLock lock = new ReentrantLock();
     private final BeanContext context;
     private final Hook hook;
     private boolean shutdown;
@@ -240,21 +242,27 @@ public void start() {
 
     @Override
     public void close() {
-      synchronized (this) {
+      lock.lock();
+      try {
         if (!shutdown) {
           Runtime.getRuntime().removeShutdownHook(hook);
         }
         context.close();
+      } finally {
+        lock.unlock();
       }
     }
 
     /**
      * Close via shutdown hook.
      */
     void shutdown() {
-      synchronized (this) {
+      lock.lock();
+      try {
         shutdown = true;
         close();
+      } finally {
+        lock.unlock();
       }
     }
   }

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

@@ -11,11 +11,14 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
 
 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;
@@ -138,7 +141,8 @@ public List<Object> getBeansWithAnnotation(Class<?> annotation) {
 
   @Override
   public void start() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (name != null) {
         log.debug("firing postConstruct on beans in context:{}", name);
       }
@@ -148,12 +152,15 @@ public void start() {
       for (BeanContext childContext : children.values()) {
         childContext.start();
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public void close() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (!closed) {
         // we only allow one call to preDestroy
         closed = true;
@@ -167,6 +174,8 @@ public void close() {
           childContext.close();
         }
       }
+    } finally {
+      lock.unlock();
     }
   }