[dependency-shot] r398 committed - Change exceptions management
depende...@googlecode.com
Author: mathieuancelin
Date: Fri Mar 25 08:27:41 2011
Log: Change exceptions management
http://code.google.com/p/dependency-shot/source/detail?r=398
Modified:
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/DependencyShot.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/event/AutoEvent.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/event/EventImpl.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/exceptions/ExceptionManager.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/graph/Binder.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/graph/Binding.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/InjectorImpl.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/handlers/CircularConstructorHandler.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/handlers/ConstructorHandler.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/handlers/FieldsHandler.java
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/spi/DSServiceLoader.java
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/DependencyShot.java
Thu Mar 17 12:21:53 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/DependencyShot.java
Fri Mar 25 08:27:41 2011
@@ -138,9 +138,8 @@
return handler;
}
}
- ExceptionManager.makeException("Can't find a specific
configuration handler for : "
- + confHandler.getSimpleName()).throwManaged();
- throw new RuntimeException(); // should never happen
+ throw ExceptionManager.makeException("Can't find a specific
configuration handler for : "
+ + confHandler.getSimpleName()).get();
}
/**
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/event/AutoEvent.java
Thu Mar 17 12:21:53 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/event/AutoEvent.java
Fri Mar 25 08:27:41 2011
@@ -51,20 +51,18 @@
public void fire() {
if (manager == null) {
- ExceptionManager
+ throw ExceptionManager
.makeException("You should inject the event in order
to call fire on it.")
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
manager.fireEvent(this);
}
public void fireAsync() {
if (manager == null) {
- ExceptionManager
+ throw ExceptionManager
.makeException("You should inject the event in order
to call fire on it.")
- .throwManaged();
- throw new RuntimeException();
+ .get();
}
manager.fireAsyncEvent(this);
}
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/event/EventImpl.java
Fri Mar 25 08:27:23 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/event/EventImpl.java
Fri Mar 25 08:27:41 2011
@@ -34,10 +34,9 @@
@Override
public void fire(T event) {
if (manager == null) {
- ExceptionManager
+ throw ExceptionManager
.makeException("You should inject the event in order
to call fire on it.")
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
manager.fireEvent(event);
}
@@ -45,10 +44,9 @@
@Override
public void fireAsync(T event) {
if (manager == null) {
- ExceptionManager
+ throw ExceptionManager
.makeException("You should inject the event in order
to call fire on it.")
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
manager.fireAsyncEvent(event);
}
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/exceptions/ExceptionManager.java
Sat Mar 12 14:15:30 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/exceptions/ExceptionManager.java
Fri Mar 25 08:27:41 2011
@@ -78,8 +78,12 @@
uuid = UUID.randomUUID().toString();
}
- public void throwManaged() throws RuntimeException {
- throw new ExceptionManagedException(this);
+// public void throwManaged() throws RuntimeException {
+// throw new ExceptionManagedException(this);
+// }
+
+ public ExceptionManagedException get() {
+ return new ExceptionManagedException(this);
}
public void setT(Throwable t) {
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/graph/Binder.java
Sun Mar 20 09:48:53 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/graph/Binder.java
Fri Mar 25 08:27:41 2011
@@ -110,10 +110,9 @@
}
Binding<?> old = bindings.put(binding, binding);
if (old != null) {
- ExceptionManager
+ throw ExceptionManager
.makeException(IllegalArgumentException.class, binding
+ " overwrites " + old)
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
}
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/graph/Binding.java
Thu Mar 17 12:21:53 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/graph/Binding.java
Fri Mar 25 08:27:41 2011
@@ -131,10 +131,9 @@
this.from = (Class<T>) params.get(DslConstants.FROM);
this.to = (Class<T>) params.get(DslConstants.FROM);
} else {
- ExceptionManager
+ throw ExceptionManager
.makeException(DSIllegalStateException.class, "A
binding must contains a 'from' class.")
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
if (params.containsKey(DslConstants.TO)) {
this.to = (Class<? extends T>) params.get(DslConstants.TO);
@@ -261,12 +260,11 @@
result = (T)
injector.getScopeHandler(scope).getScopedInstance(from, to, point,
injector);
}
} else {
- ExceptionManager
+ throw ExceptionManager
.makeException(DSIllegalStateException.class,
"The scope " +
scopedInstanceStore.getClass().getSimpleName()
+ " is invalid. Can't perform injection.")
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
} else {
result = (T) injector.createInstance(to);
@@ -282,13 +280,12 @@
}
}
if (!nullable) {
- ExceptionManager
+ throw ExceptionManager
.makeException(NullInjectionException.class,
"Could not get a "
+ to
+ ". Can't inject object with null value. For
that use @Nullable annotation.")
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
}
if (!nullable) {
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/InjectorImpl.java
Sun Mar 20 09:48:53 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/InjectorImpl.java
Fri Mar 25 08:27:41 2011
@@ -157,10 +157,9 @@
Logger.getLogger(InjectorImpl.class.getName()).
log(Level.SEVERE, "Ooops, no bindings
presents, "
+ "can't inject your app ...");
- ExceptionManager
+ throw ExceptionManager
.makeException("No bindings loaded")
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
}
}
@@ -325,11 +324,10 @@
if (b != null) {
return b;
}
- ExceptionManager
+ throw ExceptionManager
.makeException(IllegalStateException.class,
"No binding for " + c + " and " + annotation)
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
//throw new IllegalStateException("No binding for " + c + " and "
+ annotation);
}
@@ -408,8 +406,7 @@
}
return result;
} catch (Exception e) {
- ExceptionManager.makeException(e).throwManaged();
- throw new DSException(e);
+ throw ExceptionManager.makeException(e).get();
}
} else {
if (allowCircularDependencies ||
ReflectionUtil.isSingleton(c)) {
@@ -424,10 +421,9 @@
instanciatedClasses.put(c, instance);
}
if (!actualFromClass.isInterface() &&
instanciatedClasses.get(c) == null) {
- ExceptionManager
+ throw ExceptionManager
.makeException("Can't proxy circular
dependencies without interface.")
- .throwManaged();
- throw new RuntimeException(); // should never
happen
+ .get();
}
try {
Object result = (T) instanciatedClasses.get(c);
@@ -448,11 +444,10 @@
circularClasses.remove(c);
}
} else {
- ExceptionManager
+ throw ExceptionManager
.makeException(DSCyclicDependencyDetectedException.class,
"Circular dependency detected on " +
c.getName())
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
}
}
@@ -483,8 +478,7 @@
eventManager.fireAsyncEvent(stop);
return result;
} catch (Exception e) {
- ExceptionManager.makeException(e).throwManaged();
- throw new DSException(e);
+ throw ExceptionManager.makeException(e).get();
}
}
@@ -506,12 +500,11 @@
classHandler.classInjection(null, c, emptyList, true, this);
} catch (Exception e) {
if (e instanceof ExceptionManagedException) {
- ExceptionManager.makeException(e).throwManaged();
- }
- ExceptionManager
+ throw ExceptionManager.makeException(e).get();
+ }
+ throw ExceptionManager
.makeException("Could not inject static members for "
+ c, e)
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
eventManager.fireAsyncEvent(stop);
return this;
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/handlers/CircularConstructorHandler.java
Thu Mar 17 12:22:20 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/handlers/CircularConstructorHandler.java
Fri Mar 25 08:27:41 2011
@@ -77,9 +77,8 @@
return ReflectionUtil.invokeConstructor(constructor, c,
arguments);
}
}
- ExceptionManager
+ throw ExceptionManager
.makeException("Could not find @Inject constructor for " +
c)
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
}
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/handlers/ConstructorHandler.java
Thu Mar 17 12:22:20 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/handlers/ConstructorHandler.java
Fri Mar 25 08:27:41 2011
@@ -78,9 +78,8 @@
return ReflectionUtil.invokeConstructor(constructor, c,
arguments);
}
}
- ExceptionManager
+ throw ExceptionManager
.makeException("Could not find @Inject constructor for " +
c)
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
}
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/handlers/FieldsHandler.java
Fri Mar 25 08:27:23 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/injection/handlers/FieldsHandler.java
Fri Mar 25 08:27:41 2011
@@ -62,10 +62,9 @@
&& (staticInjection ==
Modifier.isStatic(field.getModifiers()))) {
// check if the field is not final
if (Modifier.isFinal(field.getModifiers())) {
- ExceptionManager
+ throw ExceptionManager
.makeException("Cannot inject final field")
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
Class<?> type = field.getType();
Type genericType = field.getGenericType();
=======================================
---
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/spi/DSServiceLoader.java
Fri Mar 25 08:27:23 2011
+++
/trunk/dependency-shot-core/src/main/java/cx/ath/mancel01/dependencyshot/spi/DSServiceLoader.java
Fri Mar 25 08:27:41 2011
@@ -52,10 +52,9 @@
return new DSServiceLoader(interf, loadFromServices(interf));
} catch (Exception ex) {
logger.log(Level.SEVERE, null, ex);
- ExceptionManager
+ throw ExceptionManager
.makeException("Error while loading services : ", ex)
- .throwManaged();
- throw new RuntimeException(); // should never happen
+ .get();
}
}