Skip to content

Fix integer casts #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 4 commits into from
Aug 18, 2025
Merged

Fix integer casts #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5ff368
Log exceptions so we get a stack trace
labkey-adam Aug 15, 2025
6c25c2a
Fix
labkey-adam Aug 16, 2025
2bdfba3
Fix another Integer cast
labkey-adam Aug 16, 2025
3b8cb01
One more cast removal that isn't flagged by the tests
labkey-adam Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions snprc_scheduler/src/org/labkey/snprc_scheduler/SNPRC_schedulerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import java.util.Map;
import java.util.Set;

import static org.labkey.api.exp.api.ExperimentService.asInteger;

public class SNPRC_schedulerManager
{
private static final SNPRC_schedulerManager _instance = new SNPRC_schedulerManager();
Expand Down Expand Up @@ -547,7 +549,7 @@ public void updateTimelineItems(Container c, User u, List<TimelineItem> timeline
if (insertedRow != null)
{
timelineItem.setObjectId((String) insertedRow.get(0).get(TimelineItem.TIMELINEITEM_OBJECT_ID));
timelineItem.setTimelineItemId((Integer) insertedRow.get(0).get(TimelineItem.TIMELINEITEM_TIMELINE_ITEM_ID));
timelineItem.setTimelineItemId(asInteger(insertedRow.get(0).get(TimelineItem.TIMELINEITEM_TIMELINE_ITEM_ID)));
timelineItem.setDirty(false);
}

Expand Down Expand Up @@ -736,7 +738,7 @@ public void updateTimelineProjectItems(Container c, User u, List<TimelineProject
if (insertedRow != null)
{
timelineProjectItem.setObjectId((String) insertedRow.get(0).get(TimelineProjectItem.TIMELINE_PROJECT_ITEM_TIMELINE_OBJECT_ID));
timelineProjectItem.setProjectItemId((Integer) insertedRow.get(0).get(TimelineProjectItem.TIMELINE_PROJECT_ITEM_PROJECT_ITEM_ID));
timelineProjectItem.setProjectItemId(asInteger(insertedRow.get(0).get(TimelineProjectItem.TIMELINE_PROJECT_ITEM_PROJECT_ITEM_ID)));
timelineProjectItem.setDirty(false);
}
}
Expand Down Expand Up @@ -816,17 +818,14 @@ public void updateTimelineAnimalItems(@NotNull Container c, @NotNull User u, @No
timelineAnimalItem.setObjectId(new GUID().toString());
timelineAnimalItemRows.add(timelineAnimalItem.toMap(c));

if (!timelineAnimalItemRows.isEmpty())
{
List<Map<String, Object>> insertedRow = qus.insertRows(u, c, timelineAnimalItemRows, errors, null, null);
List<Map<String, Object>> insertedRow = qus.insertRows(u, c, timelineAnimalItemRows, errors, null, null);

// add updated values returned from db call
if (insertedRow != null)
{
timelineAnimalItem.setObjectId((String) insertedRow.get(0).get(TimelineAnimalJunction.TIMELINE_ANIMAL_JUNCTION_OBJECT_ID));
timelineAnimalItem.setRowId((Integer) insertedRow.get(0).get(TimelineAnimalJunction.TIMELINE_ANIMAL_JUNCTION_ROW_ID));
timelineAnimalItem.setDirty(false);
}
// add updated values returned from db call
if (insertedRow != null)
{
timelineAnimalItem.setObjectId((String) insertedRow.get(0).get(TimelineAnimalJunction.TIMELINE_ANIMAL_JUNCTION_OBJECT_ID));
timelineAnimalItem.setRowId(asInteger(insertedRow.get(0).get(TimelineAnimalJunction.TIMELINE_ANIMAL_JUNCTION_ROW_ID)));
timelineAnimalItem.setDirty(false);
}
}
// delete existing row
Expand Down
5 changes: 5 additions & 0 deletions snprc_scheduler/src/org/labkey/snprc_scheduler/services/SNPRC_schedulerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.labkey.snprc_scheduler.services;

import org.apache.logging.log4j.Logger;
import org.json.JSONArray;
import org.json.JSONObject;
import org.labkey.api.action.ApiUsageException;
Expand All @@ -17,6 +18,7 @@
import org.labkey.api.security.User;
import org.labkey.api.snd.SNDService;
import org.labkey.api.snprc_scheduler.SNPRC_schedulerService;
import org.labkey.api.util.logging.LogHelper;
import org.labkey.snprc_scheduler.SNPRC_schedulerManager;
import org.labkey.snprc_scheduler.SNPRC_schedulerSchema;
import org.labkey.snprc_scheduler.SNPRC_schedulerUserSchema;
Expand All @@ -36,6 +38,8 @@
*/
public class SNPRC_schedulerServiceImpl implements SNPRC_schedulerService
{
private static final Logger LOG = LogHelper.getLogger(SNPRC_schedulerServiceImpl.class, "Timeline errors");

public static final SNPRC_schedulerServiceImpl INSTANCE = new SNPRC_schedulerServiceImpl();

private SNPRC_schedulerServiceImpl()
Expand Down Expand Up @@ -306,6 +310,7 @@ public JSONObject saveTimelineData(Container c, User u, JSONObject json, BatchVa
}
catch (RuntimeException e)
{
LOG.error("Exception saving timeline data", e);
errors.addRowError(new ValidationException(e.getMessage()));
}
}
Expand Down