Add logger to op environment

Treiblesschorle · gselzer · commit 7dcb300dd74c · 2019-04-12T12:54:02.000-05:00
diff --git a/src/main/java/org/scijava/ops/OpEnvironment.java b/src/main/java/org/scijava/ops/OpEnvironment.java
@@ -31,6 +31,7 @@
 
 import java.util.Collection;
 
+import org.scijava.log.LogService;
 import org.scijava.ops.matcher.OpInfo;
 import org.scijava.ops.matcher.OpRef;
 
@@ -68,4 +69,6 @@ public interface OpEnvironment {
 	Iterable<OpInfo> infos();
 	
 	Iterable<OpInfo> infos(String name);
+	
+	LogService logger();
 }
diff --git a/src/main/java/org/scijava/ops/OpService.java b/src/main/java/org/scijava/ops/OpService.java
@@ -157,6 +157,11 @@ public Iterable<OpInfo> infos(String name) {
 		}
 		return opCache.getAndBelow(new PrefixQuery(opName));
 	}
+	
+	@Override
+	public LogService logger() {
+		return log;
+	}
 
 	@SuppressWarnings("unchecked")
 	public <T> T findOpInstance(final String opName, final Nil<T> specialType, final Nil<?>[] inTypes,
diff --git a/src/main/java/org/scijava/ops/matcher/OpCandidate.java b/src/main/java/org/scijava/ops/matcher/OpCandidate.java
@@ -223,10 +223,8 @@ private void inject(StructInstance<?> opInst, Object... secondaryArgs) {
 			Inject.Structs.inputs(opInst, paddedArgs);
 		// Secondary args are given, however there are no to inject
 		} else if (secondaryArgs.length > 0) {
-			//TODO where get the logger from?
-//			log.warn(
-//				"Specified Op has no secondary args, however secondary args are given. "
-//				+ "The specified args will not be injected.");
+			ops().logger().warn("Specified Op has no secondary args, however secondary args are given. "
+					+ "The specified args will not be injected.");
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,11 @@ public Iterable<OpInfo> infos(String name) {`
`157`	`157`	`}`
`158`	`158`	`return opCache.getAndBelow(new PrefixQuery(opName));`
`159`	`159`	`}`
	`160`	`+`
	`161`	`+ @Override`
	`162`	`+ public LogService logger() {`
	`163`	`+ return log;`
	`164`	`+ }`
`160`	`165`
`161`	`166`	`@SuppressWarnings("unchecked")`
`162`	`167`	`public <T> T findOpInstance(final String opName, final Nil<T> specialType, final Nil<?>[] inTypes,`
Original file line number	Diff line number	Diff line change
`@@ -223,10 +223,8 @@ private void inject(StructInstance<?> opInst, Object... secondaryArgs) {`
`223`	`223`	`Inject.Structs.inputs(opInst, paddedArgs);`
`224`	`224`	`// Secondary args are given, however there are no to inject`
`225`	`225`	`} else if (secondaryArgs.length > 0) {`
`226`		`- //TODO where get the logger from?`
`227`		`-// log.warn(`
`228`		`-// "Specified Op has no secondary args, however secondary args are given. "`
`229`		`-// + "The specified args will not be injected.");`
	`226`	`+ ops().logger().warn("Specified Op has no secondary args, however secondary args are given. "`
	`227`	`+ + "The specified args will not be injected.");`
`230`	`228`	`}`
`231`	`229`	`}`
`232`	`230`	`}`