You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/08/28 21:33:05 UTC
[airavata] branch develop updated: AIRAVATA-2877 Parse from/to
dates as unix timestamps in ms
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new ec1f07f AIRAVATA-2877 Parse from/to dates as unix timestamps in ms
ec1f07f is described below
commit ec1f07f8d8e767982ada0251ac9e389982d438b5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Aug 28 17:31:27 2018 -0400
AIRAVATA-2877 Parse from/to dates as unix timestamps in ms
---
.../core/repositories/expcatalog/ExperimentSummaryRepository.java | 8 ++++----
.../repositories/expcatalog/ExperimentSummaryRepositoryTest.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepository.java
index cc08fa1..31fd892 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepository.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepository.java
@@ -101,8 +101,8 @@ public class ExperimentSummaryRepository extends ExpCatAbstractRepository<Experi
if (filters.get(DBConstants.ExperimentSummary.FROM_DATE) != null
&& filters.get(DBConstants.ExperimentSummary.TO_DATE) != null) {
- Timestamp fromDate = Timestamp.valueOf(filters.get(DBConstants.ExperimentSummary.FROM_DATE));
- Timestamp toDate = Timestamp.valueOf(filters.get(DBConstants.ExperimentSummary.TO_DATE));
+ Timestamp fromDate = new Timestamp(Long.valueOf(filters.get(DBConstants.ExperimentSummary.FROM_DATE)));
+ Timestamp toDate = new Timestamp(Long.valueOf(filters.get(DBConstants.ExperimentSummary.TO_DATE)));
if (toDate.after(fromDate)) {
logger.debug("Filter Experiments by CreationTime");
@@ -174,12 +174,12 @@ public class ExperimentSummaryRepository extends ExpCatAbstractRepository<Experi
if (field.equals(DBConstants.ExperimentSummary.FROM_DATE)) {
logger.debug("Set the FromDate");
- fromDate = Timestamp.valueOf(filters.get(field));
+ fromDate = new Timestamp(Long.parseLong(filters.get(field)));
}
if (field.equals(DBConstants.ExperimentSummary.TO_DATE)) {
logger.debug("Set the ToDate");
- toDate = Timestamp.valueOf(filters.get(field));
+ toDate = new Timestamp(Long.parseLong(filters.get(field)));
}
}
diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepositoryTest.java
index c62d652..9aad381 100644
--- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepositoryTest.java
+++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepositoryTest.java
@@ -126,8 +126,8 @@ public class ExperimentSummaryRepositoryTest extends TestBase{
assertTrue(experimentSummaryModelList.size() == 1);
assertEquals(expertimentIdTwo, experimentSummaryModelList.get(0).getExperimentId());
- String fromDate = String.valueOf(Timestamp.valueOf("2010-10-10 09:00:00"));
- String toDate = String.valueOf(new Timestamp(System.currentTimeMillis()));
+ String fromDate = String.valueOf(Timestamp.valueOf("2010-10-10 09:00:00").getTime());
+ String toDate = String.valueOf(System.currentTimeMillis());
filters.put(DBConstants.ExperimentSummary.FROM_DATE, fromDate);
filters.put(DBConstants.ExperimentSummary.TO_DATE, toDate);