Remove logger from OpEnvironment

wiedenm · ctrueden · commit 80bbcc45f6b1 · 2019-09-22T17:53:11.000+02:00
Trims down the interface to a collection of Ops that can be listed and
queried by name.
diff --git a/src/main/java/org/scijava/ops/OpEnvironment.java b/src/main/java/org/scijava/ops/OpEnvironment.java
@@ -29,7 +29,6 @@
 
 package org.scijava.ops;
 
-import org.scijava.log.LogService;
 import org.scijava.ops.matcher.OpInfo;
 import org.scijava.ops.matcher.OpRef;
 
@@ -67,6 +66,4 @@ 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
@@ -254,11 +254,6 @@ public Iterable<OpInfo> infos(String name) {
 		return infos;
 	}
 
-	@Override
-	public LogService logger() {
-		return log;
-	}
-
 	/**
 	 * Attempts to inject {@link OpDependency} annotated fields of the specified
 	 * object by looking for Ops matching the field type and the name specified in
diff --git a/src/main/java/org/scijava/ops/matcher/DefaultOpTypeMatchingService.java b/src/main/java/org/scijava/ops/matcher/DefaultOpTypeMatchingService.java
@@ -102,7 +102,7 @@ public List<OpCandidate> findCandidates(final OpEnvironment ops, final List<OpRe
 			for (final OpInfo info : ops.infos(ref.getName())) {
 				Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();
 				if (ref.typesMatch(info.opType(), typeVarAssigns)) {
-					candidates.add(new OpCandidate(ops, ref, info, typeVarAssigns));
+					candidates.add(new OpCandidate(ops, log, ref, info, typeVarAssigns));
 				}
 			}
 		}
diff --git a/src/main/java/org/scijava/ops/matcher/OpCandidate.java b/src/main/java/org/scijava/ops/matcher/OpCandidate.java
@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.scijava.log.Logger;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.OpUtils;
 import org.scijava.param.ValidityProblem;
@@ -63,6 +64,7 @@ public static enum StatusCode {
 	}
 
 	private final OpEnvironment ops;
+	private final Logger log;
 	private final OpRef ref;
 	private final OpInfo info;
 
@@ -76,8 +78,11 @@ public static enum StatusCode {
 	 * If the op does not, this will be the same as {@link #ref}.getArgs(). */
 	private final Type[] paddedArgs;
 
-	public OpCandidate(final OpEnvironment ops, final OpRef ref, final OpInfo info, final Map<TypeVariable<?>, Type> typeVarAssigns) {
+	public OpCandidate(final OpEnvironment ops, final Logger log, final OpRef ref, final OpInfo info,
+		final Map<TypeVariable<?>, Type> typeVarAssigns)
+	{
 		this.ops = ops;
+		this.log = log;
 		this.ref = ref;
 		this.info = info;
 		this.typeVarAssigns = typeVarAssigns;

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public List<OpCandidate> findCandidates(final OpEnvironment ops, final List<OpRe`
`102`	`102`	`for (final OpInfo info : ops.infos(ref.getName())) {`
`103`	`103`	`Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();`
`104`	`104`	`if (ref.typesMatch(info.opType(), typeVarAssigns)) {`
`105`		`- candidates.add(new OpCandidate(ops, ref, info, typeVarAssigns));`
	`105`	`+ candidates.add(new OpCandidate(ops, log, ref, info, typeVarAssigns));`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`