Skip to content

Commit ad15354

Browse files
authored
Merge pull request #70 from scijava/scijava/scijava-types/raw-type-prevention
Add fallback to parameterize raw types
2 parents 7d70b7d + 0767910 commit ad15354

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

‎scijava/scijava-types/src/main/java/org/scijava/types/Types.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,12 @@ && isAssignable(fromResolved, toResolved, typeVarAssigns))) {
17571757
// check for anys
17581758
if (fromResolved instanceof Any || toResolved instanceof Any)
17591759
continue;
1760-
if (fromResolved instanceof ParameterizedType && Types.raw(fromResolved) == Types.raw(toResolved)) {
1760+
if (fromResolved instanceof ParameterizedType &&
1761+
toResolved instanceof ParameterizedType)
1762+
{
1763+
if (Types.raw(fromResolved) != Types.raw(toResolved)) {
1764+
return false;
1765+
}
17611766
Type[] fromTypes = ((ParameterizedType) fromResolved).getActualTypeArguments();
17621767
Type[] toTypes = ((ParameterizedType) toResolved).getActualTypeArguments();
17631768
for(int i = 0; i < fromTypes.length; i++) {

‎scijava/scijava-types/src/test/java/org/scijava/types/TypesTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ public <T extends Number> void testIsAssignableT() {
223223
final Type listInteger = new Nil<List<Integer>>() {}.getType();
224224
final Type listExtendsNumber = new Nil<List<? extends Number>>() {}
225225
.getType();
226+
final Type listListRaw = new Nil<List<List>>(){}.getType();
227+
final Type listListInteger = new Nil<List<List<Integer>>>(){}.getType();
226228

227229
assertTrue(Types.isAssignable(t, t));
228230
assertTrue(Types.isAssignable(listT, listT));
@@ -238,6 +240,10 @@ public <T extends Number> void testIsAssignableT() {
238240
assertTrue(Types.isAssignable(listInteger, listT));
239241
assertTrue(Types.isAssignable(listExtendsNumber, listT));
240242
assertFalse(Types.isAssignable(listExtendsNumber, listNumber));
243+
244+
// Nested Type Variables must be EXACTLY the same to be assignable
245+
assertFalse(Types.isAssignable(listListInteger, listListRaw));
246+
assertTrue(Types.isAssignable(listListRaw, listListRaw));
241247
}
242248

243249
/** Tests {@link Types#isAssignable(Type, Type)} against {@link Object} */

0 commit comments

Comments
 (0)