felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1743542 - in /felix/trunk/scr/src: main/java/org/apache/felix/scr/impl/helper/Coercions.java test/java/org/apache/felix/scr/impl/helper/AnnotationTest.java
Date Thu, 12 May 2016 19:05:10 GMT
Author: djencks
Date: Thu May 12 19:05:10 2016
New Revision: 1743542

URL: http://svn.apache.org/viewvc?rev=1743542&view=rev
Log:
FELIX-5256 Object conversion should pass through unrecognized objects of compatible type

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/Coercions.java
    felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/helper/AnnotationTest.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/Coercions.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/Coercions.java?rev=1743542&r1=1743541&r2=1743542&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/Coercions.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/Coercions.java Thu May
12 19:05:10 2016
@@ -46,6 +46,9 @@ public class Coercions
     
     public static Object coerce(Class<?> type, Object raw, Bundle bundle )
     {
+        if (raw != null && raw.getClass() == type) {
+            return raw;
+        }
         if (type == Byte.class || type == byte.class)
         {
             return coerceToByte(raw);
@@ -91,6 +94,14 @@ public class Coercions
         {
             return coerceToString(raw);
         }
+        if (raw != null) 
+        {
+            raw = multipleToSingle(raw, null);
+            if (raw != null && type.isAssignableFrom(raw.getClass())) 
+            {
+                return raw;
+            }
+        }
         throw new ComponentException ("unexpected output type " + type);
     }
     

Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/helper/AnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/helper/AnnotationTest.java?rev=1743542&r1=1743541&r2=1743542&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/helper/AnnotationTest.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/helper/AnnotationTest.java Thu
May 12 19:05:10 2016
@@ -21,6 +21,7 @@ package org.apache.felix.scr.impl.helper
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -519,5 +520,74 @@ public class AnnotationTest extends Test
         checkBI1(c.b1array()[2]);
         
     }
+    
+    class Odd
+    {
+        private final String content;
+        
+        public Odd(String content)
+        {
+            this.content = content;
+        }
+        
+        public String getContent() 
+        {
+            return content;
+        }
+    }
+    
+    class Odder extends Odd
+    {
 
+        public Odder(String content)
+        {
+            super(content);
+        }
+        
+    }
+    
+    interface OddTest 
+    {
+        Odd odd1();
+        
+        Odd odd2();
+        
+        Odd odd3();
+        
+        Odd odder1();
+        
+        Odd odder2();
+        
+        Odd odder3();
+    }
+
+    public void testOddClasses() throws Exception
+    {
+        Map<String, Object> values = new HashMap<String, Object>();
+        values.put("odd1", new Odd("one"));
+        values.put("odd2", Collections.singletonList(new Odd("two")));
+        values.put("odd3", new Odd[] {new Odd("three"), new Odd("four")});
+        values.put("odder1", new Odder("one"));
+        values.put("odder2", Collections.singletonList(new Odder("two")));
+        values.put("odder3", new Odder[] {new Odder("three"), new Odder("four")});
+        
+        Object o = Annotations.toObject(OddTest.class, values, mockBundle(), true);
+        assertTrue("expected an OddTest", o instanceof OddTest);
+        OddTest ot = (OddTest)o;
+        assertOdd("one", ot.odd1());
+        assertOdd("two", ot.odd2());
+        assertOdd("three", ot.odd3());
+        assertOdder("one", ot.odder1());
+        assertOdder("two", ot.odder2());
+        assertOdder("three", ot.odder3());
+    }
+    
+    private void assertOdd(String expectedContent, Object actual) {
+        assertTrue("expected an Odd", actual instanceof Odd);
+        assertEquals("Expected Odd contents", expectedContent, ((Odd)actual).getContent());
     
+    }
+    private void assertOdder(String expectedContent, Object actual) {
+        assertTrue("expected an Odder", actual instanceof Odder);
+        assertEquals("Expected Odd contents", expectedContent, ((Odder)actual).getContent());
     
+    }
 }



Mime
View raw message