[airavata] branch group-based-auth updated: Change state->experimentStatus to match ExperimentSummaryModel

[machristie]

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 4144f81  Change state->experimentStatus to match ExperimentSummaryModel
4144f81 is described below

commit 4144f81dd79ae7249221bdca2b7bb54c5af025bf
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Tue Jul 17 17:24:38 2018 -0400

    Change state->experimentStatus to match ExperimentSummaryModel
---
 .../core/entities/expcatalog/ExperimentSummaryEntity.java      | 10 +++++-----
 .../repositories/expcatalog/ExperimentSummaryRepository.java   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
 
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
index 5080f6f..3a19dcb 100644
--- 
a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
+++ 
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
@@ -57,7 +57,7 @@ public class ExperimentSummaryEntity implements Serializable {
     private String executionId;
 
     @Column(name = "STATE")
-    private String state;
+    private String experimentStatus;
 
     @Column(name = "RESOURCE_HOST_ID")
     private String resourceHostId;
@@ -132,12 +132,12 @@ public class ExperimentSummaryEntity implements 
Serializable {
         this.executionId = executionId;
     }
 
-    public String getState() {
-        return state;
+    public String getExperimentStatus() {
+        return experimentStatus;
     }
 
-    public void setState(String state) {
-        this.state = state;
+    public void setExperimentStatus(String experimentStatus) {
+        this.experimentStatus = experimentStatus;
     }
 
     public String getResourceHostId() {
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 584d6db..cc08fa1 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
@@ -95,7 +95,7 @@ public class ExperimentSummaryRepository extends 
ExpCatAbstractRepository<Experi
             logger.debug("Filter Experiments by State");
             String state = 
ExperimentState.valueOf(filters.get(DBConstants.ExperimentStatus.STATE)).toString();
             queryParameters.put(DBConstants.ExperimentStatus.STATE, state);
-            query += "ES.state LIKE :" + DBConstants.ExperimentStatus.STATE + 
" AND ";
+            query += "ES.experimentStatus LIKE :" + 
DBConstants.ExperimentStatus.STATE + " AND ";
         }
 
         if (filters.get(DBConstants.ExperimentSummary.FROM_DATE) != null
@@ -241,7 +241,7 @@ public class ExperimentSummaryRepository extends 
ExpCatAbstractRepository<Experi
         if (experimentState != null) {
             logger.debug("Filter Experiments by Experiment State");
             queryParameters.put(DBConstants.Experiment.EXPERIMENT_STATE, 
experimentState);
-            query += "ES.state LIKE :" + 
DBConstants.Experiment.EXPERIMENT_STATE + " AND ";
+            query += "ES.experimentStatus LIKE :" + 
DBConstants.Experiment.EXPERIMENT_STATE + " AND ";
         }
 
         if (gatewayId != null) {