Use ParseService

gselzer · gselzer · commit 73239ad09c78 · 2022-09-21T16:55:56.000-05:00
Thanks @ctrueden for the suggestion
diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -30,6 +30,8 @@
 package org.scijava.convert;
 
 import org.scijava.Priority;
+import org.scijava.parse.Items;
+import org.scijava.parse.ParseService;
 import org.scijava.parsington.ExpressionParser;
 import org.scijava.parsington.SyntaxTree;
 import org.scijava.plugin.Parameter;
@@ -53,6 +55,9 @@ public class StringToArrayConverter extends AbstractConverter<String, Object> {
 	@Parameter
 	private ConvertService convertService;
 
+	@Parameter
+	private ParseService parseService;
+
 	private final ExpressionParser parser = new ExpressionParser();
 
 	@Override
@@ -101,8 +106,9 @@ public Object convert(Object src, Type dest) {
 			throw new IllegalArgumentException(dest + " is not an array type!");
 		}
 		try {
-			SyntaxTree tree = parser.parseTree((String) src);
-			return convertToArray(tree, Types.raw(componentType));
+			return convertToArray( //
+				parseService.parse((String) src), //
+				Types.raw(componentType));
 		}
 		catch (IllegalArgumentException e) {
 			return null;
@@ -135,21 +141,12 @@ public Class<String> getInputType() {
 	 * @return an array of {@code componentType} whose elements were created from
 	 *         {@code src}
 	 */
-	private Object convertToArray(SyntaxTree tree, final Class<?> componentType) {
+	private Object convertToArray(Items tree, final Class<?> componentType) {
 		// Create the array
-		final Object array = Array.newInstance(componentType, tree.count());
+		final Object array = Array.newInstance(componentType, tree.size());
 		// Set each element of the array
-		for (int i = 0; i < tree.count(); i++) {
-			SyntaxTree subTree = tree.child(i);
-			Object element;
-			// Case 1: Element is an array
-			if (componentType.isArray()) {
-				element = convertToArray(subTree, componentType.getComponentType());
-			}
-			// Case 2: Element is a single object
-			else {
-				element = convertService.convert(subTree.token(), componentType);
-			}
+		for (int i = 0; i < tree.size(); i++) {
+			Object element = convertService.convert(tree.get(i).value(), componentType);
 			Array.set(array, i, element);
 		}
 		return array;
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -37,6 +37,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.parse.ParseService;
 
 /**
  * Tests {@link ArrayToStringConverter}.
@@ -50,7 +51,7 @@ public class ArrayToStringConverterTest {
 
 	@Before
 	public void setUp() {
-		context = new Context(ConvertService.class);
+		context = new Context(ConvertService.class, ParseService.class);
 		context.inject(converter);
 	}
 
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -34,6 +34,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.parse.ParseService;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
@@ -52,7 +53,7 @@ public class StringToArrayConverterTest {
 
 	@Before
 	public void setUp() {
-		context = new Context(ConvertService.class);
+		context = new Context(ParseService.class, ConvertService.class);
 		context.inject(converter);
 		convertService = context.getService(ConvertService.class);
 	}
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -46,6 +46,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.parse.ParseService;
 
 /**
  * Tests {@link ModuleService}.
@@ -58,7 +59,7 @@ public class ModuleServiceTest {
 
 	@Before
 	public void setUp() {
-		final Context context = new Context(ModuleService.class);
+		final Context context = new Context(ModuleService.class, ParseService.class);
 		moduleService = context.service(ModuleService.class);
 	}
 
