From d13eedfe91668e614d8454e85b058c9c0413a2f4 Mon Sep 17 00:00:00 2001
From: GedMarc <marc.magon@gmail.com>
Date: Tue, 2 Jul 2024 22:05:42 +0200
Subject: [PATCH] Queue Updates

---
 .../java/com/guicedee/guicedinjection/GuiceContext.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/guicedee/guicedinjection/GuiceContext.java b/src/main/java/com/guicedee/guicedinjection/GuiceContext.java
index 6dace63..fd7c25b 100644
--- a/src/main/java/com/guicedee/guicedinjection/GuiceContext.java
+++ b/src/main/java/com/guicedee/guicedinjection/GuiceContext.java
@@ -83,6 +83,8 @@ public class GuiceContext<J extends GuiceContext<J>> implements IGuiceContext
      */
     private static boolean configured;
 
+    private CompletableFuture<Void> loadingFinished = new CompletableFuture<>();
+
     /**
      * Creates a new Guice context. Not necessary
      */
@@ -140,7 +142,6 @@ public Injector inject()
                 log.config("Modules - " + Arrays.toString(cModules.toArray()));
                 GuiceContext.instance().injector = Guice.createInjector(cModules);
                 GuiceContext.buildingInjector = false;
-                startup.complete(true);
                 GuiceContext.instance().loadPostStartups();
                 GuiceContext.instance().loadPreDestroyServices();
                 Runtime
@@ -154,6 +155,7 @@ public void run()
                         });
                 LocalDateTime end = LocalDateTime.now();
                 log.info("System started in " + ChronoUnit.MILLIS.between(start, end) + "ms");
+                loadingFinished.complete(null);
             }
             catch (Throwable e)
             {
@@ -337,6 +339,10 @@ private String[] getJarsInclusionList()
         return strings.toArray(new String[0]);
     }
 
+    public CompletableFuture<Void> getLoadingFinished()
+    {
+        return loadingFinished;
+    }
 
     /**
      * Starts up Guice and the scanner