OpEnvironment: treeFromID -> treeFromSignature

gselzer · ctrueden · commit 0879dd55e4df · 2024-05-30T18:33:44.000-05:00
diff --git a/scijava-ops-api/src/main/java/org/scijava/ops/api/OpEnvironment.java b/scijava-ops-api/src/main/java/org/scijava/ops/api/OpEnvironment.java
@@ -196,11 +196,11 @@ default <T> T opFromInfoTree(InfoTree tree, Nil<T> specialType) {
 	default <T> T opFromSignature(final String signature,
 		final Nil<T> specialType)
 	{
-		InfoTree info = treeFromID(signature);
+		InfoTree info = treeFromSignature(signature);
 		return opFromInfoTree(info, specialType);
 	}
 
-	InfoTree treeFromID(final String signature);
+	InfoTree treeFromSignature(final String signature);
 
 	default InfoTree treeFromInfo(final OpInfo info, final Nil<?> specialType) {
 		return treeFromInfo(info, specialType, getDefaultHints());
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
@@ -238,7 +238,7 @@ public <T> T opFromInfoTree(final InfoTree tree, final Nil<T> specialType,
 	}
 
 	@Override
-	public InfoTree treeFromID(String signature) {
+	public InfoTree treeFromSignature(String signature) {
 		if (idDirectory == null) initIdDirectory();
 		List<InfoTreeGenerator> infoTreeGenerators = discoverers.stream() //
 			.flatMap(d -> d.discover(InfoTreeGenerator.class).stream()) //
diff --git a/scijava-ops-engine/src/test/java/org/scijava/ops/engine/InfoTreeGeneratorTest.java b/scijava-ops-engine/src/test/java/org/scijava/ops/engine/InfoTreeGeneratorTest.java
@@ -63,8 +63,8 @@ public void testMultipleValidInfoTreeGenerators() {
 		var op = ops.op("test.infoTreeGeneration").inType(Double.class).outType(
 			Double.class).function();
 		String signature = Ops.signature(op);
-		// Run treeFromID to make sure our generator doesn't run
-		var infoTree = ops.treeFromID(signature);
+		// Run treeFromSignature to make sure our generator doesn't run
+		var infoTree = ops.treeFromSignature(signature);
 		// Assert non-null output
 		Assertions.assertNotNull(infoTree);
 	}

Original file line number	Diff line number	Diff line change
`@@ -196,11 +196,11 @@ default <T> T opFromInfoTree(InfoTree tree, Nil<T> specialType) {`
`196`	`196`	`default <T> T opFromSignature(final String signature,`
`197`	`197`	`final Nil<T> specialType)`
`198`	`198`	`{`
`199`		`- InfoTree info = treeFromID(signature);`
	`199`	`+ InfoTree info = treeFromSignature(signature);`
`200`	`200`	`return opFromInfoTree(info, specialType);`
`201`	`201`	`}`
`202`	`202`
`203`		`- InfoTree treeFromID(final String signature);`
	`203`	`+ InfoTree treeFromSignature(final String signature);`
`204`	`204`
`205`	`205`	`default InfoTree treeFromInfo(final OpInfo info, final Nil<?> specialType) {`
`206`	`206`	`return treeFromInfo(info, specialType, getDefaultHints());`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public <T> T opFromInfoTree(final InfoTree tree, final Nil<T> specialType,`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`@Override`
`241`		`- public InfoTree treeFromID(String signature) {`
	`241`	`+ public InfoTree treeFromSignature(String signature) {`
`242`	`242`	`if (idDirectory == null) initIdDirectory();`
`243`	`243`	`List<InfoTreeGenerator> infoTreeGenerators = discoverers.stream() //`
`244`	`244`	`.flatMap(d -> d.discover(InfoTreeGenerator.class).stream()) //`