Support BIGINT Primary Keys

Original PR: LabKey/platform#6911

Author: labkey-matthewb

studydesign/src/org/labkey/studydesign/model/AssaySpecimenConfigImpl.java

@@ -251,11 +251,11 @@ public static AssaySpecimenConfigImpl fromJSON(@NotNull JSONObject o, Container
 
         if (o.has("RowId"))
             assay.setRowId(o.getInt("RowId"));
-        if (o.has("DataSet") && o.get("DataSet") instanceof Integer && o.getInt("DataSet") > 0)
+        if (o.has("DataSet") && (o.get("DataSet") instanceof Integer || o.get("DataSet") instanceof Long) && o.getInt("DataSet") > 0)
             assay.setDataset(o.getInt("DataSet"));
         if (o.has("Source") && !StringUtils.isEmpty(o.getString("Source")))
             assay.setSource(o.getString("Source"));
-        if (o.has("LocationId") && o.get("LocationId") instanceof Integer && o.getInt("LocationId") > 0)
+        if (o.has("LocationId") && (o.get("LocationId") instanceof Integer || o.get("LocationId") instanceof Long) && o.getInt("LocationId") > 0)
             assay.setLocationId(o.getInt("LocationId"));
         if (o.has("TubeType") && !StringUtils.isEmpty(o.getString("TubeType")))
             assay.setTubeType(o.getString("TubeType"));
@@ -267,9 +267,9 @@ public static AssaySpecimenConfigImpl fromJSON(@NotNull JSONObject o, Container
             assay.setSampleQuantity(o.getDouble("SampleQuantity"));
         if (o.has("SampleUnits") && !StringUtils.isEmpty(o.getString("SampleUnits")))
             assay.setSampleUnits(o.getString("SampleUnits"));
-        if (o.has("PrimaryTypeId") && o.get("PrimaryTypeId") instanceof Integer)
+        if (o.has("PrimaryTypeId") && (o.get("PrimaryTypeId") instanceof Integer || o.get("PrimaryTypeId") instanceof Long))
             assay.setPrimaryTypeId(o.getInt("PrimaryTypeId"));
-        if (o.has("DerivativeTypeId") && o.get("DerivativeTypeId") instanceof Integer)
+        if (o.has("DerivativeTypeId") && (o.get("DerivativeTypeId") instanceof Integer || o.get("DerivativeTypeId") instanceof Long))
             assay.setDerivativeTypeId(o.getInt("DerivativeTypeId"));
 
         JSONArray visitMapJSON = o.optJSONArray("VisitMap");

studydesign/src/org/labkey/studydesign/model/TreatmentImpl.java

@@ -29,6 +29,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.labkey.api.exp.api.ExperimentService.asInteger;
+
 /**
  * User: cnathe
  * Date: 12/27/13
@@ -168,8 +170,8 @@ public static TreatmentImpl fromJSON(@NotNull JSONObject o, Container container)
 
         if (o.has("RowId"))
         {
-            if (o.get("RowId") instanceof Integer)
-                treatment.setRowId(o.getInt("RowId"));
+            if (o.get("RowId") instanceof Integer || o.get("RowId") instanceof Integer)
+                treatment.setRowId(asInteger("RowId"));
             else
                 treatment.setTempRowId(o.getString("RowId"));
         }

studydesign/src/org/labkey/studydesign/model/TreatmentManager.java

@@ -65,6 +65,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import static org.labkey.api.exp.api.ExperimentService.asInteger;
+
 /**
  * Created by cnathe on 1/24/14.
  */
@@ -456,7 +458,7 @@ public Integer saveStudyDesignRow(Container container, User user, TableInfo tabl
                 throw errors.getLastRowError();
 
             if (updatedRows.size() == 1)
-                return (Integer) updatedRows.get(0).get(pkColName);
+                return asInteger(updatedRows.get(0).get(pkColName));
         }
 
         return null;

studydesign/src/org/labkey/studydesign/model/TreatmentProductImpl.java

@@ -24,6 +24,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.labkey.api.exp.api.ExperimentService.asInteger;
+
 /**
  * User: cnathe
  * Date: 12/27/13
@@ -190,10 +192,10 @@ public static TreatmentProductImpl fromJSON(@NotNull JSONObject o, Container con
         //treatmentProduct.setDose(o.getString("Dose"));
         //treatmentProduct.setRoute(o.getString("Route"));
         treatmentProduct.setContainer(container);
-        if (o.has("ProductId") && o.get("ProductId") instanceof Integer productId)
-            treatmentProduct.setProductId(productId);
-        if (o.has("TreatmentId") && o.get("TreatmentId") instanceof Integer treatmentId)
-            treatmentProduct.setTreatmentId(treatmentId);
+        if (o.has("ProductId") && (o.get("ProductId") instanceof Integer || o.get("ProductId") instanceof Long))
+            treatmentProduct.setProductId(asInteger(o.get("ProductId")));
+        if (o.has("TreatmentId") && (o.get("TreatmentId") instanceof Integer || o.get("TreatmentId") instanceof Long))
+            treatmentProduct.setTreatmentId(asInteger(o.get("TreatmentId")));
         if (o.has("RowId"))
             treatmentProduct.setRowId(o.getInt("RowId"));
         if (o.has("DoseAndRoute"))

studydesign/src/org/labkey/studydesign/model/TreatmentVisitMapImpl.java

@@ -110,7 +110,7 @@ public static TreatmentVisitMapImpl fromJSON(@NotNull JSONObject o)
             visitMap.setCohortId(o.getInt("CohortId"));
         if (o.has("TreatmentId"))
         {
-            if (o.get("TreatmentId") instanceof Integer)
+            if (o.get("TreatmentId") instanceof Integer || o.get("TreatmentId") instanceof Long)
                 visitMap.setTreatmentId(o.getInt("TreatmentId"));
             else
                 visitMap.setTempTreatmentId(o.getString("TreatmentId"));

studydesign/src/org/labkey/studydesign/view/immunizationScheduleWebpart.jsp

@@ -34,6 +34,7 @@
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+<%@ page import="org.labkey.api.collections.IntHashMap" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%!
     @Override
@@ -113,7 +114,7 @@
                 {
                     index++;
                     List<? extends TreatmentVisitMap> mapping = TreatmentManager.getInstance().getStudyTreatmentVisitMap(c, cohort.getRowId());
-                    Map<Integer, Integer> visitTreatments = new HashMap<>();
+                    Map<Integer, Integer> visitTreatments = new IntHashMap<>();
                     for (TreatmentVisitMap treatmentVisitMap : mapping)
                     {
                         visitTreatments.put(treatmentVisitMap.getVisitId(), treatmentVisitMap.getTreatmentId());