add List support to Converter.convert()

basic Converter junit test

Author: labkey-matthewb

api/src/org/labkey/api/data/MultiChoice.java

@@ -3,16 +3,21 @@
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import org.json.JSONArray;
+import org.junit.Assert;
+import org.junit.Test;
 import org.labkey.api.collections.CaseInsensitiveHashSet;
 import org.labkey.api.exp.property.IPropertyValidator;
 import org.labkey.api.exp.property.PropertyService;
 import org.labkey.api.gwt.client.model.PropertyValidatorType;
 import org.labkey.api.ontology.Unit;
+import org.labkey.api.reader.TabLoader;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.writer.HtmlWriter;
 
+import java.io.StringBufferInputStream;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -186,6 +191,7 @@ protected Array(Stream<Object> str)
             array = str.filter(Objects::nonNull)
                     .map(s -> StringUtils.trimToNull(s.toString()))
                     .filter(Objects::nonNull)
+                    .filter(set::add)
                     .toArray(String[]::new);
         }
 
@@ -206,6 +212,20 @@ private List<String> getList()
             return list;
         }
 
+        @Override
+        public boolean equals(Object obj)
+        {
+            if (!(obj instanceof Array arr))
+                return false;
+            return Arrays.equals(array, arr.array);
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return Arrays.hashCode(array);
+        }
+
         @Override
         public String toString()
         {
@@ -491,13 +511,17 @@ public static Converter getInstance()
         public <T> T convert(Class<T> aClass, Object o)
         {
             if (null == o)
-                return (T) List.of();
+                return (T) Array.from(new String[]{});
+            if (o instanceof MultiChoice.Array arr)
+                return (T)arr;
             if (o instanceof String s)
                 return (T) Array.from(s);
-            if (o instanceof org.json.JSONArray json)
-                return (T) Array.from(json);
             if (o.getClass().isArray())
                 return (T) Array.from((Object[]) o);
+            if (o instanceof org.json.JSONArray json)
+                return (T) Array.from(json);
+            if (o instanceof List list)
+                return (T) new Array(list.stream());
             return (T) Array.from(o.toString());
         }
 
@@ -507,4 +531,56 @@ final public Object apply(Object o)
             return convert(MultiChoice.Array.class, o);
         }
     }
+
+
+
+    public static class TestCase extends Assert
+    {
+        @Test
+        public void testConvert() throws Exception
+        {
+            Array expected = Array.from(new String[]{"a,","b\"","c "});
+
+            assertEquals(expected, _converter.convert(Array.class, expected));
+            assertEquals(expected, _converter.convert(Array.class, "\"a,\",\"b\"\"\",\"c \""));
+            assertEquals(expected, _converter.convert(Array.class, new String[]{"a,","b\"","c "}));
+            assertEquals(expected, _converter.convert(Array.class, List.of("a,","b\"","c ")));
+            assertEquals(expected, _converter.convert(Array.class, new JSONArray(List.of("a,","b\"","c "))));
+        }
+
+        @Test
+        public void testCSV() throws Exception
+        {
+            Array expected = Array.from(new String[]{"a,", "b\\", "c,d", "e\"f"});
+            // toString() == "a,", b\, "c,d", "e""f"
+            assertEquals("\"a,\", b\\, \"c,d\", \"e\"\"f\"", expected.toString());
+
+            // csv/tsv with double double-quote escaping
+            // add " around entire value, and double the "
+            // (need to use some \" to avoid ending the """ """ block)
+            String oneMultiValueColumn = """
+                column
+                ""\"a,"", b\\, ""c,d"", ""e""\""f""\"
+                """;
+
+            try (var csvLoader = new TabLoader.CsvFactory().createLoader(new StringBufferInputStream(oneMultiValueColumn), true))
+            {
+                var maps = csvLoader.load();
+                assertEquals(1, maps.size());
+                Map<String,Object> map = maps.get(0);
+                assertTrue(map.get("column") instanceof String);
+                String value = (String) map.get("column");
+                assertEquals(expected, Array.from(value));
+            }
+            try (var tsvLoader = new TabLoader.TsvFactory().createLoader(new StringBufferInputStream(oneMultiValueColumn), true))
+            {
+                var maps = tsvLoader.load();
+                assertEquals(1, maps.size());
+                Map<String,Object> map = maps.get(0);
+                assertTrue(map.get("column") instanceof String);
+                String value = (String) map.get("column");
+                assertEquals(expected, Array.from(value));
+            }
+        }
+    }
 }

core/src/org/labkey/core/CoreModule.java

@@ -60,6 +60,7 @@
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.DbScope;
 import org.labkey.api.data.FileSqlScriptProvider;
+import org.labkey.api.data.MultiChoice;
 import org.labkey.api.data.MvUtil;
 import org.labkey.api.data.NormalContainerType;
 import org.labkey.api.data.OutOfRangeDisplayColumn;
@@ -1454,6 +1455,7 @@ public TabDisplayMode getTabDisplayMode()
             ApiJsonWriter.TestCase.class,
             ClassLoaderTestCase.class,
             CopyFileRootPipelineJob.TestCase.class,
+            MultiChoice.TestCase.class,
             OutOfRangeDisplayColumn.TestCase.class,
             PostgreSqlVersion.TestCase.class,
             ScriptEngineManagerImpl.TestCase.class,