Convert OpCache to Map<String, List<OpInfo>>

gselzer · ctrueden · commit 0f51d9ee5947 · 2019-09-22T17:26:38.000+02:00
This is simpler than the PrefixTree and the Map of aliases
Also, fix broken tests
diff --git a/src/main/java/org/scijava/ops/OpService.java b/src/main/java/org/scijava/ops/OpService.java
@@ -42,6 +42,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import org.scijava.InstantiableException;
 import org.scijava.log.LogService;
@@ -129,13 +130,13 @@ public class OpService extends AbstractService implements SciJavaService, OpEnvi
 	/**
 	 * Prefix tree to cache and quickly find {@link OpInfo}s.
 	 */
-	private PrefixTree<OpInfo> opCache;
+//	private PrefixTree<OpInfo> opCache;
 
 	/**
 	 * Map to collect all aliases for a specific op. All aliases will map to one
 	 * canonical name of the op which is defined as the first one.
 	 */
-	private Map<String, String> opAliases = new HashMap<>();
+	private Map<String, List<OpInfo>> opCache;
 
 	private static Map<Class<?>, Class<?>> wrappers = wrappers();
 
@@ -178,7 +179,7 @@ private static Map<Class<?>, Class<?>> wrappers() {
 	}
 
 	public void initOpCache() {
-		opCache = new PrefixTree<>();
+		opCache = new HashMap<>();
 
 		// Add regular Ops
 		for (final PluginInfo<Op> pluginInfo : pluginService.getPluginsOfType(Op.class)) {
@@ -222,16 +223,21 @@ private void addToCache(OpInfo opInfo, String opNames) {
 					+ opInfo.getValidityException().getMessage());
 			return;
 		}
-		addAliases(parsedOpNames, opInfo.implementationName());
-		opCache.add(new PrefixQuery(parsedOpNames[0]), opInfo);
+		for(String opName: parsedOpNames) {
+			if (!opCache.containsKey(opName))
+				opCache.put(opName, new ArrayList<>());
+			opCache.get(opName).add(opInfo);
+		}
 	}
 
 	@Override
 	public Iterable<OpInfo> infos() {
 		if (opCache == null) {
 			initOpCache();
 		}
-		return opCache.getAndBelow(PrefixQuery.all());
+        return opCache.values().stream()
+        		.flatMap(list -> list.stream())
+        		.collect(Collectors.toList());
 	}
 
 	@Override
@@ -242,11 +248,10 @@ public Iterable<OpInfo> infos(String name) {
 		if (name == null || name.isEmpty()) {
 			return infos();
 		}
-		String opName = opAliases.get(OpUtils.getCanonicalOpName(name));
-		if (opName == null) {
+		Iterable<OpInfo> infos = opCache.get(name);
+		if (infos == null)
 			throw new IllegalArgumentException("No op infos with name: " + name + " available.");
-		}
-		return opCache.getAndBelow(new PrefixQuery(opName));
+		return infos;
 	}
 
 	@Override
@@ -465,31 +470,6 @@ private OpRef inferOpRef(Type type, String name, Map<TypeVariable<?>, Type> type
 		return new OpRef(name, new Type[] { type }, mappedOutputs[0], mappedInputs);
 	}
 
-	/**
-	 * Updates alias map using the specified String list. The first String in the
-	 * list is assumed to be the canonical name of the op. After this method
-	 * returns, all String in the specified list will map to the canonical name.
-	 *
-	 * @param opNames
-	 */
-	private void addAliases(String[] opNames, String opImpl) {
-		String opName = opNames[0];
-		for (String alias : opNames) {
-			if (alias == null || alias.isEmpty()) {
-				continue;
-			}
-			if (opAliases.containsKey(alias)) {
-				if (!opAliases.get(alias).equals(opName)) {
-//					log.warn("Possible naming clash for op '" + opImpl + "' detected. Attempting to add alias '" + alias
-//							+ "' for op name '" + opName + "'. However the alias '" + alias + "' is already "
-//							+ "associated with op name '" + opAliases.get(alias) + "'.");
-				}
-				continue;
-			}
-			opAliases.put(alias, opName);
-		}
-	}
-
 	/**
 	 * Constructs a string with the specified number of tabs '\t'.
 	 *
diff --git a/src/test/java/org/scijava/ops/types/AnyTest.java b/src/test/java/org/scijava/ops/types/AnyTest.java
@@ -123,7 +123,7 @@ public void setValue(String value) {
 	}
 }
 
-@Plugin(type = Op.class, name = "create.mutableNotAny")
+@Plugin(type = Op.class, name = "create, create.mutableNotAny")
 @Parameter(key = "mutableNotAny", type = ItemIO.OUTPUT)
 class MutableNotAnyCreator implements Source<MutableNotAny> {
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public void setValue(String value) {`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`-@Plugin(type = Op.class, name = "create.mutableNotAny")`
	`126`	`+@Plugin(type = Op.class, name = "create, create.mutableNotAny")`
`127`	`127`	`@Parameter(key = "mutableNotAny", type = ItemIO.OUTPUT)`
`128`	`128`	`class MutableNotAnyCreator implements Source<MutableNotAny> {`
`129`	`129`