First attempt at FORGE-1102

container-api/src/main/java/org/jboss/forge/furnace/services/Imported.java

@@ -23,6 +23,11 @@ public interface Imported<T> extends Iterable<T>
     */
    void release(T instance);
 
+   /**
+    * Get a fully constructed instance of the exact requested type.
+    */
+   T selectExact(Class<T> type);
+
    /**
     * Returns <code>true</code> if an instance of the requested type can be produced.
     */

container-api/src/main/java/org/jboss/forge/furnace/spi/ExportedInstance.java

@@ -14,4 +14,6 @@ public interface ExportedInstance<T>
    T get();
 
    void release(T instance);
+
+   Class<? extends T> getActualType();
 }

container/src/main/java/org/jboss/forge/furnace/impl/addons/ImportedImpl.java

@@ -26,6 +26,7 @@
 import org.jboss.forge.furnace.services.Imported;
 import org.jboss.forge.furnace.spi.ExportedInstance;
 import org.jboss.forge.furnace.spi.ServiceRegistry;
+import org.jboss.forge.furnace.util.Assert;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
@@ -64,6 +65,9 @@ public Iterator<T> iterator()
    @Override
    public T get()
    {
+      if (isAmbiguous())
+         throw new IllegalStateException("Cannot resolve Ambiguous dependencies: " + toString());
+
       ExportedInstance<T> exported = getExportedInstance();
       if (exported != null)
       {
@@ -87,6 +91,24 @@ public void release(T instance)
       }
    }
 
+   @Override
+   public T selectExact(Class<T> type)
+   {
+      Assert.notNull(type, "Type to select must not be null.");
+      Set<ExportedInstance<T>> instances = getExportedInstances();
+      for (ExportedInstance<T> instance : instances)
+      {
+         if (type.equals(instance.getActualType()))
+         {
+            T result = instance.get();
+            instanceMap.put(result, instance);
+            return result;
+         }
+      }
+      throw new ContainerException("No @" + Exported.class.getSimpleName()
+               + " services of type [" + type + "] could be found in any started addons.");
+   }
+
    private ExportedInstance<T> getExportedInstance()
    {
       return lock.performLocked(LockMode.READ, new Callable<ExportedInstance<T>>()
@@ -183,7 +205,20 @@ public void remove()
    @Override
    public String toString()
    {
-      return "ImportedImpl [type=" + typeName + "]";
+      StringBuilder result = new StringBuilder();
+
+      result.append("[");
+      Iterator<ExportedInstance<T>> iterator = this.getExportedInstances().iterator();
+      while (iterator.hasNext())
+      {
+         ExportedInstance<T> instance = iterator.next();
+         result.append(instance);
+         if (iterator.hasNext())
+            result.append(",\n");
+      }
+      result.append("]");
+
+      return result.toString();
    }
 
    @Override

test-harness/arquillian/core/src/main/java/org/jboss/forge/arquillian/services/ReflectionExportedInstance.java

@@ -17,9 +17,11 @@
 public class ReflectionExportedInstance<T> implements ExportedInstance<T>
 {
    private Class<T> type;
+   private Addon addon;
 
    public ReflectionExportedInstance(Addon addon, Class<T> clazz)
    {
+      this.addon = addon;
       this.type = clazz;
    }
 
@@ -42,4 +44,16 @@ public void release(T instance)
       // no action required
    }
 
+   @Override
+   public String toString()
+   {
+      return type.getName() + " from " + addon;
+   }
+
+   @Override
+   public Class<? extends T> getActualType()
+   {
+      return type;
+   }
+
 }