Created utility methods in SimpleContainer

forge · Aug 6, 2015 · 1211885 · 1211885
1 parent 487c1f1
commit 1211885
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 13 deletions.
diff --git a/api/src/main/java/org/jboss/forge/furnace/container/simple/lifecycle/SimpleContainer.java b/api/src/main/java/org/jboss/forge/furnace/container/simple/lifecycle/SimpleContainer.java
@@ -7,24 +7,24 @@
 package org.jboss.forge.furnace.container.simple.lifecycle;
 
 import java.util.Map;
-import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.jboss.forge.furnace.Furnace;
 import org.jboss.forge.furnace.addons.Addon;
+import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.furnace.container.simple.EventListener;
-import org.jboss.forge.furnace.container.simple.Service;
 import org.jboss.forge.furnace.lifecycle.AddonLifecycleProvider;
+import org.jboss.forge.furnace.services.Imported;
 
 /**
- * Implements a fast and simple {@link AddonLifecycleProvider} for the {@link Furnace} runtime. Allows {@link Service}
- * and {@link EventListener} registration.
+ * Implements a fast and simple {@link AddonLifecycleProvider} for the {@link Furnace} runtime. Allows Service and
+ * {@link EventListener} registration.
  * 
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
 public class SimpleContainer
 {
-   private static Map<ClassLoader, Furnace> started = new ConcurrentHashMap<>(new WeakHashMap<ClassLoader, Furnace>());
+   private static Map<ClassLoader, Furnace> started = new ConcurrentHashMap<>();
 
    /**
     * Used to retrieve an instance of {@link Furnace}.
@@ -34,6 +34,35 @@ public static Furnace getFurnace(ClassLoader loader)
       return started.get(loader);
    }
 
+   /**
+    * Returns the registered services for a given {@link Furnace} Runtime.
+    * 
+    * @param service the service {@link Class}
+    * @return an {@link Imported} instance
+    */
+   public static <T> Imported<T> getServices(Class<T> service)
+   {
+      return getServices(service.getClassLoader(), service);
+   }
+
+   /**
+    * Returns the registered services for a given {@link Furnace} Runtime.
+    * 
+    * @param classloader the {@link ClassLoader} this {@link Furnace} runtime can be found
+    * @param service the service {@link Class}
+    * @return an {@link Imported} instance
+    */
+   public static <T> Imported<T> getServices(ClassLoader classloader, Class<T> service)
+   {
+      Furnace furnace = getFurnace(classloader);
+      if (furnace != null)
+      {
+         AddonRegistry addonRegistry = furnace.getAddonRegistry();
+         return addonRegistry.getServices(service);
+      }
+      return null;
+   }
+
    static void start(Addon addon, Furnace furnace)
    {
       started.put(addon.getClassLoader(), furnace);

diff --git a/tests/src/test/java/org/jboss/forge/furnace/container/simple/SingletonServiceTest.java b/tests/src/test/java/org/jboss/forge/furnace/container/simple/SingletonServiceTest.java
@@ -11,8 +11,6 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.forge.arquillian.AddonDependencies;
-import org.jboss.forge.arquillian.AddonDependency;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
 import org.jboss.forge.arquillian.archive.AddonArchive;
@@ -38,19 +36,16 @@ public static AddonArchive getDeployment()
                .addAsServiceProvider(SingletonService.class, SimpleSingletonInstance.class)
                .addAsServiceProvider(Service.class, SingletonServiceTest.class)
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create("org.jboss.forge.furnace.container:simple")
-               );
+                        AddonDependencyEntry.create("org.jboss.forge.furnace.container:simple"));
 
       return archive;
    }
 
    @Test
    public void testContainerStartup()
    {
-      Imported<SimpleSingletonInstance> services = SimpleContainer.getFurnace(this.getClass().getClassLoader())
-               .getAddonRegistry().getServices(SimpleSingletonInstance.class);
-      Imported<SimpleSingletonInstance> services2 = SimpleContainer.getFurnace(this.getClass().getClassLoader())
-               .getAddonRegistry().getServices(SimpleSingletonInstance.class);
+      Imported<SimpleSingletonInstance> services = SimpleContainer.getServices(SimpleSingletonInstance.class);
+      Imported<SimpleSingletonInstance> services2 = SimpleContainer.getServices(SimpleSingletonInstance.class);
       assertNotNull(services.get());
       assertEquals(services.get().getRandomInteger(), services2.get().getRandomInteger());
    }