Skip to content
Snippets Groups Projects
Commit 6467a765 authored by buczekp's avatar buczekp
Browse files

[LMS-1457] refactored id: int -> long

SVN: 15539
parent c09a4ebe
No related branches found
No related tags found
No related merge requests found
......@@ -24,14 +24,14 @@ public class TrackingStateDTO
private Set<Long> alreadyTrackedSampleIdsProcessed;
private int lastSeenDatasetId;
private long lastSeenDatasetId;
public int getLastSeenDatasetId()
public long getLastSeenDatasetId()
{
return lastSeenDatasetId;
}
public void setLastSeenDatasetId(int lastSeenDatasetId)
public void setLastSeenDatasetId(long lastSeenDatasetId)
{
this.lastSeenDatasetId = lastSeenDatasetId;
}
......
......@@ -74,7 +74,7 @@ public class FileBasedTrackingDAO implements ITrackingDAO
String[] datasetId = lines.get(0).split("\t");
String[] toBeProcessed = lines.get(1).split("\t");
String[] processed = lines.get(2).split("\t");
state.setLastSeenDatasetId(Integer.parseInt(datasetId[1]));
state.setLastSeenDatasetId(Long.parseLong(datasetId[1]));
state.setAlreadyTrackedSampleIdsToBeProcessed(parseIds(toBeProcessed));
state.setAlreadyTrackedSampleIdsProcessed(parseIds(processed));
return state;
......
......@@ -219,7 +219,7 @@ public class TrackingBO
.getSequencingSamplesProcessed());
state.setAlreadyTrackedSampleIdsProcessed(sequencingSamplesProcessed);
int lastSeenDatasetId =
long lastSeenDatasetId =
calcMaxId(changedEntities.getDataSets(), prevState.getLastSeenDatasetId());
state.setLastSeenDatasetId(lastSeenDatasetId);
return state;
......@@ -234,15 +234,14 @@ public class TrackingBO
}
}
private static int calcMaxId(List<? extends IIdentifiable> entities, int initialValue)
private static long calcMaxId(List<? extends IIdentifiable> entities, long initialValue)
{
long max = initialValue;
for (IIdentifiable entity : entities)
{
max = Math.max(max, entity.getId());
}
// TODO 2009-12-01, Tomasz Pylak: refactor ids to long everywhere
return (int) max;
return max;
}
}
}
......@@ -68,7 +68,7 @@ public interface IDatasetListingQuery extends TransactionQuery, IPropertyListing
@Select(sql = "SELECT * FROM data JOIN external_data ON data.id = external_data.data_id"
+ " WHERE data.id > ?{2} AND data.samp_id IN (SELECT id FROM samples s WHERE s.saty_id=?{1})", fetchSize = FETCH_SIZE)
public DataIterator<DatasetRecord> getNewDataSetsForSampleType(long sampleTypeId,
int lastSeenDatasetId);
long lastSeenDatasetId);
/**
* Returns datasets from store with given id that have status equal 'AVAILABLE' and were
......
......@@ -35,9 +35,9 @@ public class TrackingDataSetCriteria implements IsSerializable, Serializable
private final String connectedSampleTypeCode;
private int lastSeenDataSetId;
private long lastSeenDataSetId;
public TrackingDataSetCriteria(String connectedSampleTypeCode, int lastSeenDataSetId)
public TrackingDataSetCriteria(String connectedSampleTypeCode, long lastSeenDataSetId)
{
assert connectedSampleTypeCode != null;
this.lastSeenDataSetId = lastSeenDataSetId;
......@@ -49,12 +49,12 @@ public class TrackingDataSetCriteria implements IsSerializable, Serializable
return connectedSampleTypeCode;
}
public int getLastSeenDataSetId()
public long getLastSeenDataSetId()
{
return lastSeenDataSetId;
}
public void setLastSeenDataSetId(int lastSeenDataSetId)
public void setLastSeenDataSetId(long lastSeenDataSetId)
{
this.lastSeenDataSetId = lastSeenDataSetId;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment