X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fcdi%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fcdi%2FCdiInjectorFactory.java;h=c41f2d9863b7040a1b2497bdeb1e1d529095e518;hb=1440f7475e4a7d3ae9e6e756b3a58572a57e9521;hp=74d1a669227a8b3d393504813cec02007939cd2d;hpb=cbb032a4e384ae54d9c7f5f42758622f53a17bb7;p=utils

diff --git a/support/cdi/src/main/java/org/wamblee/cdi/CdiInjectorFactory.java b/support/cdi/src/main/java/org/wamblee/cdi/CdiInjectorFactory.java
index 74d1a669..c41f2d98 100644
--- a/support/cdi/src/main/java/org/wamblee/cdi/CdiInjectorFactory.java
+++ b/support/cdi/src/main/java/org/wamblee/cdi/CdiInjectorFactory.java
@@ -19,6 +19,9 @@ import java.util.logging.Logger;
 
 import javax.enterprise.inject.spi.BeanManager;
 
+import org.wamblee.inject.Injector;
+import org.wamblee.inject.InjectorFactory;
+
 /**
  * Factory that creates CDI injectors. In case no beanmanager is found then
  * injectors will do nothing. This class may be subclassed for testing to
@@ -32,9 +35,11 @@ public class CdiInjectorFactory implements InjectorFactory {
         .getLogger(CdiInjectorFactory.class.getName());
 
     private BeanManager beanManager;
-
+    
     /**
-     * Constructs the factory using the default bean manager.
+     * Constructs the factory using a default bean manager. 
+     * 
+     * @throws IllegalArgumentException If bean manager is null. 
      */
     public CdiInjectorFactory() {
         this(BeanManagerLookup.lookup());
@@ -44,22 +49,17 @@ public class CdiInjectorFactory implements InjectorFactory {
      * Constructs the factory using an explicit bean manager.
      * 
      * @param aBeanManager
+     * @throws IllegalArgumentException If bean manager is null. 
      */
     public CdiInjectorFactory(BeanManager aBeanManager) {
+        if ( aBeanManager == null ) { 
+            throw new IllegalArgumentException("Bean manager is null");
+        }
         beanManager = aBeanManager;
     }
 
     @Override
     public Injector create(Class aClass) {
-        if (beanManager == null) {
-            // Typically for unit test.
-            return new Injector() {
-                @Override
-                public void inject(Object aComponent) {
-                    // Empty.
-                }
-            };
-        }
         return new CdiInjector(beanManager, aClass);
     }