IntegerUtils class

Original PR: LabKey/platform#6933

Author: labkey-matthewb

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

@@ -29,6 +29,8 @@
 import java.util.Map;
 import java.util.Objects;
 
+import static org.labkey.api.util.IntegerUtils.asIntegerElseNull;
+
 /**
  * Represents an assay/specimen configuration for a study
  */
@@ -251,26 +253,26 @@ 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.get("DataSet") instanceof Long) && o.getInt("DataSet") > 0)
-            assay.setDataset(o.getInt("DataSet"));
+        if (o.has("DataSet") && asIntegerElseNull(o.get("DataSet")) instanceof Integer dataset && dataset > 0)
+            assay.setDataset(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.get("LocationId") instanceof Long) && o.getInt("LocationId") > 0)
+        if (o.has("LocationId") && asIntegerElseNull(o.get("LocationId")) instanceof Integer locationId && locationId > 0)
             assay.setLocationId(o.getInt("LocationId"));
         if (o.has("TubeType") && !StringUtils.isEmpty(o.getString("TubeType")))
             assay.setTubeType(o.getString("TubeType"));
         if (o.has("Lab") && !StringUtils.isEmpty(o.getString("Lab")))
             assay.setLab(o.getString("Lab"));
         if (o.has("SampleType") && !StringUtils.isEmpty(o.getString("SampleType")))
             assay.setSampleType(o.getString("SampleType"));
-        if (o.has("SampleQuantity") && (o.get("SampleQuantity") instanceof Integer || o.get("SampleQuantity") instanceof Double) && o.getDouble("SampleQuantity") > 0)
-            assay.setSampleQuantity(o.getDouble("SampleQuantity"));
+        if (o.has("SampleQuantity") && o.get("SampleQuantity") instanceof Number sampleQuantity && sampleQuantity.doubleValue() > 0)
+            assay.setSampleQuantity(sampleQuantity.doubleValue());
         if (o.has("SampleUnits") && !StringUtils.isEmpty(o.getString("SampleUnits")))
             assay.setSampleUnits(o.getString("SampleUnits"));
-        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 || o.get("DerivativeTypeId") instanceof Long))
-            assay.setDerivativeTypeId(o.getInt("DerivativeTypeId"));
+        if (o.has("PrimaryTypeId") && asIntegerElseNull(o.get("PrimaryTypeId")) instanceof Integer primaryTypeId)
+            assay.setPrimaryTypeId(primaryTypeId);
+        if (o.has("DerivativeTypeId") && asIntegerElseNull(o.get("DerivativeTypeId")) instanceof Integer derivativeTypeId)
+            assay.setDerivativeTypeId(derivativeTypeId);
 
         JSONArray visitMapJSON = o.optJSONArray("VisitMap");
         if (visitMapJSON != null)

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

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

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

@@ -65,7 +65,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.labkey.api.exp.api.ExperimentService.asInteger;
+import static org.labkey.api.util.IntegerUtils.asInteger;
 
 /**
  * Created by cnathe on 1/24/14.

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

@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.labkey.api.exp.api.ExperimentService.asInteger;
+import static org.labkey.api.util.IntegerUtils.asIntegerElseNull;
 
 /**
  * User: cnathe
@@ -192,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 || 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("ProductId") && asIntegerElseNull(o.get("ProductId")) instanceof Integer productId)
+            treatmentProduct.setProductId(productId);
+        if (o.has("TreatmentId") && asIntegerElseNull(o.get("TreatmentId")) instanceof Integer treatmentId)
+            treatmentProduct.setTreatmentId(treatmentId);
         if (o.has("RowId"))
             treatmentProduct.setRowId(o.getInt("RowId"));
         if (o.has("DoseAndRoute"))

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

@@ -19,6 +19,8 @@
 import org.json.JSONObject;
 import org.labkey.api.data.Container;
 
+import static org.labkey.api.util.IntegerUtils.asIntegerElseNull;
+
 /**
  * User: cnathe
  * Date: 12/30/13
@@ -110,8 +112,8 @@ public static TreatmentVisitMapImpl fromJSON(@NotNull JSONObject o)
             visitMap.setCohortId(o.getInt("CohortId"));
         if (o.has("TreatmentId"))
         {
-            if (o.get("TreatmentId") instanceof Integer || o.get("TreatmentId") instanceof Long)
-                visitMap.setTreatmentId(o.getInt("TreatmentId"));
+            if (asIntegerElseNull(o.get("TreatmentId")) instanceof Integer treatmentId)
+                visitMap.setTreatmentId(treatmentId);
             else
                 visitMap.setTempTreatmentId(o.getString("TreatmentId"));
         }