ScriptInfo: try harder when converting types

ctrueden · ctrueden · commit c677ea109cf8 · 2016-08-22T15:01:15.000-05:00
If we cannot convert directly from source to target type, try converting through String before giving up. With this change, the following now works as desired: // @string(visibility=MESSAGE) text The reason this change fixes the above is that the expression "visibility=MESSAGE" evaluates to the map: visibility -> new org.scijava.sjep.eval.Unresolved("MESSAGE") That is, the variable "visibility" contains an object of type org.scijava.sjep.eval.Unresolved, with a token value of "MESSAGE". We cannot convert from an org.scijava.sjep.eval.Unresolved to an org.scijava.ItemVisibility, but we _can_ convert from Unresolved to String (the toString() method is called, resulting in "MESSAGE"), followed by String to ItemVisibility (the string value is considered to be naming one of the enumeration's values). This heuristic avoids an explicit assumption in the scripting framework of the ParseService being backed by SJEP (it might not be -- someone might be using their own higher priority ParseService).
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -450,7 +450,13 @@ private boolean is(final String key, final String desired) {
 
 	/** Super terse conversion helper method. */
 	private <T> T as(final Object v, final Class<T> type) {
-		return convertService.convert(v, type);
+		final T converted = convertService.convert(v, type);
+		if (converted != null) return converted;
+		// NB: Attempt to convert via string.
+		// This is useful in cases where a weird type of object came back
+		// (e.g., org.scijava.sjep.eval.Unresolved), but which happens to have a
+		// nice string representation which ultimately is expressible as the type.
+		return convertService.convert(v.toString(), type);
 	}
 
 	private <T> List<T> asList(final Object v, final Class<T> type) {
