FORGE-1876: WeldServiceRegistry.hasService should call BeanManager.ge…

…tBeans().isEmpty()

impl/src/main/java/org/jboss/forge/furnace/container/cdi/impl/WeldServiceRegistry.java

@@ -132,14 +132,8 @@ public boolean hasService(String clazz)
    public boolean hasService(Class<?> clazz)
    {
       Addons.waitUntilStarted(addon);
-      for (Class<?> service : serviceTypes)
-      {
-         if (clazz.isAssignableFrom(service))
-         {
-            return true;
-         }
-      }
-      return false;
+      Set<Bean<?>> beans = manager.getBeans(clazz, getQualifiersFrom(clazz));
+      return !beans.isEmpty();
    }
 
    @Override

tests/src/main/java/test/org/jboss/forge/furnace/mocks/PlainBean.java

@@ -13,5 +13,22 @@
  */
 public class PlainBean implements PlainInterface
 {
+   private final String value;
+
+   public PlainBean()
+   {
+      this.value = null;
+   }
+
+   public PlainBean(String value)
+   {
+      this.value = value;
+   }
+
+   @Override
+   public String getValue()
+   {
+      return this.value;
+   }
 
 }

tests/src/main/java/test/org/jboss/forge/furnace/mocks/PlainInterface.java

@@ -13,5 +13,5 @@
  */
 public interface PlainInterface
 {
-
+   String getValue();
 }

tests/src/main/java/test/org/jboss/forge/furnace/mocks/QualifiedPlainBean.java

@@ -14,5 +14,10 @@
 @PlainQualifier
 public class QualifiedPlainBean implements PlainInterface
 {
+   @Override
+   public String getValue()
+   {
+      return null;
+   }
 
 }

tests/src/main/java/test/org/jboss/forge/furnace/mocks/services/ProducesPlainInterfaceService.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2014 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package test.org.jboss.forge.furnace.mocks.services;
+
+import javax.enterprise.inject.Produces;
+
+import test.org.jboss.forge.furnace.mocks.PlainInterface;
+
+/**
+ * 
+ * @author <a href="ggastald@redhat.com">George Gastaldi</a>
+ */
+public class ProducesPlainInterfaceService
+{
+   @Produces
+   public PlainInterface produceRawType()
+   {
+      return new PlainInterface()
+      {
+         @Override
+         public String getValue()
+         {
+            return "Produced";
+         }
+      };
+   }
+}

tests/src/test/java/test/org/jboss/forge/furnace/services/ProducerTest.java

@@ -0,0 +1,68 @@
+/**
+ * Copyright 2014 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package test.org.jboss.forge.furnace.services;
+
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.forge.arquillian.AddonDependency;
+import org.jboss.forge.arquillian.Dependencies;
+import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.furnace.addons.AddonRegistry;
+import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
+import org.jboss.forge.furnace.services.Imported;
+import org.jboss.forge.furnace.spi.ServiceRegistry;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import test.org.jboss.forge.furnace.mocks.PlainInterface;
+import test.org.jboss.forge.furnace.mocks.services.ProducesPlainInterfaceService;
+
+/**
+ * 
+ * @author <a href="ggastald@redhat.com">George Gastaldi</a>
+ */
+@RunWith(Arquillian.class)
+public class ProducerTest
+{
+   @Deployment
+   @Dependencies({
+            @AddonDependency(name = "org.jboss.forge.furnace.container:cdi")
+   })
+   public static ForgeArchive getDeployment()
+   {
+      ForgeArchive archive = ShrinkWrap
+               .create(ForgeArchive.class)
+               .addBeansXML()
+               .addClasses(PlainInterface.class, ProducesPlainInterfaceService.class)
+               .addAsAddonDependencies(
+                        AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi")
+               );
+      return archive;
+   }
+
+   @Inject
+   AddonRegistry addonRegistry;
+
+   @Inject
+   ServiceRegistry serviceRegistry;
+
+   @Test
+   public void testProducer()
+   {
+      Assert.assertTrue(serviceRegistry.hasService(PlainInterface.class));
+      Imported<PlainInterface> services = addonRegistry.getServices(PlainInterface.class);
+      Assert.assertFalse(services.isUnsatisfied());
+      Assert.assertFalse(services.isAmbiguous());
+      PlainInterface pi = services.get();
+      Assert.assertEquals("Produced", pi.getValue());
+   }
+}