Skip to content

Commit c5cbaaf

Browse files
committed
Remove ops.run from codebase
Replaced all instances of ops.run() with OpBuilder constructions. Hooray for type safety!
1 parent 6f222a3 commit c5cbaaf

4 files changed

Lines changed: 12 additions & 180 deletions

File tree

‎src/main/java/org/scijava/ops/OpService.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import org.scijava.ops.transform.OpTransformationException;
6262
import org.scijava.ops.transform.OpTransformationMatcher;
6363
import org.scijava.ops.transform.OpTransformer;
64-
import org.scijava.ops.types.Any;
6564
import org.scijava.ops.types.Nil;
6665
import org.scijava.ops.types.TypeService;
6766
import org.scijava.ops.util.OpWrapper;
@@ -367,20 +366,6 @@ private Type[] toTypes(Nil<?>... nils) {
367366
return Arrays.stream(nils).filter(n -> n != null).map(n -> n.getType()).toArray(Type[]::new);
368367
}
369368

370-
public Object run(final String opName, final Object... args) {
371-
372-
Nil<?>[] inTypes = Arrays.stream(args).map(arg -> Nil.of(typeService.reify(arg))).toArray(Nil[]::new);
373-
Nil<?> outType = new Nil<Any>() {
374-
@Override
375-
public Type getType() {
376-
return new Any();
377-
}
378-
};
379-
380-
OpRunner op = findOpInstance(opName, new Nil<OpRunner>() {}, inTypes, outType);
381-
return op.run(args);
382-
}
383-
384369
/**
385370
* Tries to infer a {@link OpRef} from a functional Op type. E.g. the type:
386371
*

‎src/test/java/org/scijava/ops/RunTest.java‎

Lines changed: 0 additions & 156 deletions
This file was deleted.

‎src/test/java/org/scijava/ops/types/AnyTest.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.scijava.core.Priority;
1111
import org.scijava.ops.AbstractTestEnvironment;
1212
import org.scijava.ops.core.Op;
13+
import org.scijava.ops.core.builder.OpBuilder;
1314
import org.scijava.ops.function.Computers;
1415
import org.scijava.ops.function.Producer;
1516
import org.scijava.param.Mutable;
@@ -23,10 +24,10 @@ public class AnyTest extends AbstractTestEnvironment {
2324
public void testAny() {
2425

2526
NestedThing<String, Thing<String>> nthing = new NestedThing<>();
26-
Double e = (Double) ops.run("test.nestedAny", nthing);
27+
Double e = new OpBuilder(ops, "test.nestedAny").input(nthing).outType(Double.class).apply();
2728

2829
Thing<Double> thing = new Thing<>();
29-
Double d = (Double) ops.run("test.any", thing);
30+
Double d = new OpBuilder(ops, "test.any").input(thing).outType(Double.class).apply();
3031

3132
assert d == 5.;
3233
assert e == 5.;
@@ -42,7 +43,7 @@ public void testAny() {
4243
public void testExceptionalThing() {
4344

4445
ExceptionalThing<Double> ething = new ExceptionalThing<>(0.5);
45-
Double d = (Double) ops.run("test.exceptionalAny", ething);
46+
Double d = new OpBuilder(ops, "test.exceptionalAny").input(ething).outType(Double.class).apply();
4647

4748
}
4849

@@ -68,19 +69,20 @@ public Class<Thing<?>> getRawType() {
6869
// TODO: Note that this wouldn't work for Computer -> Function because here
6970
// LiftFunctionToArrayTransformer is the first transformer which is asked for
7071
// source refs. This transformer doesn't support Any and would fail.
72+
// TODO: can we remove this test?
7173
@Test
7274
public void testRunAnyFunction1FromComputer2() {
7375
final int in1 = 11;
7476
final long in2 = 31;
75-
final Object out = ops.run("test.integerAndLongAndNotAnyComputer", in1, in2);
76-
assert out instanceof MutableNotAny;
77-
assertEquals(Long.toString(in1 + in2), ((MutableNotAny) out).getValue());
77+
final MutableNotAny out = new OpBuilder(ops, "test.integerAndLongAndNotAnyComputer").input(in1, in2).outType(MutableNotAny.class).apply();
78+
assertEquals(Long.toString(in1 + in2), out.getValue());
7879
}
7980

81+
@SuppressWarnings("cast")
8082
@Test
8183
public void testAnyInjectionIntoFunctionRaws() {
8284
final Function<Long, Long> func = (in) -> in / 2;
83-
final Long output = (Long) ops.run("test.functionAndLongToLong", func, 20l);
85+
final Long output = (Long) new OpBuilder(ops, "test.functionAndLongToLong").input(func, 20l).outType(Long.class).apply();
8486
assert(output == 10);
8587
}
8688
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.scijava.ops.OpField;
1111
import org.scijava.ops.core.Op;
1212
import org.scijava.ops.core.OpCollection;
13+
import org.scijava.ops.core.builder.OpBuilder;
1314
import org.scijava.ops.function.Functions;
1415
import org.scijava.ops.types.Nil;
1516
import org.scijava.param.Parameter;
@@ -43,7 +44,7 @@ public void TestOpWithOpField() {
4344
list.add(20.5);
4445
list.add(4.0d);
4546

46-
List<Double> output = (List<Double>) ops.run("test.parameter.op", list, func);
47+
List<Double> output = new OpBuilder(ops, "test.parameter.op").input(list, func).outType(new Nil<List<Double>>() {}).apply();
4748
}
4849

4950
@Test
@@ -76,7 +77,7 @@ public void TestOpWithOpClass() {
7677
}, new Nil<Double>() {
7778
});
7879

79-
List<Double> output = (List<Double>) ops.run("test.parameter.op", list, funcClass);
80+
List<Double> output = new OpBuilder(ops, "test.parameter.op").input(list, funcClass).outType(new Nil<List<Double>>() {}).apply();
8081
}
8182

8283
}

0 commit comments

Comments
 (0)