Migrate labkey-client-api to use a modern JSON library: JSON-java (#141)

Author: labkey-adam

LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java

@@ -18,8 +18,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -479,21 +477,21 @@ private void calculatedColumnsTest() throws Exception
                 assertTrue("Row " + i + " is missing value for column: " + col, row.containsKey(col));
 
                 Object serverVal = row.get(col);
-                //NOTE: the java api uses org.json.simple.JSONArray, which implements List
-                if (serverVal instanceof List)
+
+                //NOTE: the response value can be a List
+                if (serverVal instanceof List<?> list)
                 {
-                    List arr = ((List)serverVal);
-                    String value = arr.size() == 0 ? null : StringUtils.trimToNull(StringUtils.join(arr, "\n"));
+                    String value = list.isEmpty() ? null : StringUtils.trimToNull(StringUtils.join(list, "\n"));
                     assertEquals("Incorrect value for: " + col + " on row: " + i, expectations[idx], value);
                 }
                 else if (serverVal instanceof Date)
                 {
                     Date d = dateFormat.parse(expectations[idx]);
                     assertEquals("Incorrect value for: " + col + " on row " + i, d, serverVal);
                 }
-                else if (serverVal != null && (serverVal instanceof Integer || serverVal instanceof Double))
+                else if ((serverVal instanceof Integer || serverVal instanceof Double))
                 {
-                    Double d = Double.parseDouble(expectations[idx]);
+                    double d = Double.parseDouble(expectations[idx]);
                     assertEquals("Incorrect value for: " + col + " on row " + i, d, Double.parseDouble(serverVal.toString()), DELTA);
                 }
                 else
@@ -1509,17 +1507,16 @@ private void samplesTableTest() throws Exception
         }
     }
 
-    private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
-    private String getColumnLabel(SelectRowsResponse srr, String name) throws org.json.simple.parser.ParseException
+    private String getColumnLabel(SelectRowsResponse srr, String name)
     {
-        JSONArray columnModel = (JSONArray) srr.getMetaData().get("fields");
-        for (Object o : columnModel)
+        List<Map<String, Object>> columnModel = (List<Map<String, Object>>) srr.getMetaData().get("fields");
+        for (Map<String, Object> column : columnModel)
         {
-            JSONObject json = (JSONObject) o;
-            if (name.equalsIgnoreCase((String) json.get("name")))
+            if (name.equalsIgnoreCase((String) column.get("name")))
             {
-                return String.valueOf(json.get("caption"));
+                return (String)column.get("caption");
             }
         }