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 21:25:46 UTC
svn commit: r882987 -
/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/
Author: aadamchik
Date: Sat Nov 21 20:25:45 2009
New Revision: 882987
URL: http://svn.apache.org/viewvc?rev=882987&view=rev
Log:
playing with DI ideas
* refactoring
Removed:
cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/KeyGenerator.java
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/DIUtil.java
cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.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/DefaultListBuilder.java
cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java
cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/FieldInjectingProvider.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=882987&r1=882986&r2=882987&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 20:25:45 2009
@@ -125,7 +125,7 @@
}
else if (Provider.class.equals(parameter)) {
- Class<?> objectClass = DIUtil.getParameterClass(genericTypes[i]);
+ Class<?> objectClass = DIUtil.parameterClass(genericTypes[i]);
if (objectClass == null) {
String message = String.format(
Modified: cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DIUtil.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DIUtil.java?rev=882987&r1=882986&r2=882987&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DIUtil.java (original)
+++ cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DIUtil.java Sat Nov 21 20:25:45 2009
@@ -23,7 +23,11 @@
class DIUtil {
- static Class<?> getParameterClass(Type type) {
+ static String toKey(Class<?> type) {
+ return "class:" + type.getName();
+ }
+
+ static Class<?> parameterClass(Type type) {
if (type instanceof ParameterizedType) {
ParameterizedType parameterizedType = (ParameterizedType) type;
Modified: cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java?rev=882987&r1=882986&r2=882987&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java (original)
+++ cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultBindingBuilder.java Sat Nov 21 20:25:45 2009
@@ -34,7 +34,7 @@
DefaultBindingBuilder(Class<T> interfaceType, DefaultInjector injector) {
this.interfaceType = interfaceType;
this.injector = injector;
- this.key = KeyGenerator.toKey(interfaceType);
+ this.key = DIUtil.toKey(interfaceType);
}
public BindingBuilder<T> to(Class<? extends T> implementation) throws DIException {
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=882987&r1=882986&r2=882987&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 20:25:45 2009
@@ -74,7 +74,7 @@
throw new NullPointerException("Null type");
}
- String key = KeyGenerator.toKey(type);
+ String key = DIUtil.toKey(type);
ListProvider provider = listConfigurations.get(key);
if (provider == null) {
@@ -92,7 +92,7 @@
throw new NullPointerException("Null type");
}
- String key = KeyGenerator.toKey(type);
+ String key = DIUtil.toKey(type);
MapProvider provider = mapConfigurations.get(key);
if (provider == null) {
@@ -109,7 +109,7 @@
throw new NullPointerException("Null type");
}
- String key = KeyGenerator.toKey(type);
+ String key = DIUtil.toKey(type);
Provider<T> provider = (Provider<T>) bindings.get(key);
if (provider == null) {
Modified: cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java?rev=882987&r1=882986&r2=882987&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java (original)
+++ cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultListBuilder.java Sat Nov 21 20:25:45 2009
@@ -28,7 +28,7 @@
DefaultListBuilder(Class<T> implementationType, DefaultInjector injector) {
this.injector = injector;
- implementationTypeKey = KeyGenerator.toKey(implementationType);
+ implementationTypeKey = DIUtil.toKey(implementationType);
}
public <E> ListBuilder<T> add(Class<? extends E> interfaceType) throws DIException {
Modified: cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java?rev=882987&r1=882986&r2=882987&view=diff
==============================================================================
--- cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java (original)
+++ cayenne/sandbox/cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultMapBuilder.java Sat Nov 21 20:25:45 2009
@@ -28,7 +28,7 @@
DefaultMapBuilder(Class<T> implementationType, DefaultInjector injector) {
this.injector = injector;
- implementationTypeKey = KeyGenerator.toKey(implementationType);
+ implementationTypeKey = DIUtil.toKey(implementationType);
}
public <E> MapBuilder<T> put(String key, Class<? extends E> interfaceType)
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=882987&r1=882986&r2=882987&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 20:25:45 2009
@@ -81,7 +81,7 @@
if (Provider.class.equals(fieldType)) {
- Class<?> objectClass = DIUtil.getParameterClass(field
+ Class<?> objectClass = DIUtil.parameterClass(field
.getGenericType());
if (objectClass == null) {