[picocontainer-scm] [5746] java/2.x/trunk/pico/container/src/test/org/picocontainer/visitors: allow setter injection to be optional too; useful for use with Groovy gen'd classes

Revision 5746
Author paul
Date 2011-01-02 10:12:42 -0600 (Sun, 02 Jan 2011)

Log Message

allow setter injection to be optional too; useful for use with Groovy gen'd classes

Modified Paths

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedMethodInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/Injector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/MultiInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedMethodInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjection.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjector.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/defaults/PicoExceptionsTestCase.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AdaptingInjectionTestCase.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AnnotatedFieldInjectorTestCase.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AnnotatedMethodInjectorTestCase.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectionTestCase.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectorTestCase.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTest.java

Diff

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedMethodInjector.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedMethodInjector.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AnnotatedMethodInjector.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -28,7 +28,7 @@
ComponentMonitor monitor,
Class<? extends Annotation> injectionAnnotation,
boolean useNames) {
- super(key, impl, parameters, monitor, "", "", useNames);
+ super(key, impl, parameters, monitor, "", "", false, useNames);
this.injectionAnnotation = injectionAnnotation;
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/Injector.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/Injector.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/Injector.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -200,7 +200,7 @@
Parameter[] parameters,
ComponentMonitor monitor,
String prefix, boolean useNames) throws AbstractInjector.NotConcreteRegistrationException {
- return monitor.newInjector(new SetterInjector(componentKey, componentImplementation, parameters, monitor, prefix, "", useNames));
+ return monitor.newInjector(new SetterInjector(componentKey, componentImplementation, parameters, monitor, prefix, "", false, useNames));
}

/**

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/MultiInjector.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/MultiInjector.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/MultiInjector.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -22,7 +22,7 @@
ComponentMonitor componentMonitor, String setterPrefix, boolean useNames) {
super(componentKey, componentImplementation, parameters, componentMonitor, useNames,
componentMonitor.newInjector(new ConstructorInjector(componentKey, componentImplementation, parameters, componentMonitor, useNames)),
- componentMonitor.newInjector(new SetterInjector(componentKey, componentImplementation, parameters, componentMonitor, setterPrefix, "", useNames)),
+ componentMonitor.newInjector(new SetterInjector(componentKey, componentImplementation, parameters, componentMonitor, setterPrefix, "", false, useNames)),
componentMonitor.newInjector(new AnnotatedMethodInjector(componentKey, componentImplementation, parameters, componentMonitor, Inject.class, useNames)),
componentMonitor.newInjector(new AnnotatedFieldInjector(componentKey, componentImplementation, parameters, componentMonitor, Inject.class, useNames)));

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedMethodInjector.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedMethodInjector.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/NamedMethodInjector.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -22,8 +22,6 @@
@SuppressWarnings("serial")
public class NamedMethodInjector<T> extends SetterInjector<T> {

- private final boolean optional;
-
public NamedMethodInjector(Object key,
Class<?> impl,
Parameter[] parameters,
@@ -53,8 +51,7 @@
ComponentMonitor monitor,
String prefix,
boolean optional) {
- super(key, impl, parameters, monitor, prefix, "", true);
- this.optional = optional;
+ super(key, impl, parameters, monitor, prefix, "", optional, true);
}

@Override
@@ -68,13 +65,6 @@
}

@Override
- protected void unsatisfiedDependencies(PicoContainer container, Set<Type> unsatisfiableDependencyTypes) {
- if (!optional) {
- super.unsatisfiedDependencies(container, unsatisfiableDependencyTypes);
- }
- }
-
- @Override
public String getDescriptor() {
return "NamedMethodInjection";
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjection.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjection.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjection.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -32,6 +32,7 @@

private final String prefix;
private String notThisOneThough;
+ private boolean optional;

public SetterInjection(String prefix) {
this.prefix = prefix;
@@ -68,7 +69,11 @@
public <T> ComponentAdapter<T> createComponentAdapter(ComponentMonitor monitor, LifecycleStrategy lifecycleStrategy, Properties componentProperties, Object componentKey, Class<T> componentImplementation, Parameter... parameters)
throws PicoCompositionException {
boolean useNames = AbstractBehaviorFactory.arePropertiesPresent(componentProperties, Characteristics.USE_NAMES, true);
- return wrapLifeCycle(monitor.newInjector(new SetterInjector(componentKey, componentImplementation, parameters, monitor, prefix, notThisOneThough != null ? notThisOneThough : "" , useNames)), lifecycleStrategy);
+ return wrapLifeCycle(monitor.newInjector(new SetterInjector(componentKey, componentImplementation, parameters, monitor, prefix, notThisOneThough != null ? notThisOneThough : "", optional, useNames)), lifecycleStrategy);
}

+ public SetterInjection withInjectionOptional() {
+ optional = true;
+ return this;
+ }
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjector.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjector.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/SetterInjector.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -11,12 +11,15 @@

import org.picocontainer.ComponentMonitor;
import org.picocontainer.Parameter;
+import org.picocontainer.PicoContainer;
import org.picocontainer.behaviors.PropertyApplicator;
import org.picocontainer.behaviors.Cached;

import java.lang.reflect.Method;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Type;
+import java.util.Set;

/**
* Instantiates components using empty constructors and
@@ -38,18 +41,21 @@
public class SetterInjector<T> extends IterativeInjector<T> {

protected final String prefix;
+ private final boolean optional;
private final String notThisOneThough;

/**
* Constructs a SetterInjector
*
+ *
* @param componentKey the search key for this implementation
* @param componentImplementation the concrete implementation
* @param parameters the parameters to use for the initialization
* @param monitor the component monitor used by this addAdapter
* @param prefix the prefix to use (e.g. 'set')
* @param notThisOneThough a setter name that's not for injecting through
- * @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException
+ * @param optional not all setters need to be injected
+ * @param useNames @throws org.picocontainer.injectors.AbstractInjector.NotConcreteRegistrationException
* if the implementation is not a concrete class.
* @throws NullPointerException if one of the parameters is <code>null</code>
*/
@@ -57,9 +63,11 @@
final Class componentImplementation,
Parameter[] parameters,
ComponentMonitor monitor,
- String prefix, String notThisOneThough, boolean useNames) throws NotConcreteRegistrationException {
+ String prefix, String notThisOneThough,
+ boolean optional, boolean useNames) throws NotConcreteRegistrationException {
super(componentKey, componentImplementation, parameters, monitor, useNames);
this.prefix = prefix;
+ this.optional = optional;
this.notThisOneThough = notThisOneThough != null ? notThisOneThough : "";
}

@@ -91,5 +99,11 @@
return "SetterInjector-";
}

+ @Override
+ protected void unsatisfiedDependencies(PicoContainer container, Set<Type> unsatisfiableDependencyTypes) {
+ if (!optional) {
+ super.unsatisfiedDependencies(container, unsatisfiableDependencyTypes);
+ }
+ }

}

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/defaults/PicoExceptionsTestCase.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/defaults/PicoExceptionsTestCase.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/defaults/PicoExceptionsTestCase.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -9,10 +9,14 @@
*****************************************************************************/
package org.picocontainer.defaults;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.picocontainer.ComponentAdapter;
+import org.picocontainer.DefaultPicoContainer;
+import org.picocontainer.PicoCompositionException;
+import org.picocontainer.PicoException;
+import org.picocontainer.injectors.AbstractInjector;
+import org.picocontainer.injectors.ConstructorInjector;
+import org.picocontainer.monitors.AbstractComponentMonitor;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -22,15 +26,10 @@
import java.util.List;
import java.util.Set;

-import org.junit.Test;
-import org.picocontainer.ComponentAdapter;
-import org.picocontainer.DefaultPicoContainer;
-import org.picocontainer.PicoCompositionException;
-import org.picocontainer.PicoException;
-import org.picocontainer.injectors.AbstractInjector;
-import org.picocontainer.injectors.ConstructorInjector;
-import org.picocontainer.lifecycle.NullLifecycleStrategy;
-import org.picocontainer.monitors.AbstractComponentMonitor;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;

/**
* Unit tests for the several PicoException classes.

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AdaptingInjectionTestCase.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AdaptingInjectionTestCase.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AdaptingInjectionTestCase.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -174,6 +174,7 @@
" <componentMonitor class=CCM/>\n" +
" <useNames>false</useNames>\n" +
" <prefix></prefix>\n" +
+ " <optional>false</optional>\n" +
" <notThisOneThough></notThisOneThough>\n" +
" <injectionAnnotation>org.picocontainer.annotations.Inject</injectionAnnotation>\n" +
"</Method-Injection>", foo);

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AnnotatedFieldInjectorTestCase.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AnnotatedFieldInjectorTestCase.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AnnotatedFieldInjectorTestCase.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -71,7 +71,7 @@
MutablePicoContainer pico = new DefaultPicoContainer();
pico.addAdapter(new SetterInjector(Helicopter.class, Helicopter.class, null,
new NullComponentMonitor(),
- "set", "", false));
+ "set", "", false, false));
pico.addComponent(PogoStick.class, new PogoStick());
Helicopter chopper = pico.getComponent(Helicopter.class);
assertNotNull(chopper);

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AnnotatedMethodInjectorTestCase.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AnnotatedMethodInjectorTestCase.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/AnnotatedMethodInjectorTestCase.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -51,7 +51,7 @@

MutablePicoContainer pico = new DefaultPicoContainer();
pico.addAdapter(new SetterInjector(SetterBurp.class, SetterBurp.class, Parameter.DEFAULT, new NullComponentMonitor(),
- "set", "", false));
+ "set", "", false, false));
pico.addComponent(Wind.class, new Wind());
SetterBurp burp = pico.getComponent(SetterBurp.class);
assertNotNull(burp);

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectionTestCase.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectionTestCase.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectionTestCase.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -131,5 +131,35 @@
assertNull(bean.getName2());
}

+ public static class RecursivelyNamedBean implements Bean {
+ private String name;
+ private NamedBean namedBean;

+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setNamedBean(NamedBean namedBean) {
+ this.namedBean = namedBean;
+ }
+
+ public NamedBean getNamedBean() {
+ return namedBean;
+ }
+ }
+
+ @Test public void testOptionalWorks() {
+ picoContainer = new DefaultPicoContainer(new SetterInjection().withInjectionOptional());
+ picoContainer.addComponent(RecursivelyNamedBean.class, RecursivelyNamedBean.class);
+ picoContainer.addComponent("Tom");
+ RecursivelyNamedBean bean = picoContainer.getComponent(RecursivelyNamedBean.class);
+ assertEquals("Tom", bean.getName());
+ assertNull(bean.getNamedBean());
+ }
+
+
}
\ No newline at end of file

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectorTestCase.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectorTestCase.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/SetterInjectorTestCase.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -55,25 +55,25 @@

protected ComponentAdapter prepDEF_verifyWithoutDependencyWorks(MutablePicoContainer picoContainer) {
return new SetterInjector(PersonBean.class, PersonBean.class, new Parameter[] {new ConstantParameter(
- "Pico Container")}, new NullComponentMonitor(), "set", "", false);
+ "Pico Container")}, new NullComponentMonitor(), "set", "", false, false);
}

protected ComponentAdapter prepDEF_verifyDoesNotInstantiate(MutablePicoContainer picoContainer) {
picoContainer.addComponent("Pico Container");
return new SetterInjector(DeadBody.class, DeadBody.class, new Parameter[] {DEFAULT}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
}

protected ComponentAdapter prepDEF_visitable() {
return new SetterInjector(PersonBean.class, PersonBean.class, new Parameter[] {new ConstantParameter(
- "Pico Container")}, new NullComponentMonitor(), "set", "", false);
+ "Pico Container")}, new NullComponentMonitor(), "set", "", false, false);

}

protected ComponentAdapter prepSER_isSerializable(MutablePicoContainer picoContainer) {
picoContainer.addComponent("Pico Container");
return new SetterInjector(PersonBean.class, PersonBean.class, new Parameter[] {DEFAULT}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
}

protected ComponentAdapter prepSER_isXStreamSerializable(MutablePicoContainer picoContainer) {
@@ -85,7 +85,7 @@
picoContainer.addComponent(PersonBean.class);
SetterInjector componentAdapter = new SetterInjector(
PurseBean.class, MoneyPurse.class, new Parameter[] {DEFAULT, new ConstantParameter(100.0)}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
return picoContainer.as(Characteristics.NO_CACHE).addAdapter(componentAdapter).getComponentAdapter(PurseBean.class, (NameBinding) null);
}

@@ -107,14 +107,14 @@
picoContainer.addComponent(PersonBean.class);
SetterInjector componentAdapter = new SetterInjector(
PurseBean.class, MoneyPurse.class, new Parameter[] {DEFAULT},new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
return picoContainer.addAdapter(componentAdapter).getComponentAdapter(PurseBean.class, (NameBinding) null);
}

protected ComponentAdapter prepINS_createsNewInstances(MutablePicoContainer picoContainer) {
picoContainer.addComponent("Pico Container");
return new SetterInjector(PersonBean.class, PersonBean.class, new Parameter[] {DEFAULT}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
}

public static class Ghost
@@ -127,7 +127,7 @@
protected ComponentAdapter prepINS_errorIsRethrown(MutablePicoContainer picoContainer) {
picoContainer.addComponent("Pico Container");
return new SetterInjector(Ghost.class, Ghost.class, new Parameter[] {DEFAULT}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
}

public static class DeadBody
@@ -140,7 +140,7 @@
protected ComponentAdapter prepINS_runtimeExceptionIsRethrown(MutablePicoContainer picoContainer) {
picoContainer.addComponent("Pico Container");
return new SetterInjector(DeadBody.class, DeadBody.class, new Parameter[] {DEFAULT}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
}

public static class HidingPersion
@@ -155,14 +155,14 @@
picoContainer.addComponent("Pico Container");
return new SetterInjector(
HidingPersion.class, HidingPersion.class, new Parameter[] {DEFAULT}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
}

protected ComponentAdapter prepRES_dependenciesAreResolved(MutablePicoContainer picoContainer) {
picoContainer.addComponent("Pico Container");
picoContainer.addComponent(PersonBean.class);
return new SetterInjector(PurseBean.class, PurseBean.class, new Parameter[] {DEFAULT}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
}

public static class WealthyPerson
@@ -183,7 +183,7 @@
picoContainer.addComponent(PersonBean.class, WealthyPerson.class);
SetterInjector componentAdapter = new SetterInjector(
PurseBean.class, PurseBean.class, new Parameter[] {DEFAULT}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
return picoContainer.as(Characteristics.NO_CACHE).addAdapter(componentAdapter).getComponentAdapter(PurseBean.class, (NameBinding) null);
}

@@ -192,7 +192,7 @@
picoContainer.addComponent(PersonBean.class, WealthyPerson.class);
SetterInjector componentAdapter = new SetterInjector(
PurseBean.class, PurseBean.class, new Parameter[] {DEFAULT}, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
return picoContainer.as(Characteristics.NO_CACHE).addAdapter(componentAdapter).getComponentAdapter(PurseBean.class, (NameBinding) null);
}

@@ -262,9 +262,9 @@

@Test public void testAllUnsatisfiableDependenciesAreSignalled() {
SetterInjector aAdapter = new SetterInjector("a", A.class, Parameter.DEFAULT, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
SetterInjector bAdapter = new SetterInjector("b", B.class, Parameter.DEFAULT, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);

MutablePicoContainer pico = new DefaultPicoContainer();
pico.addAdapter(bAdapter);
@@ -280,9 +280,9 @@

@Test public void testAllUnsatisfiableDependenciesAreSignalled2() {
SetterInjector aAdapter = new SetterInjector(A2.class, A2.class, null, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
SetterInjector bAdapter = new SetterInjector("b", B.class, null, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);

MutablePicoContainer pico = new DefaultPicoContainer();
pico.addComponent(List.class, ArrayList.class)
@@ -325,7 +325,7 @@

MutablePicoContainer pico = new DefaultPicoContainer();
pico.addAdapter(new SetterInjector(SetterBurp.class, SetterBurp.class, Parameter.DEFAULT, new NullComponentMonitor(),
- "set", "", false));
+ "set", "", false, false));
pico.addComponent(Wind.class, new Wind());
SetterBurp burp = pico.getComponent(SetterBurp.class);
assertNotNull(burp);
@@ -335,7 +335,7 @@
@Test public void testNonSetterMethodInjection() {
MutablePicoContainer pico = new DefaultPicoContainer();
pico.addAdapter(new SetterInjector(InitBurp.class, InitBurp.class, Parameter.DEFAULT, new NullComponentMonitor(),
- "set", "", false) {
+ "set", "", false, false) {
protected String getInjectorPrefix() {
return "init";
}
@@ -349,7 +349,7 @@
@Test public void testNonSetterMethodInjectionWithoutOverridingSetterPrefix() {
MutablePicoContainer pico = new DefaultPicoContainer();
pico.addAdapter(new SetterInjector(InitBurp.class, InitBurp.class, new Parameter[0], new NullComponentMonitor(),
- "set", "", false));
+ "set", "", false, false));
pico.addComponent(Wind.class, new Wind());
InitBurp burp = pico.getComponent(InitBurp.class);
assertNotNull(burp);
@@ -395,11 +395,11 @@

@Test public void testHybridBeans() {
SetterInjector bAdapter = new SetterInjector("b", B.class, null, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
SetterInjector cAdapter = new SetterInjector("c", C.class, null, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
SetterInjector cNullAdapter = new SetterInjector("c0", C.class, null, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);

MutablePicoContainer pico = new DefaultPicoContainer();
pico.addAdapter(bAdapter);

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTest.java (5745 => 5746)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTest.java 2010-12-15 02:39:41 UTC (rev 5745)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/visitors/TraversalCheckingVisitorTest.java 2011-01-02 16:12:42 UTC (rev 5746)
@@ -53,7 +53,7 @@
pico = new DefaultPicoContainer();
SetterInjector componentAdapter = new SetterInjector(StringBuffer.class, StringBuffer.class,
null, new NullComponentMonitor(),
- "set", "", false);
+ "set", "", false, false);
parentAdapter = pico.addAdapter(componentAdapter).getComponentAdapter(StringBuffer.class, (NameBinding) null);
child = pico.makeChildContainer();
ConstructorInjector adapter = new ConstructorInjector(ArrayList.class, ArrayList.class, new Parameter[] {new ConstantParameter(3)}, new NullComponentMonitor(), false);

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email