Testing classloaders for class in parameter of getExportedInstances

forge · Jan 22, 2013 · 8e09662 · 8e09662
1 parent 8622acf
commit 8e09662
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 15 deletions.
diff --git a/container-api/src/main/java/org/jboss/forge/container/AddonRegistry.java b/container-api/src/main/java/org/jboss/forge/container/AddonRegistry.java
@@ -23,6 +23,10 @@ public interface AddonRegistry
 
    <T> Set<ExportedInstance<T>> getExportedInstances(String clazz);
 
+   <T> ExportedInstance<T> getExportedInstance(Class<T> type);
+
+   <T> ExportedInstance<T> getExportedInstance(String type);
+
    Future<?> start(Addon addon);
 
    void stop(Addon addon);

diff --git a/container/src/main/java/org/jboss/forge/container/impl/AddonRegistryImpl.java b/container/src/main/java/org/jboss/forge/container/impl/AddonRegistryImpl.java
@@ -376,6 +376,46 @@ public <T> Set<ExportedInstance<T>> getExportedInstances(String typeName)
       return result;
    }
 
+   @Override
+   public <T> ExportedInstance<T> getExportedInstance(Class<T> type)
+   {
+      // TODO This needs to block addon installation/removal;
+      ExportedInstance<T> result = null;
+      for (Addon addon : addons)
+      {
+         if (addon.getStatus().isStarted())
+         {
+            ServiceRegistry serviceRegistry = addon.getServiceRegistry();
+            result = serviceRegistry.getExportedInstance(type);
+            if (result != null)
+            {
+               break;
+            }
+         }
+      }
+      return result;
+   }
+
+   @Override
+   public <T> ExportedInstance<T> getExportedInstance(String type)
+   {
+      // TODO This needs to block addon installation/removal;
+      ExportedInstance<T> result = null;
+      for (Addon addon : addons)
+      {
+         if (addon.getStatus().isStarted())
+         {
+            ServiceRegistry serviceRegistry = addon.getServiceRegistry();
+            result = serviceRegistry.getExportedInstance(type);
+            if (result != null)
+            {
+               break;
+            }
+         }
+      }
+      return result;
+   }
+
    @Override
    public String toString()
    {

diff --git a/container/src/main/java/org/jboss/forge/container/impl/ServiceRegistryImpl.java b/container/src/main/java/org/jboss/forge/container/impl/ServiceRegistryImpl.java
@@ -126,9 +126,28 @@ public String toString()
    public <T> Set<ExportedInstance<T>> getExportedInstances(Class<T> clazz)
    {
       Set<ExportedInstance<T>> result = new HashSet<ExportedInstance<T>>();
+      final Class<T> addonLoadedType;
+      if (clazz.getClassLoader() == addon.getClassLoader())
+      {
+         addonLoadedType = clazz;
+      }
+      else
+      {
+         try
+         {
+            addonLoadedType = (Class<T>) Class.forName(clazz.getName(), true, addon.getClassLoader());
+         }
+         catch (Exception e)
+         {
+            log.log(Level.FINE, "Error while fetching exported instances", e);
+            return result;
+         }
+      }
+
       for (Class<?> type : services)
       {
-         if (clazz.isAssignableFrom(type))
+
+         if (addonLoadedType.isAssignableFrom(type))
          {
             result.add((ExportedInstance<T>) getExportedInstance(type));
          }

diff --git a/ui/tests/src/test/java/org/jboss/forge/ui/impl/MockChooseFrameworkStep.java b/ui/tests/src/test/java/org/jboss/forge/ui/impl/MockChooseFrameworkStep.java
@@ -5,27 +5,15 @@
 import org.jboss.forge.ui.UICommandID;
 import org.jboss.forge.ui.UIContext;
 import org.jboss.forge.ui.UIValidationContext;
+import org.jboss.forge.ui.base.SimpleUICommandID;
 
 public class MockChooseFrameworkStep implements UICommand
 {
 
    @Override
    public UICommandID getId()
    {
-      return new UICommandID()
-      {
-         @Override
-         public String getName()
-         {
-            return "Choose Framework";
-         }
-
-         @Override
-         public String getDescription()
-         {
-            return "Pick the framework you wish to use for this command.";
-         }
-      };
+      return new SimpleUICommandID("Choose Framework", "Pick the framework you wish to use for this command.");
    }
 
    @Override