git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
support
/
cdi
/
src
/
main
/
java
/
org
/
wamblee
/
cdi
/
CdiInjectorFactory.java
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 74d1a669227a8b3d393504813cec02007939cd2d..c41f2d9863b7040a1b2497bdeb1e1d529095e518 100644
(file)
--- 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 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
/**
* 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;
.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());
*/
public CdiInjectorFactory() {
this(BeanManagerLookup.lookup());
@@
-44,22
+49,17
@@
public class CdiInjectorFactory implements InjectorFactory {
* Constructs the factory using an explicit bean manager.
*
* @param aBeanManager
* Constructs the factory using an explicit bean manager.
*
* @param aBeanManager
+ * @throws IllegalArgumentException If bean manager is null.
*/
public CdiInjectorFactory(BeanManager aBeanManager) {
*/
public CdiInjectorFactory(BeanManager aBeanManager) {
+ if ( aBeanManager == null ) {
+ throw new IllegalArgumentException("Bean manager is null");
+ }
beanManager = aBeanManager;
}
@Override
public Injector create(Class aClass) {
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);
}
return new CdiInjector(beanManager, aClass);
}