You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2009/11/21 22:52:41 UTC
svn commit: r883008 - in
/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi:
ConstructorProvider.java DefaultInjector.java FieldInjectingProvider.java
InjectionStack.java ProviderConstructorProvider.java
Author: aadamchik
Date: Sat Nov 21 21:52:40 2009
New Revision: 883008
URL: http://svn.apache.org/viewvc?rev=883008&view=rev
Log:
playing with DI ideas
refactoring
Modified:
cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorProvider.java
cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java
cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ProviderConstructorProvider.java
Modified: cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorProvider.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorProvider.java?rev=883008&r1=883007&r2=883008&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorProvider.java (original)
+++ cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ConstructorProvider.java Sat Nov 21 21:52:40 2009
@@ -131,7 +131,7 @@
Class<?> objectClass = DIUtil.parameterClass(genericTypes[i]);
if (objectClass == null) {
- throw new DIException("Constrcutor provider parameter %s must be "
+ throw new DIException("Constructor provider parameter %s must be "
+ "parameterized to be usable for injection", parameter
.getName());
}
Modified: cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java?rev=883008&r1=883007&r2=883008&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java (original)
+++ cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultInjector.java Sat Nov 21 21:52:40 2009
@@ -81,10 +81,9 @@
ListProvider provider = listConfigurations.get(key);
if (provider == null) {
- String message = String.format(
+ throw new DIException(
"Type '%s' has no bound list configuration in the DI container.",
type.getName());
- throw new DIException(message);
}
return provider.get();
@@ -99,10 +98,9 @@
MapProvider provider = mapConfigurations.get(key);
if (provider == null) {
- String message = String.format(
+ throw new DIException(
"Type '%s' has no bound map configuration in the DI container.",
type.getName());
- throw new DIException(message);
}
return provider.get();
@@ -117,10 +115,8 @@
Provider<T> provider = (Provider<T>) bindings.get(key);
if (provider == null) {
- String message = String.format(
- "Type '%s' is not bound in the DI container.",
- type.getName());
- throw new DIException(message);
+ throw new DIException("Type '%s' is not bound in the DI container.", type
+ .getName());
}
return provider;
Modified: cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java?rev=883008&r1=883007&r2=883008&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java (original)
+++ cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.java Sat Nov 21 21:52:40 2009
@@ -85,13 +85,10 @@
Class<?> objectClass = DIUtil.parameterClass(field.getGenericType());
if (objectClass == null) {
- String message = String.format(
- "Provider field %s.%s of type %s must be "
- + "parameterized to be usable for injection",
- field.getDeclaringClass().getName(),
- field.getName(),
- fieldType.getName());
- throw new DIException(message);
+ throw new DIException("Provider field %s.%s of type %s must be "
+ + "parameterized to be usable for injection", field
+ .getDeclaringClass()
+ .getName(), field.getName(), fieldType.getName());
}
value = injector.getProvider(objectClass);
Modified: cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java?rev=883008&r1=883007&r2=883008&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java (original)
+++ cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/InjectionStack.java Sat Nov 21 21:52:40 2009
@@ -51,13 +51,11 @@
}
if (localStack.contains(bindingKey)) {
- String message = String
- .format(
- "Circular dependency detected when binding a key \"%s\". Nested keys: %s"
- + ". To resolve it, you should inject a Provider instead of an object.",
- bindingKey,
- localStack);
- throw new DIException(message);
+ throw new DIException(
+ "Circular dependency detected when binding a key \"%s\". Nested keys: %s"
+ + ". To resolve it, you should inject a Provider instead of an object.",
+ bindingKey,
+ localStack);
}
localStack.add(bindingKey);
Modified: cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ProviderConstructorProvider.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ProviderConstructorProvider.java?rev=883008&r1=883007&r2=883008&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ProviderConstructorProvider.java (original)
+++ cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/ProviderConstructorProvider.java Sat Nov 21 21:52:40 2009
@@ -45,7 +45,6 @@
T object = provider.get();
if (object == null) {
-
throw new DIException("Provider '%s' returned null object", providerType
.getName());
}