Skip to content

Commit e855522

Browse files
authored
Merge pull request #71 from scijava/scijava/scijava-types/raw-type-support
Improve raw type support
2 parents ab0b145 + a7bd481 commit e855522

5 files changed

Lines changed: 68 additions & 15 deletions

File tree

‎imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,13 @@ public void meanFilterTest() {
5555
ops.op("filter.mean").arity2().input(img, shape).output(output).compute();
5656
}
5757

58+
@Test
59+
public void rawTypeAdaptationTest() {
60+
61+
Img<ByteType> img = ops.op("create.img").arity2().input(new FinalInterval(5, 5), new ByteType()).outType(new Nil<Img<ByteType>>() {}).apply();
62+
RectangleShape shape = new RectangleShape(1, false);
63+
OutOfBoundsFactory<ByteType, RandomAccessibleInterval<ByteType>> oobf = new OutOfBoundsBorderFactory<>();
64+
var result = ops.op("filter.mean").arity3().input(img, shape, oobf).outType(Img.class).apply();
65+
66+
}
5867
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package org.scijava.ops.engine.matcher;
2+
3+
import org.junit.jupiter.api.BeforeAll;
4+
import org.junit.jupiter.api.Test;
5+
import org.scijava.ops.engine.AbstractTestEnvironment;
6+
import org.scijava.ops.spi.OpCollection;
7+
import org.scijava.ops.spi.OpField;
8+
9+
import java.util.List;
10+
import java.util.function.Function;
11+
12+
import static org.junit.jupiter.api.Assertions.assertNotNull;
13+
14+
public class RawTypeMatchingTest extends AbstractTestEnvironment implements
15+
OpCollection
16+
{
17+
18+
@BeforeAll
19+
public static void addNeededOps() {
20+
ops.register(new RawTypeMatchingTest());
21+
}
22+
23+
@OpField(names = "test.match.raw")
24+
public final Function<Number, List<Number>> func = (x) -> List.of(x);
25+
26+
@Test
27+
public void rawTypeAdaptationTest() {
28+
Double d = 25.;
29+
var list = ops.op("test.match.raw").arity1().input(d).outType(List.class).apply();
30+
assertNotNull(list);
31+
}
32+
}

‎scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/util/OpsAsParametersTest.java‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
package org.scijava.ops.engine.util;
22

3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
35
import java.util.ArrayList;
6+
import java.util.Arrays;
47
import java.util.List;
58
import java.util.function.BiFunction;
69
import java.util.function.Function;
710

8-
import org.junit.jupiter.api.Assertions;
911
import org.junit.jupiter.api.BeforeAll;
1012
import org.junit.jupiter.api.Test;
1113
import org.scijava.ops.api.OpBuilder;
12-
import org.scijava.ops.api.features.OpMatchingException;
1314
import org.scijava.ops.engine.AbstractTestEnvironment;
1415
import org.scijava.ops.spi.Op;
1516
import org.scijava.ops.spi.OpClass;
1617
import org.scijava.ops.spi.OpCollection;
1718
import org.scijava.ops.spi.OpField;
1819
import org.scijava.types.Nil;
1920

20-
import static org.junit.jupiter.api.Assertions.assertThrows;
21-
2221
public class OpsAsParametersTest extends AbstractTestEnvironment implements OpCollection {
2322

2423
@BeforeAll
@@ -40,16 +39,13 @@ public static void addNeededOps() {
4039

4140
@Test
4241
public void TestOpWithNonReifiableFunction() {
43-
44-
List<Number> list = new ArrayList<>();
45-
list.add(40l);
46-
list.add(20.5);
47-
list.add(4.0d);
48-
49-
assertThrows(OpMatchingException.class, //
50-
() -> ops.op("test.parameter.op").arity2().input(list, func).outType(new Nil<List<Double>>() {
51-
}).apply() //
52-
);
42+
var list = Arrays.asList(40L, 20.5, 4.0d);
43+
var actual = ops//
44+
.op("test.parameter.op") //
45+
.arity2().input(list, func) //
46+
.outType(List.class) //
47+
.apply();
48+
assertEquals(Arrays.asList(40.0, 20.5, 4.0), actual);
5349
}
5450

5551
@Test

‎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
@@ -588,6 +588,11 @@ private static boolean isApplicableToParameterizedTypes(final Type arg,
588588
final ParameterizedType param,
589589
final HashMap<TypeVariable<?>, TypeVarInfo> typeBounds)
590590
{
591+
if (arg instanceof Class) {
592+
Class<?> paramRaw = Types.raw(param);
593+
return Types.isAssignable(arg, paramRaw);
594+
}
595+
591596
// get an array of the destination parameter types
592597
Type[] destTypes = param.getActualTypeArguments();
593598
Type[] srcTypes = new Type[destTypes.length];
@@ -596,7 +601,7 @@ private static boolean isApplicableToParameterizedTypes(final Type arg,
596601
Type argType = arg;
597602
Type superType = Types
598603
.getExactSuperType(argType, Types.raw(param));
599-
if (superType == null || !(superType instanceof ParameterizedType)) return false;
604+
if (!(superType instanceof ParameterizedType)) return false;
600605
srcTypes = ((ParameterizedType)superType).getActualTypeArguments();
601606

602607
// List to collect the indices of destination parameters that are type vars

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ public void testIsAssignableClassToNull() {
218218
@Test
219219
public <T extends Number> void testIsAssignableT() {
220220
final Type t = new Nil<T>() {}.getType();
221+
final Type listRaw = List.class;
221222
final Type listT = new Nil<List<T>>() {}.getType();
222223
final Type listNumber = new Nil<List<Number>>() {}.getType();
223224
final Type listInteger = new Nil<List<Integer>>() {}.getType();
@@ -227,20 +228,30 @@ public <T extends Number> void testIsAssignableT() {
227228
final Type listListInteger = new Nil<List<List<Integer>>>(){}.getType();
228229

229230
assertTrue(Types.isAssignable(t, t));
231+
assertTrue(Types.isAssignable(listRaw, listRaw));
230232
assertTrue(Types.isAssignable(listT, listT));
231233
assertTrue(Types.isAssignable(listNumber, listNumber));
232234
assertTrue(Types.isAssignable(listInteger, listInteger));
233235
assertTrue(Types.isAssignable(listExtendsNumber, listExtendsNumber));
234236

237+
assertTrue(Types.isAssignable(listRaw, listExtendsNumber));
235238
assertTrue(Types.isAssignable(listT, listExtendsNumber));
236239
assertTrue(Types.isAssignable(listNumber, listExtendsNumber));
237240
assertTrue(Types.isAssignable(listInteger, listExtendsNumber));
238241

242+
assertTrue(Types.isAssignable(listRaw, listT));
239243
assertTrue(Types.isAssignable(listNumber, listT));
240244
assertTrue(Types.isAssignable(listInteger, listT));
241245
assertTrue(Types.isAssignable(listExtendsNumber, listT));
242246
assertFalse(Types.isAssignable(listExtendsNumber, listNumber));
243247

248+
assertTrue(Types.isAssignable(listT, listRaw));
249+
assertTrue(Types.isAssignable(listNumber, listRaw));
250+
assertTrue(Types.isAssignable(listInteger, listRaw));
251+
assertTrue(Types.isAssignable(listExtendsNumber, listRaw));
252+
assertTrue(Types.isAssignable(listListRaw, listRaw));
253+
assertTrue(Types.isAssignable(listListInteger, listRaw));
254+
244255
// Nested Type Variables must be EXACTLY the same to be assignable
245256
assertFalse(Types.isAssignable(listListInteger, listListRaw));
246257
assertTrue(Types.isAssignable(listListRaw, listListRaw));

0 commit comments

Comments
 (0)