Author: gnodet
Date: Fri Nov 4 16:49:51 2016
New Revision: 1768067
URL: http://svn.apache.org/viewvc?rev=1768067&view=rev
Log:
[ARIES-960] Support conversion from Iterable<String> to Iterable
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AggregateConverter.java
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AggregateConverter.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AggregateConverter.java?rev=1768067&r1=1768066&r2=1768067&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AggregateConverter.java
(original)
+++
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AggregateConverter.java
Fri Nov 4 16:49:51 2016
@@ -464,6 +464,9 @@ public class AggregateConverter implemen
return true;
}
if (from.getRawClass() == to.getRawClass()) {
+ if (to.size() == 0) {
+ return true;
+ }
if (from.size() == to.size()) {
boolean ok = true;
for (int i = 0; i < from.size(); i++) {
Modified:
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java?rev=1768067&r1=1768066&r2=1768067&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java
(original)
+++
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java
Fri Nov 4 16:49:51 2016
@@ -218,6 +218,9 @@ public class AggregateConverterTest exte
// Ignore
}
+ assertTrue(Iterable.class.isAssignableFrom(RegionIterable.class));
+ // note that method signature is fromType, toType - reverse than above
+ assertTrue("Type should be assignable.",
AggregateConverter.isTypeAssignable(new GenericType(RegionIterable.class), new
GenericType(Iterable.class)));
}
public void testGenericCollection() throws Exception {
