instanceof Integer

probably need a new helpers like
isIntegerObject() // instanceof Integer or Long
asIntegerOrNull() // null if not isIntegerObject()
asLongOrNull()    // null if not isIntegerObject()

Author: labkey-matthewb

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

@@ -494,7 +494,7 @@ else if (serverVal instanceof Date)
                     Date d = dateFormat.parse(expectations[idx]);
                     assertEquals("Incorrect value for: " + col + " on row " + i, d, serverVal);
                 }
-                else if ((serverVal instanceof Integer || serverVal instanceof Double))
+                else if ((serverVal instanceof Integer || serverVal instanceof Long || serverVal instanceof Double))
                 {
                     double d = Double.parseDouble(expectations[idx]);
                     assertEquals("Incorrect value for: " + col + " on row " + i, d, Double.parseDouble(serverVal.toString()), DELTA);

laboratory/api-src/org/labkey/api/laboratory/query/ContainerIncrementingTable.java

@@ -41,6 +41,8 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 
+import static org.labkey.api.exp.api.ExperimentService.asInteger;
+
 /**
  * User: bimber
  * Date: 3/12/13
@@ -153,6 +155,8 @@ private Integer getInteger(Object value) throws ValidationException
             return null;
         else if (value instanceof Integer)
             return (Integer)value;
+        else if (value instanceof Long)
+            return asInteger(value);
         else if (value instanceof Double)
             return ((Double)value).intValue();
         try
@@ -326,9 +330,9 @@ public Object call() throws Exception
                         Object selfAssignedId = it.getInputColumnValue(inputColMap.get(_incrementingCol));
                         if (selfAssignedId != null)
                         {
-                            if (selfAssignedId instanceof Integer)
+                            if (selfAssignedId instanceof Integer || selfAssignedId instanceof Long)
                             {
-                                rowId = (Integer)selfAssignedId;
+                                rowId = asInteger(selfAssignedId);
 
                                 if (idGen.hasRowWithId(c, rowId))
                                     _context.getErrors().addRowError(new ValidationException("A record is already present with ID: " + rowId));