(Integer)

Author: labkey-matthewb

ehr/src/org/labkey/ehr/EHRManager.java

@@ -109,6 +109,9 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import static org.labkey.api.exp.api.ExperimentService.asInteger;
+import static org.labkey.api.exp.api.ExperimentService.asLong;
+
 public class EHRManager
 {
     private static final EHRManager _instance = new EHRManager();
@@ -315,7 +318,7 @@ public List<String> ensureStudyQCStates(Container c, final User u, final boolean
                     row.put("publicdata", qc[2]);
                     row = Table.insert(u, ti, row);
 
-                    qcMap.put((String)row.get("label"), (Integer)row.get("rowid"));
+                    qcMap.put((String)row.get("label"), asInteger(row.get("rowid")));
 
                     shouldClearCache = true;
                 }
@@ -1111,24 +1114,24 @@ private void updatePropertyURI(Domain d, PropertyDescriptor pd) throws SQLExcept
 
         //find propertyId
         TableSelector ts = new TableSelector(propertyDescriptor, Collections.singleton("propertyid"), new SimpleFilter(FieldKey.fromString("PropertyURI"), pd.getPropertyURI()), null);
-        Integer[] ids = ts.getArray(Integer.class);
+        Long[] ids = ts.getArray(Long.class);
         if (ids.length == 0)
         {
             throw new SQLException("Unknown propertyURI: " + pd.getPropertyURI());
         }
-        int propertyId = ids[0];
+        long propertyId = ids[0];
 
         //first ensure the propertyURI exists
         SQLFragment sql = new SQLFragment("select propertyid from exp.propertydomain p where domainId = ? AND propertyid in (select propertyid from exp.propertydescriptor pd where pd.name " + (expSchema.getSqlDialect().isPostgreSQL() ? "ilike" : "like") + " ?)", d.getTypeId(), pd.getName());
         SqlSelector selector = new SqlSelector(expSchema.getScope(), sql);
-        List<Integer> oldIds = new ArrayList<>();
+        List<Long> oldIds = new ArrayList<>();
 
         try (TableResultSet results = selector.getResultSet())
         {
             while (results.next())
             {
                 Map<String, Object> row = results.getRowMap();
-                oldIds.add((Integer) row.get("propertyid"));
+                oldIds.add(asLong(row.get("propertyid")));
             }
         }
 
@@ -1171,7 +1174,7 @@ private void updatePropertyURI(Domain d, PropertyDescriptor pd) throws SQLExcept
             executor.execute(updateSql, propertyId, d.getTypeId(), oldIds, minSort);
 
             oldIds.remove(propertyId);
-            for (Integer id : oldIds)
+            for (Long id : oldIds)
             {
                 PropertyDescriptor toDelete = OntologyManager.getPropertyDescriptor(id);
                 if (toDelete != null)