ComponentParameter does not respect expectedType and behaves different from ConstantParameter

src/java/org/picocontainer/defaults/ConstantParameter.java

With this patch resolveAdapter returns null in case of an AssignabilityRegistrationException.

src/java/org/picocontainer/defaults/ComponentParameter.java

With this patch resolveAdapter returns null if the parameter references an adapter not compatible to the expected type.

src/test/org/picocontainer/defaults/ParameterTestCase.java

Test case for incompatible parameter types.

Additional test case for native types in ConstantParameter, since I broke this with an interim version unintentionally.

Sorry, missed to set the issue details right:
This is an enhancement and probably not major.

Fixed - with a slightly different implementation. Both ComponentParameter and ConstantParameter should follow the same contract now.

Hi Aslak,

sorry causing you work. I noticed this problem for ConstantParameter meanwhile too and had another implementation using reflection. Because I cannot create attachments to closed issues, I just post it here. This one will also succeed your new tests. So, take it or leave it. I do not know which implementation is really more efficient.

======= snip ========
Index: src/java/org/picocontainer/defaults/ConstantParameter.java
===================================================================
RCS file: /cvsroot/picocontainer/java/picocontainer/src/java/org/picocontainer/defaults/ConstantParameter.java,v
retrieving revision 1.15
diff -u -r1.15 ConstantParameter.java
— src/java/org/picocontainer/defaults/ConstantParameter.java 10 Feb 2004 02:36:54 -0000 1.15
+++ src/java/org/picocontainer/defaults/ConstantParameter.java 10 Feb 2004 03:19:35 -0000
@@ -10,6 +10,8 @@

package org.picocontainer.defaults;

+import java.lang.reflect.Field;
+
import org.picocontainer.ComponentAdapter;
import org.picocontainer.Parameter;
import org.picocontainer.PicoContainer;
@@ -21,7 +23,7 @@
*

• @author Jon Tirsén
• @author Aslak Hellesøy

• * @version $Revision: 1.15 $
  + * @version $Revision: 1.13 $
  */
  public class ConstantParameter implements Parameter { private final Object value; @@ -30,44 +32,30 @@ this.value = value; }

• public ComponentAdapter resolveAdapter(PicoContainer picoContainer, Class expectedType) throws NotConcreteRegistrationException {
• if(!expectedType.isAssignableFrom(value.getClass())) {
• if (expectedType.isPrimitive()) {
• if(!primitiveMatches(expectedType, value.getClass())) { - return null; - }
• } else {
• return null;
  + public ComponentAdapter resolveAdapter(PicoContainer picoContainer, Class expectedType) throws AssignabilityRegistrationException, NotConcreteRegistrationException {
  + ComponentAdapter result = null;
  + if(expectedType.isAssignableFrom(value.getClass())) { + result = new InstanceComponentAdapter(value, value); + }

  else if (expectedType.isPrimitive()) {
  + try

  Unknown macro: {+ Field field = value.getClass().getField("TYPE");+ Class type = (Class)field.get(value);+ if (expectedType.isAssignableFrom(type)) { + result = new InstanceComponentAdapter(value, value); + } else { + result = null; + }+ + }

  catch (NoSuchFieldException e)

  { + result = null; + } catch (IllegalArgumentException e) { + result = null; + }

  catch (IllegalAccessException e)

  { + result = null; + }

  catch (ClassCastException e)

  { + result = null; }

  }

• return new InstanceComponentAdapter(value, value);
• }
  -
• private boolean primitiveMatches(Class expectedPrimitiveType, Class constantClass) {
• if(expectedPrimitiveType.equals(Byte.class) || expectedPrimitiveType.equals(Byte.TYPE)) { - return constantClass.equals(Byte.class) || constantClass.equals(Byte.TYPE); - }
• if(expectedPrimitiveType.equals(Short.class) || expectedPrimitiveType.equals(Short.TYPE)) { - return constantClass.equals(Short.class) || constantClass.equals(Short.TYPE); - }
• if(expectedPrimitiveType.equals(Integer.class) || expectedPrimitiveType.equals(Integer.TYPE)) { - return constantClass.equals(Integer.class) || constantClass.equals(Integer.TYPE); - }
• if(expectedPrimitiveType.equals(Long.class) || expectedPrimitiveType.equals(Long.TYPE)) { - return constantClass.equals(Long.class) || constantClass.equals(Long.TYPE); - }
• if(expectedPrimitiveType.equals(Float.class) || expectedPrimitiveType.equals(Float.TYPE)) { - return constantClass.equals(Float.class) || constantClass.equals(Float.TYPE); - }
• if(expectedPrimitiveType.equals(Double.class) || expectedPrimitiveType.equals(Double.TYPE)) { - return constantClass.equals(Double.class) || constantClass.equals(Double.TYPE); - }
• if(expectedPrimitiveType.equals(Boolean.class) || expectedPrimitiveType.equals(Boolean.TYPE)) { - return constantClass.equals(Boolean.class) || constantClass.equals(Boolean.TYPE); - }
• if(expectedPrimitiveType.equals(Character.class) || expectedPrimitiveType.equals(Character.TYPE)) { - return constantClass.equals(Character.class) || constantClass.equals(Character.TYPE); - }
• return false;
  + return result;
  }
  }
  ======= snap ========