Skip to content

Commit 23b2c7a

Browse files
gselzerctrueden
authored andcommitted
Rename TagBasedOpInfoDiscoverer
This is a long name
1 parent 797deee commit 23b2c7a

5 files changed

Lines changed: 18 additions & 9 deletions

File tree

‎scijava/scijava-ops-engine/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
uses org.scijava.types.TypeExtractor;
6161

6262
provides org.scijava.discovery.Discoverer with
63-
org.scijava.ops.engine.impl.TagBasedOpInfoDiscoverer;
63+
org.scijava.ops.engine.impl.TherapiOpInfoDiscoverer;
6464

6565
provides org.scijava.ops.api.InfoChainGenerator with
6666
org.scijava.ops.engine.matcher.impl.AdaptationInfoChainGenerator,

scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/TagBasedOpInfoDiscoverer.java renamed to scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/TherapiOpInfoDiscoverer.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
import java.lang.reflect.Field;
66
import java.lang.reflect.InvocationTargetException;
77
import java.lang.reflect.Method;
8+
import java.util.Optional;
89
import java.util.ServiceLoader;
910

1011
import org.scijava.Context;
1112
import org.scijava.Priority;
12-
import org.scijava.discovery.therapi.TherapiDiscoverer;
1313
import org.scijava.discovery.therapi.TaggedElement;
14+
import org.scijava.discovery.therapi.TherapiDiscoverer;
1415
import org.scijava.ops.api.OpInfo;
1516
import org.scijava.ops.api.OpUtils;
1617
import org.scijava.ops.engine.hint.DefaultHints;
@@ -34,12 +35,20 @@
3435
*
3536
* @author Gabriel Selzer
3637
*/
37-
public class TagBasedOpInfoDiscoverer extends TherapiDiscoverer {
38+
public class TherapiOpInfoDiscoverer extends TherapiDiscoverer {
3839

3940
private static final String TAGTYPE = "op";
4041

41-
public TagBasedOpInfoDiscoverer() {
42-
super(ServiceLoader.load(Parser.class).findFirst().get());
42+
public TherapiOpInfoDiscoverer() {
43+
super(serviceLoadParser());
44+
}
45+
46+
public static Parser serviceLoadParser() {
47+
Optional<Parser> optional = ServiceLoader.load(Parser.class).findFirst();
48+
if (optional.isEmpty())
49+
throw new IllegalArgumentException("Tried to create a TherapiOpInfoDiscoverer without a Parser available!" //
50+
+ " Ensure a Parser implementation is provided via module!");
51+
return optional.get();
4352
}
4453

4554
private OpInfo opClassGenerator(Class<?> cls, double priority, String[] names) {

‎scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/TherapiDiscoveryIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
import org.junit.Test;
88
import org.scijava.discovery.Discoverer;
99
import org.scijava.ops.api.OpInfo;
10-
import org.scijava.ops.engine.impl.TagBasedOpInfoDiscoverer;
10+
import org.scijava.ops.engine.impl.TherapiOpInfoDiscoverer;
1111
import org.scijava.parse2.Parser;
1212

1313
public class TherapiDiscoveryIntegrationTest {
1414

1515
@Test
1616
public void opDiscoveryRegressionIT() {
1717
Parser p = ServiceLoader.load(Parser.class).findFirst().get();
18-
final Discoverer d = new TagBasedOpInfoDiscoverer();
18+
final Discoverer d = new TherapiOpInfoDiscoverer();
1919
final List<OpInfo> discoveries = d.discover(OpInfo.class);
2020
Assert.assertEquals(5, discoveries.size());
2121
}

‎scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/TherapiBasedOpTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected static OpEnvironment barebonesEnvironment()
4747

4848
{
4949
// register needed classes in StaticDiscoverer
50-
discoverer = new TagBasedOpInfoDiscoverer();
50+
discoverer = new TherapiOpInfoDiscoverer();
5151
Discoverer d2 = Discoverer.using(ServiceLoader::load).onlyFor( //
5252
OpWrapper.class, //
5353
MatchingRoutine.class //

‎scijava/scijava-ops-engine/templates/main/java/module-info.vm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module org.scijava.ops.engine {
5050
uses org.scijava.types.TypeExtractor;
5151

5252
provides org.scijava.discovery.Discoverer with
53-
org.scijava.ops.engine.impl.TagBasedOpInfoDiscoverer;
53+
org.scijava.ops.engine.impl.TherapiOpInfoDiscoverer;
5454

5555
provides org.scijava.ops.api.InfoChainGenerator with
5656
org.scijava.ops.engine.matcher.impl.AdaptationInfoChainGenerator,

0 commit comments

Comments
 (0)