Merge pull request #281 from LabKey/fb_convert_helper_convert

labkey-matthewb · web-flow · commit 70ff75c7ea22 · 2026-02-26T10:17:52.000-08:00
Don't pass intrinsic types to convert() (e.g. int.class)
diff --git a/LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java b/LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java
@@ -320,7 +320,7 @@ public boolean rowExists(Container c, Object key)
             ColumnInfo pkCol = getColumn(FieldKey.fromString(_pseudoPk));
             try
             {
-                key = ConvertHelper.convert(key, pkCol.getJavaClass());
+                key = pkCol.convert(key);
             }
             catch (ConversionException e)
             {
diff --git a/laboratory/api-src/org/labkey/api/laboratory/assay/DefaultAssayParser.java b/laboratory/api-src/org/labkey/api/laboratory/assay/DefaultAssayParser.java
@@ -258,7 +258,7 @@ protected void performDefaultChecks(List<Map<String, Object>> rows, ImportContex
 
                     try
                     {
-                        ConvertHelper.convert(row.get(name), pd.getJavaClass());
+                        pd.convert(row.get(name));
                     }
                     catch (ConversionException e)
                     {

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ public boolean rowExists(Container c, Object key)`
`320`	`320`	`ColumnInfo pkCol = getColumn(FieldKey.fromString(_pseudoPk));`
`321`	`321`	`try`
`322`	`322`	`{`
`323`		`- key = ConvertHelper.convert(key, pkCol.getJavaClass());`
	`323`	`+ key = pkCol.convert(key);`
`324`	`324`	`}`
`325`	`325`	`catch (ConversionException e)`
`326`	`326`	`{`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ protected void performDefaultChecks(List<Map<String, Object>> rows, ImportContex`
`258`	`258`
`259`	`259`	`try`
`260`	`260`	`{`
`261`		`- ConvertHelper.convert(row.get(name), pd.getJavaClass());`
	`261`	`+ pd.convert(row.get(name));`
`262`	`262`	`}`
`263`	`263`	`catch (ConversionException e)`
`264`	`264`	`{`