Add warning for inconsistent op aliases

Treiblesschorle · ctrueden · commit 54a48a7fbb9c · 2019-04-18T12:16:31.000-05:00
diff --git a/src/main/java/org/scijava/ops/OpService.java b/src/main/java/org/scijava/ops/OpService.java
@@ -128,7 +128,7 @@ private void addToCache(OpInfo opInfo, String opNames) {
 			return;
 		}
 		String[] parsedNames = OpUtils.parseOpNames(opNames);
-		addAliases(parsedNames);
+		addAliases(parsedNames, opInfo.implementationName());
 		opCache.add(new PrefixQuery(parsedNames[0]), opInfo);
 	}
 
@@ -227,16 +227,21 @@ private Type[] toTypes(Nil<?>... nils) {
 	 * 
 	 * @param opNames
 	 */
-	private void addAliases(String[] opNames) {
+	private void addAliases(String[] opNames, String opImpl) {
 		String opName = opNames[0];
-		for (String name : opNames) {
-			if (name == null || name.isEmpty()) {
+		for (String alias : opNames) {
+			if (alias == null || alias.isEmpty()) {
 				continue;
 			}
-			if (opAliases.containsKey(name)) {
+			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(name, opName);
+			opAliases.put(alias, opName);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private void addToCache(OpInfo opInfo, String opNames) {`
`128`	`128`	`return;`
`129`	`129`	`}`
`130`	`130`	`String[] parsedNames = OpUtils.parseOpNames(opNames);`
`131`		`- addAliases(parsedNames);`
	`131`	`+ addAliases(parsedNames, opInfo.implementationName());`
`132`	`132`	`opCache.add(new PrefixQuery(parsedNames[0]), opInfo);`
`133`	`133`	`}`
`134`	`134`
`@@ -227,16 +227,21 @@ private Type[] toTypes(Nil<?>... nils) {`
`227`	`227`	`*`
`228`	`228`	`* @param opNames`
`229`	`229`	`*/`
`230`		`- private void addAliases(String[] opNames) {`
	`230`	`+ private void addAliases(String[] opNames, String opImpl) {`
`231`	`231`	`String opName = opNames[0];`
`232`		`- for (String name : opNames) {`
`233`		`- if (name == null \|\| name.isEmpty()) {`
	`232`	`+ for (String alias : opNames) {`
	`233`	`+ if (alias == null \|\| alias.isEmpty()) {`
`234`	`234`	`continue;`
`235`	`235`	`}`
`236`		`- if (opAliases.containsKey(name)) {`
	`236`	`+ if (opAliases.containsKey(alias)) {`
	`237`	`+ if (!opAliases.get(alias).equals(opName)) {`
	`238`	`+ log.warn("Possible naming clash for op '" + opImpl + "' detected. Attempting to add alias '"`
	`239`	`+ + alias + "' for op name '" + opName + "'. However the alias '" + alias + "' is already "`
	`240`	`+ + "associated with op name '" + opAliases.get(alias) + "'.");`
	`241`	`+ }`
`237`	`242`	`continue;`
`238`	`243`	`}`
`239`		`- opAliases.put(name, opName);`
	`244`	`+ opAliases.put(alias, opName);`
`240`	`245`	`}`
`241`	`246`	`}`
`242`	`247`