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/06/19 14:37:12 UTC
[airavata] branch group-based-auth updated: AIRAVATA-2832 Order
statuses by timeOfStateChange
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/group-based-auth by this push:
new 5122cab AIRAVATA-2832 Order statuses by timeOfStateChange
5122cab is described below
commit 5122cab0e2117eab09006a1f94389dfd8828e426
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 19 10:32:17 2018 -0400
AIRAVATA-2832 Order statuses by timeOfStateChange
---
.../airavata/registry/core/entities/expcatalog/ExperimentEntity.java | 1 +
.../org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java | 1 +
.../apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java | 1 +
.../apache/airavata/registry/core/entities/expcatalog/TaskEntity.java | 1 +
4 files changed, 4 insertions(+)
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
index 876a757..a71effc 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -91,6 +91,7 @@ public class ExperimentEntity implements Serializable {
@OneToMany(targetEntity = ExperimentStatusEntity.class, cascade = CascadeType.ALL,
mappedBy = "experiment", fetch = FetchType.EAGER)
+ @OrderBy("timeOfStateChange ASC")
private List<ExperimentStatusEntity> experimentStatus;
@OneToMany(targetEntity = ExperimentErrorEntity.class, cascade = CascadeType.ALL,
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
index c1df749..161922f 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
@@ -74,6 +74,7 @@ public class JobEntity implements Serializable {
@OneToMany(targetEntity = JobStatusEntity.class, cascade = CascadeType.ALL,
mappedBy = "job", fetch = FetchType.EAGER)
+ @OrderBy("timeOfStateChange ASC")
private List<JobStatusEntity> jobStatuses;
@ManyToOne(targetEntity = TaskEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
index 343bc79..b5c5ab7 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
@@ -97,6 +97,7 @@ public class ProcessEntity implements Serializable {
@OneToMany(targetEntity = ProcessStatusEntity.class, cascade = CascadeType.ALL,
mappedBy = "process", fetch = FetchType.EAGER)
+ @OrderBy("timeOfStateChange ASC")
private List<ProcessStatusEntity> processStatuses;
@OneToMany(targetEntity = ProcessErrorEntity.class, cascade = CascadeType.ALL,
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
index 289abac..fb37e87 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
@@ -62,6 +62,7 @@ public class TaskEntity implements Serializable {
@OneToMany(targetEntity = TaskStatusEntity.class, cascade = CascadeType.ALL,
mappedBy = "task", fetch = FetchType.EAGER)
+ @OrderBy("timeOfStateChange ASC")
private List<TaskStatusEntity> taskStatuses;
@OneToMany(targetEntity = TaskErrorEntity.class, cascade = CascadeType.ALL,