Author: jochen
Date: Wed Nov 5 14:40:00 2014
New Revision: 1636881
URL: http://svn.apache.org/r1636881
Log:
- Initial work on the Javadocs.
- A binding for the IInjector is now created automatically.
Modified:
commons/sandbox/commons-inject/trunk/pom.xml
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/AbstractLoggerInjectingModule.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsInject.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsLoggingLoggerModule.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IBinding.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjector.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjectorBuilder.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IKey.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4j2LoggerModule.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4jLoggerModule.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Slf4JLoggerModule.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/BindingProxy.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjector.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjectorBuilder.java
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/ResolvableBindingSet.java
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/SimpleInjectorTest.java
Modified: commons/sandbox/commons-inject/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/pom.xml?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
--- commons/sandbox/commons-inject/trunk/pom.xml (original)
+++ commons/sandbox/commons-inject/trunk/pom.xml Wed Nov 5 14:40:00 2014
@@ -130,6 +130,12 @@
<version>1.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<developers>
<developer>
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/AbstractLoggerInjectingModule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/AbstractLoggerInjectingModule.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/AbstractLoggerInjectingModule.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/AbstractLoggerInjectingModule.java
Wed Nov 5 14:40:00 2014
@@ -26,6 +26,20 @@ import org.apache.commons.inject.api.bin
import org.apache.commons.inject.api.bind.IBinder.IInjectionParticipator;
import org.apache.commons.inject.util.Exceptions;
+/**
+ * Abstract implementation of a module, which injects loggers into fields.
+ * The field must be annotated like this:
+ * <pre>
+ * @InjLogger private Logger log;
+ * </pre>
+ * or
+ * <pre>
+ * @InjLogger(id="LoggerId") private Logger log;
+ * </pre>
+ * The second example would create a logger with the id "LoggerId". The first
+ * example would use the class name as a default value. (The class being that
+ * class, which declares the field.
+ */
public abstract class AbstractLoggerInjectingModule<Log> implements IModule {
@Override
@@ -65,12 +79,24 @@ public abstract class AbstractLoggerInje
});
}
+ /**
+ * Creates a new logger with the given Id. Subclasses <em>must</em>
+ * overwrite this to return a suitable logger implementation.
+ */
protected abstract Log newLogger(String pId);
+ /**
+ * Returns the annotation class, which denotes suitable target fields.
+ * By default, the class {@link InjLogger} is used.
+ */
protected Class<? extends Annotation> getAnnotationClass() {
return InjLogger.class;
}
+ /**
+ * Called to calculate the Id, which is used to invoke {@link
#newLogger(String)}.
+ * By default, {@link InjLogger#name()} is returned.
+ */
protected String getId(Annotation pAnnotation, Class<?> pClass) {
final InjLogger injLogger = (InjLogger) pAnnotation;
final String id = injLogger.id();
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsInject.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsInject.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsInject.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsInject.java
Wed Nov 5 14:40:00 2014
@@ -22,7 +22,18 @@ import java.util.Collection;
import org.apache.commons.inject.api.bind.IModule;
import org.apache.commons.inject.impl.DefaultInjectorBuilder;
+/**
+ * This class provides the anchor point to create {@link IInjector injectors}
via
+ * factory methods.
+ */
public class CommonsInject {
+ /**
+ * Creates a new {@link IInjector injector}, which is configured by
invoking
+ * the given modules.
+ * @param pModules The modules, which provide the injectors bindings.
+ * @return A new {@link IInjector injector}.
+ * @see #build(Collection)
+ */
public static IInjector build(IModule... pModules) {
if (pModules == null) {
throw new NullPointerException("The module list must
not be null.");
@@ -30,6 +41,13 @@ public class CommonsInject {
final Collection<IModule> modules = Arrays.asList(pModules);
return build(modules);
}
+ /**
+ * Creates a new {@link IInjector injector}, which is configured by
invoking
+ * the given modules.
+ * @param pModules The modules, which provide the injectors bindings.
+ * @return A new {@link IInjector injector}.
+ * @see #build(IModule...)
+ */
public static IInjector build(Collection<IModule> pModules) {
if (pModules == null) {
throw new NullPointerException("The module list must
not be null.");
@@ -39,6 +57,15 @@ public class CommonsInject {
}
return new DefaultInjectorBuilder(pModules).build();
}
+ /**
+ * An alternative to {@link #build(IModule...)}, which provides
additional
+ * control on the injectors configuration. Rather than directly
returning
+ * an {@link IInjector injector}, this method returns an {@link
IInjectorBuilder
+ * injector builder}.
+ * @return A new {@link IInjectorBuilder injector builder}.
+ * @see #build(IModule...)
+ * @see #build(Collection)
+ */
public static IInjectorBuilder newBuilder() {
return new DefaultInjectorBuilder();
}
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsLoggingLoggerModule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsLoggingLoggerModule.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsLoggingLoggerModule.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/CommonsLoggingLoggerModule.java
Wed Nov 5 14:40:00 2014
@@ -16,10 +16,27 @@
*/
package org.apache.commons.inject.api;
+import org.apache.commons.inject.api.bind.IModule;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+/**
+ * A {@link IModule module}, which injects Commons Logging Loggers, aka
instances of
+ * {@link Log}.
+ * If you are using the module, it should precede all others in your module
list,
+ * when invoking {@link
CommonsInject#build(org.apache.commons.inject.api.bind.IModule...)},
+ * or {@link CommonsInject#build(java.util.Collection)}. However, the
+ * {@link PostConstructModule} takes precedence, if you are using that as well.
+ * @see Log4jLoggerModule
+ * @see Slf4JLoggerModule
+ * @see Log4j2LoggerModule
+ * @see AbstractLoggerInjectingModule
+ */
public class CommonsLoggingLoggerModule extends
AbstractLoggerInjectingModule<Log> {
+ /**
+ * Creates an instance of {@link Log}.
+ */
@Override
protected Log newLogger(String pId) {
return LogFactory.getLog(pId);
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IBinding.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IBinding.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IBinding.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IBinding.java
Wed Nov 5 14:40:00 2014
@@ -16,7 +16,19 @@
*/
package org.apache.commons.inject.api;
+/**
+ * A {@link IBinding binding} contains the information necessary to
+ * have the {@link IInjector injector} create a POJO.
+ */
public interface IBinding<T> {
+ /**
+ * Returns the {@link IProvider provider}, which can be used to create
+ * the instance.
+ */
IProvider<T> getProvider();
+ /**
+ * Returns the {@link IPoint point}, which can be used to inject members
+ * into an instance that has been created previously.
+ */
IPoint<T> getPoint();
}
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjector.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjector.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjector.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjector.java
Wed Nov 5 14:40:00 2014
@@ -16,14 +16,125 @@
*/
package org.apache.commons.inject.api;
+/**
+ * The {@link IInjector injector} is used to build objects for your
application.
+ * It does so by maintaining a map of {@link IKey keys} and associated
+ * {@link IBinding bindings}. The map is created by {@link IModule modules}.
+ *
+ * Some bindings are present automatically:
+ * - The {@link Injector} itself.
+ * - For any {@link IBinding IBinding<T>} (binding of type T), there is also
+ * a {@link IProvider provider} of type T.
+ *
+ * To create an {@link IInjector injector}, use the class {@link
CommonsInject}.
+ */
public interface IInjector {
+ /**
+ * Returns an instance of {@code pType}, if a matching binding is
present.
+ * This is a shortcut for
+ * <pre>
+ * getInstance(pType, "")
+ * </pre>
+ * or
+ * <pre>
+ * getInstance(pType, Key.NO_NAME)
+ * </pre>
+ * @param pType The requested type.
+ * @return The created instance, or null.
+ * @see #getInstance(Class, String)
+ * @see #getInstance(IKey)
+ * @see #requireInstance(Class)
+ */
<T> T getInstance(Class<T> pType);
+ /**
+ * Returns an instance of the given type, with the given name, if a
+ * matching binding is present. This is a shortcut for
+ * <pre>
+ * Key key = new Key(pType, pName);
+ * getInstance(key)
+ * </pre>
+ * or
+ * <pre>
+ * Key key = new Key(pType, pName, Key.NO_ANNOTATIONS);
+ * getInstance(key)
+ * </pre>
+ * @param pType The requested type.
+ * @param pName The requested objects name.
+ * @return The created instance, or null.
+ * @see #getInstance(IKey)
+ * @see #requireInstance(Class, String)
+ */
<T> T getInstance(Class<T> pType, String pName);
+ /**
+ * Returns an instance of the binding that has been registered for the
+ * given key.
+ * @param pKey A binding key, for which a binding has been registered.
+ * @return The created instance, or null.
+ * @see #getInstance(Class)
+ * @see #getInstance(Class, String)
+ * @see #requireInstance(IKey)
+ */
<T> T getInstance(IKey<T> pKey);
+ /**
+ * Returns an instance of {@code pType}, if a matching binding is
present.
+ * This is a shortcut for
+ * <pre>
+ * requireInstance(pType, "")
+ * </pre>
+ * or
+ * <pre>
+ * requireInstance(pType, Key.NO_NAME)
+ * </pre>
+ * @param pType The requested type.
+ * @return The created instance.
+ * @throws NoSuchBindingException No matching binding has been
registered with
+ * the injector.
+ * @see #getInstance(Class, String)
+ * @see #getInstance(IKey)
+ * @see #requireInstance(Class)
+ */
<T> T requireInstance(Class<T> pType) throws NoSuchBindingException;
+ /**
+ * Returns an instance of the given type, with the given name, if a
+ * matching binding is present. This is a shortcut for
+ * <pre>
+ * Key key = new Key(pType, pName);
+ * requireInstance(key)
+ * </pre>
+ * or
+ * <pre>
+ * Key key = new Key(pType, pName, Key.NO_ANNOTATIONS);
+ * requireInstance(key)
+ * </pre>
+ * @param pType The requested type.
+ * @param pName The requested objects name.
+ * @return The created instance.
+ * @throws NoSuchBindingException No matching binding has been
registered with
+ * the injector.
+ * @see #getInstance(Class, String)
+ * @see #requireInstance(Class)
+ * @see #requireInstance(IKey)
+ */
<T> T requireInstance(Class<T> pType, String pName) throws
NoSuchBindingException;
+ /**
+ * Returns an instance of the binding that has been registered for the
+ * given key.
+ * @param pKey A binding key, for which a binding has been registered.
+ * @return The created instance.
+ * @throws NoSuchBindingException No matching binding has been
registered with
+ * the injector.
+ * @see #getInstance(IKey)
+ * @see #requireInstance(Class)
+ * @see #requireInstance(Class, String)
+ */
<T> T requireInstance(IKey<T> pKey) throws NoSuchBindingException;
+ /**
+ * Injects members into the given instance, as if it where created by
+ * the {@link IInjector injector} itself. In other words, fills fields
+ * and invokes methods annotated with @Inject, assuming that a binding
+ * is present for those fields, and method parameters.
+ */
void injectMembers(Object pInstance);
}
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjectorBuilder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjectorBuilder.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjectorBuilder.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IInjectorBuilder.java
Wed Nov 5 14:40:00 2014
@@ -20,6 +20,9 @@ import java.util.Collection;
import org.apache.commons.inject.api.bind.IModule;
+/**
+ * Interface of an object, which creates injectors.
+ */
public interface IInjectorBuilder {
IInjectorBuilder modules(IModule... pModules);
IInjectorBuilder modules(Collection<IModule> pModules);
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IKey.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IKey.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IKey.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/IKey.java
Wed Nov 5 14:40:00 2014
@@ -18,6 +18,9 @@ package org.apache.commons.inject.api;
import java.lang.annotation.Annotation;
+/**
+ * A binding key is used to query objects
+ */
public interface IKey<T> {
Class<T> getType();
String getName();
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4j2LoggerModule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4j2LoggerModule.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4j2LoggerModule.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4j2LoggerModule.java
Wed Nov 5 14:40:00 2014
@@ -21,14 +21,21 @@ import org.apache.logging.log4j.Logger;
/**
- * A {@link IModule module}, which injects Log4J 2 Loggers, aka instances of
+ * A {@link IModule module}, which injects Log4J 2 loggers, aka instances of
* {@link Logger}.
* If you are using the module, it should precede all others in your module
list,
* when invoking {@link
CommonsInject#build(org.apache.commons.inject.api.bind.IModule...)},
* or {@link CommonsInject#build(java.util.Collection)}. However, the
* {@link PostConstructModule} takes precedence, if you are using that as well.
+ * @see Log4jLoggerModule
+ * @see Slf4JLoggerModule
+ * @see CommonsLoggingLoggerModule
+ * @see AbstractLoggerInjectingModule
*/
public class Log4j2LoggerModule extends AbstractLoggerInjectingModule<Logger> {
+ /**
+ * Creates an instance of {@link Logger}.
+ */
@Override
protected Logger newLogger(String pId) {
return LogManager.getLogger(pId);
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4jLoggerModule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4jLoggerModule.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4jLoggerModule.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Log4jLoggerModule.java
Wed Nov 5 14:40:00 2014
@@ -18,7 +18,22 @@ package org.apache.commons.inject.api;
import org.apache.log4j.Logger;
+/**
+ * A {@link IModule module}, which injects Log4J loggers, aka instances of
+ * {@link Logger}.
+ * If you are using the module, it should precede all others in your module
list,
+ * when invoking {@link
CommonsInject#build(org.apache.commons.inject.api.bind.IModule...)},
+ * or {@link CommonsInject#build(java.util.Collection)}. However, the
+ * {@link PostConstructModule} takes precedence, if you are using that as well.
+ * @see Log4j2LoggerModule
+ * @see Slf4JLoggerModule
+ * @see CommonsLoggingLoggerModule
+ * @see AbstractLoggerInjectingModule
+ */
public class Log4jLoggerModule extends AbstractLoggerInjectingModule<Logger> {
+ /**
+ * Creates an instance of {@link Logger}.
+ */
@Override
protected Logger newLogger(String pId) {
return Logger.getLogger(pId);
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Slf4JLoggerModule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Slf4JLoggerModule.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Slf4JLoggerModule.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/Slf4JLoggerModule.java
Wed Nov 5 14:40:00 2014
@@ -19,7 +19,22 @@ package org.apache.commons.inject.api;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * A {@link IModule module}, which injects SLF4J loggers, aka instances of
+ * {@link Logger}.
+ * If you are using the module, it should precede all others in your module
list,
+ * when invoking {@link
CommonsInject#build(org.apache.commons.inject.api.bind.IModule...)},
+ * or {@link CommonsInject#build(java.util.Collection)}. However, the
+ * {@link PostConstructModule} takes precedence, if you are using that as well.
+ * @see Log4jLoggerModule
+ * @see Slf4JLoggerModule
+ * @see CommonsLoggingLoggerModule
+ * @see AbstractLoggerInjectingModule
+ */
public class Slf4JLoggerModule extends AbstractLoggerInjectingModule<Logger> {
+ /**
+ * Creates an instance of {@link Logger}.
+ */
@Override
protected Logger newLogger(String pId) {
return LoggerFactory.getLogger(pId);
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/BindingProxy.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/BindingProxy.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/BindingProxy.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/BindingProxy.java
Wed Nov 5 14:40:00 2014
@@ -24,12 +24,21 @@ import org.apache.commons.inject.api.IPr
public class BindingProxy<T> implements IBinding<T>, IInjectorAware {
private IBinding<T> binding;
private boolean initialized;
+ private boolean isResolvedLater;
private final String cause;
private final RuntimeException rte = new RuntimeException();
public BindingProxy(String pCause) {
cause = pCause;
}
+
+ public boolean isResolvedLater() {
+ return isResolvedLater;
+ }
+
+ public void setResolvedLater(boolean pResolvedLater) {
+ isResolvedLater = pResolvedLater;
+ }
@Override
public synchronized IProvider<T> getProvider() {
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjector.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjector.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjector.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjector.java
Wed Nov 5 14:40:00 2014
@@ -27,7 +27,7 @@ import org.apache.commons.inject.impl.bi
public class DefaultInjector extends AbstractInjector {
private final ImmutableBindingSet bindings;
-
+
public DefaultInjector(ImmutableBindingSet pBindings) {
bindings = pBindings;
}
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjectorBuilder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjectorBuilder.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjectorBuilder.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/DefaultInjectorBuilder.java
Wed Nov 5 14:40:00 2014
@@ -25,6 +25,9 @@ import org.apache.commons.inject.api.IBi
import org.apache.commons.inject.api.IInjector;
import org.apache.commons.inject.api.IInjectorBuilder;
import org.apache.commons.inject.api.IKey;
+import org.apache.commons.inject.api.IPoint;
+import org.apache.commons.inject.api.IProvider;
+import org.apache.commons.inject.api.Key;
import org.apache.commons.inject.api.bind.IAnnotatedBindingBuilder;
import org.apache.commons.inject.api.bind.IBinder;
import org.apache.commons.inject.api.bind.ILinkedBindingBuilder;
@@ -32,6 +35,7 @@ import org.apache.commons.inject.api.bin
import org.apache.commons.inject.api.bind.IBinder.IInjectionListener;
import org.apache.commons.inject.api.bind.IBinder.IInjectionParticipator;
import org.apache.commons.inject.api.bind.IBinder.IInjectorBuildListener;
+import org.apache.commons.inject.impl.bind.DefaultBinding;
import org.apache.commons.inject.impl.bind.DefaultBindingBuilder;
public class DefaultInjectorBuilder implements IInjectorBuilder {
@@ -51,10 +55,36 @@ public class DefaultInjectorBuilder impl
public IInjector build() {
final MutableBindingSet mutableBindings = new
MutableBindingSet();
configure(mutableBindings);
+ final IKey<IInjector> key = new Key<IInjector>(IInjector.class);
+ final BindingProxy<IInjector> bindingProxy =
(BindingProxy<IInjector>) mutableBindings.requireBinding(key, "to create an
automatic binding for an injector.");
+ bindingProxy.setResolvedLater(true);
final ResolvableBindingSet resolvableBindings = new
ResolvableBindingSet(mutableBindings);
resolve(resolvableBindings);
final ImmutableBindingSet immutableBindings = new
ImmutableBindingSet(resolvableBindings);
final DefaultInjector injector = new
DefaultInjector(immutableBindings);
+ final IProvider<IInjector> provider = new
IProvider<IInjector>(){
+ @Override
+ public IInjector get() {
+ return injector;
+ }
+
+ @Override
+ public Class<? extends IInjector> getType() {
+ return injector.getClass();
+ }
+
+ @Override
+ public IInjector get(IInjector pInjector) {
+ return get();
+ }
+ };
+ final IPoint<IInjector> point = new IPoint<IInjector>(){
+ @Override
+ public void injectTo(IInjector pInstance, IInjector
pInjector) {
+ // Does nothing.
+ }
+ };
+ bindingProxy.setBinding(new DefaultBinding<IInjector>(provider,
point));
for (IBinding<?> binding : immutableBindings.getAllBindings()) {
if (binding instanceof IInjectorAware) {
((IInjectorAware) binding).init(injector);
Modified:
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/ResolvableBindingSet.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/ResolvableBindingSet.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/ResolvableBindingSet.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/impl/ResolvableBindingSet.java
Wed Nov 5 14:40:00 2014
@@ -36,6 +36,9 @@ public class ResolvableBindingSet extend
if (binding instanceof BindingProxy) {
@SuppressWarnings("unchecked")
final BindingProxy<Object> bnd =
(BindingProxy<Object>) binding;
+ if (bnd.isResolvedLater()) {
+ continue;
+ }
@SuppressWarnings("unchecked")
final IBinding<Object> realBinding =
(IBinding<Object>) findRealBinding(list, bak.getKey());
if (realBinding == null) {
Modified:
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/SimpleInjectorTest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/SimpleInjectorTest.java?rev=1636881&r1=1636880&r2=1636881&view=diff
==============================================================================
---
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/SimpleInjectorTest.java
(original)
+++
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/SimpleInjectorTest.java
Wed Nov 5 14:40:00 2014
@@ -71,6 +71,13 @@ public class SimpleInjectorTest {
}
@Test
+ public void testAutomaticInjectorBinding() throws Exception {
+ final IInjector injector1 = newInjector();
+ final IInjector injector2 =
injector1.requireInstance(IInjector.class);
+ Assert.assertSame(injector1, injector2);
+ }
+
+ @Test
public void testNoBinding() throws Exception {
final IInjector injector = newInjector();
{