From 6467a765cd122340747e7f8ea97614c590fa4530 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 20 Apr 2010 18:50:42 +0000
Subject: [PATCH] [LMS-1457] refactored id: int -> long
SVN: 15539
---
.../ethz/bsse/cisd/dsu/tracking/dto/TrackingStateDTO.java | 6 +++---
.../bsse/cisd/dsu/tracking/main/FileBasedTrackingDAO.java | 2 +-
.../ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java | 7 +++----
.../business/bo/datasetlister/IDatasetListingQuery.java | 2 +-
.../generic/shared/basic/dto/TrackingDataSetCriteria.java | 8 ++++----
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackingStateDTO.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackingStateDTO.java
index c311de09d59..7843cce11fa 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackingStateDTO.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackingStateDTO.java
@@ -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;
}
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/FileBasedTrackingDAO.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/FileBasedTrackingDAO.java
index 0050db9caf0..d58f867c982 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/FileBasedTrackingDAO.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/FileBasedTrackingDAO.java
@@ -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;
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java
index e2d624e083e..515f8e3327b 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java
@@ -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;
}
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
index 16b27bc0b08..1f04b0f1aa2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
@@ -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
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java
index b624fb96dcd..c919cd0ad14 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java
@@ -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;
}
--
GitLab