airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch group-based-auth updated: AIRAVATA-2799 Map enums as strings
Date Mon, 04 Jun 2018 15:04:03 GMT
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 3fd4d4d  AIRAVATA-2799 Map enums as strings
3fd4d4d is described below

commit 3fd4d4d6a1abe128b90c26c21d134b36732b9c6e
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Mon Jun 4 11:02:36 2018 -0400

    AIRAVATA-2799 Map enums as strings
---
 .../appcatalog/ApplicationDeploymentEntity.java    |  9 ++++++---
 .../appcatalog/ApplicationInputEntity.java         |  9 ++++++---
 .../appcatalog/ApplicationOutputEntity.java        |  9 ++++++---
 .../appcatalog/CloudJobSubmissionEntity.java       | 22 ++++++++++++----------
 .../ComputeResourceFileSystemEntity.java           |  9 ++++++---
 .../appcatalog/ComputeResourceFileSystemPK.java    |  8 +++++---
 .../ComputeResourcePreferenceEntity.java           | 18 +++++++++++-------
 .../appcatalog/DataMovementInterfaceEntity.java    |  9 ++++++---
 .../appcatalog/GlobusSubmissionEntity.java         | 14 +++++++-------
 .../appcatalog/GridftpDataMovementEntity.java      | 14 +++++++-------
 .../appcatalog/GroupComputeResourcePrefEntity.java | 17 +++++++++++------
 .../appcatalog/JobManagerCommandEntity.java        |  9 ++++++---
 .../entities/appcatalog/JobManagerCommandPK.java   |  8 +++++---
 .../appcatalog/JobSubmissionInterfaceEntity.java   |  9 ++++++---
 .../entities/appcatalog/LocalSubmissionEntity.java |  9 ++++++---
 .../appcatalog/ParallelismCommandEntity.java       |  9 ++++++---
 .../entities/appcatalog/ParallelismCommandPK.java  |  8 +++++---
 .../appcatalog/ResourceJobManagerEntity.java       | 14 +++++++-------
 .../entities/appcatalog/ScpDataMovementEntity.java | 14 +++++++-------
 .../appcatalog/SshJobSubmissionEntity.java         |  9 ++++++---
 .../appcatalog/StorageInterfaceEntity.java         |  9 ++++++---
 .../appcatalog/UnicoreDatamovementEntity.java      |  8 +++++---
 .../appcatalog/UnicoreSubmissionEntity.java        | 14 +++++++-------
 .../core/entities/expcatalog/ExperimentEntity.java |  9 ++++++---
 .../entities/expcatalog/ExperimentInputEntity.java |  9 ++++++---
 .../expcatalog/ExperimentOutputEntity.java         |  9 ++++++---
 .../expcatalog/ExperimentStatusEntity.java         |  9 ++++++---
 .../core/entities/expcatalog/JobStatusEntity.java  |  1 +
 .../entities/expcatalog/NotificationEntity.java    |  1 +
 .../entities/expcatalog/ProcessInputEntity.java    |  9 ++++++---
 .../entities/expcatalog/ProcessOutputEntity.java   |  9 ++++++---
 .../entities/expcatalog/ProcessStatusEntity.java   |  9 ++++++---
 .../core/entities/expcatalog/TaskEntity.java       |  1 +
 .../core/entities/expcatalog/TaskStatusEntity.java |  9 ++++++---
 .../entities/replicacatalog/DataProductEntity.java |  4 +++-
 .../replicacatalog/DataReplicaLocationEntity.java  |  6 ++++--
 .../appcatalog/ComputeResourceRepository.java      |  8 ++++----
 .../appcatalog/ResourceJobManagerRepository.java   |  8 ++++----
 .../expcatalog/ExperimentInputRepositoryTest.java  |  3 +++
 .../expcatalog/ExperimentOutputRepositoryTest.java |  3 +++
 .../expcatalog/ExperimentRepositoryTest.java       |  6 +++---
 .../expcatalog/ProcessInputRepositoryTest.java     |  3 +++
 .../expcatalog/ProcessOutputRepositoryTest.java    |  3 +++
 43 files changed, 236 insertions(+), 141 deletions(-)

diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
index 3a1aad9..31c34ad 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -53,7 +55,8 @@ public class ApplicationDeploymentEntity implements Serializable {
     private String gatewayId;
 
     @Column(name = "parallelism")
-    private String parallelism;
+    @Enumerated(EnumType.STRING)
+    private ApplicationParallelismType parallelism;
 
     @Column(name = "UPDATE_TIME")
     private Timestamp updateTime;
@@ -154,11 +157,11 @@ public class ApplicationDeploymentEntity implements Serializable {
         this.gatewayId = gatewayId;
     }
 
-    public String getParallelism() {
+    public ApplicationParallelismType getParallelism() {
         return parallelism;
     }
 
-    public void setParallelism(String parallelism) {
+    public void setParallelism(ApplicationParallelismType parallelism) {
         this.parallelism = parallelism;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
index 5b86322..e6c7ddb 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -48,7 +50,8 @@ public class ApplicationInputEntity implements Serializable {
 	private boolean dataStaged;
 
 	@Column(name = "DATA_TYPE")
-	private String type;
+	@Enumerated(EnumType.STRING)
+	private DataType type;
 
 	@Column(name = "INPUT_ORDER")
 	private int inputOrder;
@@ -113,11 +116,11 @@ public class ApplicationInputEntity implements Serializable {
 		this.dataStaged = dataStaged;
 	}
 
-	public String getType() {
+	public DataType getType() {
 		return type;
 	}
 
-	public void setType(String type) {
+	public void setType(DataType type) {
 		this.type = type;
 	}
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
index bc10a73..eded35c 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -50,7 +52,8 @@ public class ApplicationOutputEntity implements Serializable {
     private String location;
 
     @Column(name = "DATA_TYPE")
-    private String type;
+    @Enumerated(EnumType.STRING)
+    private DataType type;
 
     @Column(name = "IS_REQUIRED")
     private boolean isRequired;
@@ -114,11 +117,11 @@ public class ApplicationOutputEntity implements Serializable {
         this.location = location;
     }
 
-    public String getType() {
+    public DataType getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(DataType type) {
         this.type = type;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java
index 160d41d..908859e 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/CloudJobSubmissionEntity.java
@@ -19,10 +19,10 @@
  */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.apache.airavata.model.appcatalog.computeresource.ProviderName;
+import org.apache.airavata.model.data.movement.SecurityProtocol;
+
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -38,7 +38,8 @@ public class CloudJobSubmissionEntity implements Serializable {
     private String jobSubmissionInterfaceId;
 
     @Column(name = "SECURITY_PROTOCOL")
-    private String securityProtocol;
+    @Enumerated(EnumType.STRING)
+    private SecurityProtocol securityProtocol;
 
     @Column(name = "NODE_ID")
     private String nodeId;
@@ -47,7 +48,8 @@ public class CloudJobSubmissionEntity implements Serializable {
     private String executableType;
 
     @Column(name = "PROVIDER_NAME")
-    private String providerName;
+    @Enumerated(EnumType.STRING)
+    private ProviderName providerName;
 
     @Column(name = "USER_ACCOUNT_NAME")
     private String userAccountName;
@@ -61,11 +63,11 @@ public class CloudJobSubmissionEntity implements Serializable {
         this.executableType = executableType;
     }
 
-    public String getProviderName() {
+    public ProviderName getProviderName() {
         return providerName;
     }
 
-    public void setProviderName(String providerName) {
+    public void setProviderName(ProviderName providerName) {
         this.providerName = providerName;
     }
 
@@ -90,7 +92,7 @@ public class CloudJobSubmissionEntity implements Serializable {
     }
 
 
-    public String getSecurityProtocol() {
+    public SecurityProtocol getSecurityProtocol() {
         return securityProtocol;
     }
 
@@ -100,7 +102,7 @@ public class CloudJobSubmissionEntity implements Serializable {
     }
 
 
-    public void setSecurityProtocol(String securityProtocol) {
+    public void setSecurityProtocol(SecurityProtocol securityProtocol) {
         this.securityProtocol=securityProtocol;
     }
 }
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
index a7f3b4a..4a65992 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.appcatalog.computeresource.FileSystems;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -40,7 +42,8 @@ public class ComputeResourceFileSystemEntity implements Serializable {
 
 	@Column(name="FILE_SYSTEM")
 	@Id
-	private String fileSystem;
+	@Enumerated(EnumType.STRING)
+	private FileSystems fileSystem;
 
 	@ManyToOne(cascade= CascadeType.MERGE)
 	@JoinColumn(name = "COMPUTE_RESOURCE_ID")
@@ -61,11 +64,11 @@ public class ComputeResourceFileSystemEntity implements Serializable {
 		this.computeResourceId = computeResourceId;
 	}
 
-	public String getFileSystem() {
+	public FileSystems getFileSystem() {
 		return fileSystem;
 	}
 
-	public void setFileSystem(String fileSystem) {
+	public void setFileSystem(FileSystems fileSystem) {
 		this.fileSystem = fileSystem;
 	}
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemPK.java
index 17ef8fe..fed404c 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemPK.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemPK.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.appcatalog.computeresource.FileSystems;
+
 import java.io.Serializable;
 
 /**
@@ -31,7 +33,7 @@ public class ComputeResourceFileSystemPK implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private String computeResourceId;
-	private String fileSystem;
+	private FileSystems fileSystem;
 
 	public ComputeResourceFileSystemPK() {
 	}
@@ -44,11 +46,11 @@ public class ComputeResourceFileSystemPK implements Serializable {
 		this.computeResourceId = computeResourceId;
 	}
 
-	public String getFileSystem() {
+	public FileSystems getFileSystem() {
 		return fileSystem;
 	}
 
-	public void setFileSystem(String fileSystem) {
+	public void setFileSystem(FileSystems fileSystem) {
 		this.fileSystem = fileSystem;
 	}
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
index bbd5509..7f28852 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java
@@ -20,10 +20,12 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
+import org.apache.airavata.model.data.movement.DataMovementProtocol;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
-import java.util.Collection;
 import java.util.List;
 
 
@@ -57,10 +59,12 @@ public class ComputeResourcePreferenceEntity implements Serializable {
     private String preferredBatchQueue;
 
     @Column(name = "PREFERED_DATA_MOVE_PROTOCOL")
-    private String preferredDataMovementProtocol;
+    @Enumerated(EnumType.STRING)
+    private DataMovementProtocol preferredDataMovementProtocol;
 
     @Column(name = "PREFERED_JOB_SUB_PROTOCOL")
-    private String preferredJobSubmissionProtocol;
+    @Enumerated(EnumType.STRING)
+    private JobSubmissionProtocol preferredJobSubmissionProtocol;
 
     @Column(name = "QUALITY_OF_SERVICE")
     private String qualityOfService;
@@ -220,19 +224,19 @@ public class ComputeResourcePreferenceEntity implements Serializable {
         this.preferredBatchQueue = preferredBatchQueue;
     }
 
-    public String getPreferredDataMovementProtocol() {
+    public DataMovementProtocol getPreferredDataMovementProtocol() {
         return preferredDataMovementProtocol;
     }
 
-    public void setPreferredDataMovementProtocol(String preferredDataMovementProtocol) {
+    public void setPreferredDataMovementProtocol(DataMovementProtocol preferredDataMovementProtocol) {
         this.preferredDataMovementProtocol = preferredDataMovementProtocol;
     }
 
-    public String getPreferredJobSubmissionProtocol() {
+    public JobSubmissionProtocol getPreferredJobSubmissionProtocol() {
         return preferredJobSubmissionProtocol;
     }
 
-    public void setPreferredJobSubmissionProtocol(String preferredJobSubmissionProtocol) {
+    public void setPreferredJobSubmissionProtocol(JobSubmissionProtocol preferredJobSubmissionProtocol) {
         this.preferredJobSubmissionProtocol = preferredJobSubmissionProtocol;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
index b334796..b8f0936 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.data.movement.DataMovementProtocol;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -45,7 +47,8 @@ public class DataMovementInterfaceEntity implements Serializable {
     private Timestamp creationTime;
 
     @Column(name = "DATA_MOVEMENT_PROTOCOL")
-    private String dataMovementProtocol;
+    @Enumerated(EnumType.STRING)
+    private DataMovementProtocol dataMovementProtocol;
 
     @Column(name = "PRIORITY_ORDER")
     private int priorityOrder;
@@ -92,11 +95,11 @@ public class DataMovementInterfaceEntity implements Serializable {
         this.creationTime = creationTime;
     }
 
-    public String getDataMovementProtocol() {
+    public DataMovementProtocol getDataMovementProtocol() {
         return dataMovementProtocol;
     }
 
-    public void setDataMovementProtocol(String dataMovementProtocol) {
+    public void setDataMovementProtocol(DataMovementProtocol dataMovementProtocol) {
         this.dataMovementProtocol = dataMovementProtocol;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
index 4823774..ab71eda 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusSubmissionEntity.java
@@ -20,10 +20,9 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.apache.airavata.model.data.movement.SecurityProtocol;
+
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -43,7 +42,8 @@ public class GlobusSubmissionEntity implements Serializable {
 	private String resourceJobManager;
 
 	@Column(name = "SECURITY_PROTOCAL")
-	private String securityProtocal;
+    @Enumerated(EnumType.STRING)
+	private SecurityProtocol securityProtocal;
 
 	public GlobusSubmissionEntity() {
 	}
@@ -64,11 +64,11 @@ public class GlobusSubmissionEntity implements Serializable {
 		this.resourceJobManager = resourceJobManager;
 	}
 
-	public String getSecurityProtocal() {
+	public SecurityProtocol getSecurityProtocal() {
 		return securityProtocal;
 	}
 
-	public void setSecurityProtocal(String securityProtocal) {
+	public void setSecurityProtocal(SecurityProtocol securityProtocal) {
 		this.securityProtocal = securityProtocal;
 	}
 }
\ No newline at end of file
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
index c80bd91..5845e86 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpDataMovementEntity.java
@@ -20,10 +20,9 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.apache.airavata.model.data.movement.SecurityProtocol;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
@@ -44,7 +43,8 @@ public class GridftpDataMovementEntity implements Serializable {
     private Timestamp creationTime;
 
     @Column(name = "SECURITY_PROTOCOL")
-    private String securityProtocol;
+    @Enumerated(EnumType.STRING)
+    private SecurityProtocol securityProtocol;
 
     @Column(name = "UPDATE_TIME")
     private Timestamp updateTime;
@@ -69,11 +69,11 @@ public class GridftpDataMovementEntity implements Serializable {
         this.creationTime = creationTime;
     }
 
-    public String getSecurityProtocol() {
+    public SecurityProtocol getSecurityProtocol() {
         return securityProtocol;
     }
 
-    public void setSecurityProtocol(String securityProtocol) {
+    public void setSecurityProtocol(SecurityProtocol securityProtocol) {
         this.securityProtocol = securityProtocol;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
index cc4f379..7db64be 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
@@ -19,6 +19,9 @@
  */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
+import org.apache.airavata.model.data.movement.DataMovementProtocol;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -55,10 +58,12 @@ public class GroupComputeResourcePrefEntity implements Serializable {
     private String preferredBatchQueue;
 
     @Column(name = "PREFERED_DATA_MOVE_PROTOCOL")
-    private String preferredDataMovementProtocol;
+    @Enumerated(EnumType.STRING)
+    private DataMovementProtocol preferredDataMovementProtocol;
 
     @Column(name = "PREFERED_JOB_SUB_PROTOCOL")
-    private String preferredJobSubmissionProtocol;
+    @Enumerated(EnumType.STRING)
+    private JobSubmissionProtocol preferredJobSubmissionProtocol;
 
     @Column(name = "QUALITY_OF_SERVICE")
     private String qualityOfService;
@@ -145,19 +150,19 @@ public class GroupComputeResourcePrefEntity implements Serializable {
         this.preferredBatchQueue = preferredBatchQueue;
     }
 
-    public String getPreferredDataMovementProtocol() {
+    public DataMovementProtocol getPreferredDataMovementProtocol() {
         return preferredDataMovementProtocol;
     }
 
-    public void setPreferredDataMovementProtocol(String preferredDataMovementProtocol) {
+    public void setPreferredDataMovementProtocol(DataMovementProtocol preferredDataMovementProtocol) {
         this.preferredDataMovementProtocol = preferredDataMovementProtocol;
     }
 
-    public String getPreferredJobSubmissionProtocol() {
+    public JobSubmissionProtocol getPreferredJobSubmissionProtocol() {
         return preferredJobSubmissionProtocol;
     }
 
-    public void setPreferredJobSubmissionProtocol(String preferredJobSubmissionProtocol) {
+    public void setPreferredJobSubmissionProtocol(JobSubmissionProtocol preferredJobSubmissionProtocol) {
         this.preferredJobSubmissionProtocol = preferredJobSubmissionProtocol;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
index 2771847..a39e791 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -38,7 +40,8 @@ public class JobManagerCommandEntity implements Serializable {
 
     @Id
     @Column(name = "COMMAND_TYPE")
-    private String commandType;
+    @Enumerated(EnumType.STRING)
+    private JobManagerCommand commandType;
 
     @Column(name = "COMMAND")
     private String command;
@@ -58,11 +61,11 @@ public class JobManagerCommandEntity implements Serializable {
         this.resourceJobManagerId = resourceJobManagerId;
     }
 
-    public String getCommandType() {
+    public JobManagerCommand getCommandType() {
         return commandType;
     }
 
-    public void setCommandType(String commandType) {
+    public void setCommandType(JobManagerCommand commandType) {
         this.commandType = commandType;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandPK.java
index 8173ee6..d904177 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandPK.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandPK.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
+
 import java.io.Serializable;
 
 /**
@@ -30,7 +32,7 @@ public class JobManagerCommandPK implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private String resourceJobManagerId;
-    private String commandType;
+    private JobManagerCommand commandType;
 
     public JobManagerCommandPK() {
     }
@@ -43,11 +45,11 @@ public class JobManagerCommandPK implements Serializable {
         this.resourceJobManagerId = resourceJobManagerId;
     }
 
-    public String getCommandType() {
+    public JobManagerCommand getCommandType() {
         return commandType;
     }
 
-    public void setCommandType(String commandType) {
+    public void setCommandType(JobManagerCommand commandType) {
         this.commandType = commandType;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java
index 523aba4..c1733d7 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -45,7 +47,8 @@ public class JobSubmissionInterfaceEntity implements Serializable {
     private Timestamp creationTime;
 
     @Column(name = "JOB_SUBMISSION_PROTOCOL")
-    private String jobSubmissionProtocol;
+    @Enumerated(EnumType.STRING)
+    private JobSubmissionProtocol jobSubmissionProtocol;
 
     @Column(name = "PRIORITY_ORDER")
     private int priorityOrder;
@@ -92,11 +95,11 @@ public class JobSubmissionInterfaceEntity implements Serializable {
         this.creationTime = creationTime;
     }
 
-    public String getJobSubmissionProtocol() {
+    public JobSubmissionProtocol getJobSubmissionProtocol() {
         return jobSubmissionProtocol;
     }
 
-    public void setJobSubmissionProtocol(String jobSubmissionProtocol) {
+    public void setJobSubmissionProtocol(JobSubmissionProtocol jobSubmissionProtocol) {
         this.jobSubmissionProtocol = jobSubmissionProtocol;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
index 957fd1b..673e245 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.data.movement.SecurityProtocol;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -46,7 +48,8 @@ public class LocalSubmissionEntity implements Serializable {
     private String resourceJobManagerId;
 
     @Column(name = "SECURITY_PROTOCOL")
-    private String securityProtocol;
+    @Enumerated(EnumType.STRING)
+    private SecurityProtocol securityProtocol;
 
     @ManyToOne(cascade= CascadeType.MERGE)
     @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID")
@@ -87,11 +90,11 @@ public class LocalSubmissionEntity implements Serializable {
         this.resourceJobManagerId = resourceJobManagerId;
     }
 
-    public String getSecurityProtocol() {
+    public SecurityProtocol getSecurityProtocol() {
         return securityProtocol;
     }
 
-    public void setSecurityProtocol(String securityProtocol) {
+    public void setSecurityProtocol(SecurityProtocol securityProtocol) {
         this.securityProtocol = securityProtocol;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
index 81f1629..cba221c 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -38,7 +40,8 @@ public class ParallelismCommandEntity implements Serializable {
 
     @Id
     @Column(name = "COMMAND_TYPE")
-    private String commandType;
+    @Enumerated(EnumType.STRING)
+    private ApplicationParallelismType commandType;
 
     @Column(name = "COMMAND")
     private String command;
@@ -58,11 +61,11 @@ public class ParallelismCommandEntity implements Serializable {
         this.resourceJobManagerId = resourceJobManagerId;
     }
 
-    public String getCommandType() {
+    public ApplicationParallelismType getCommandType() {
         return commandType;
     }
 
-    public void setCommandType(String commandType) {
+    public void setCommandType(ApplicationParallelismType commandType) {
         this.commandType = commandType;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandPK.java
index c5f3055..2bb2141 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandPK.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandPK.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
+
 import java.io.Serializable;
 
 /**
@@ -30,7 +32,7 @@ public class ParallelismCommandPK implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private String resourceJobManagerId;
-    private String commandType;
+    private ApplicationParallelismType commandType;
 
     public ParallelismCommandPK() {
     }
@@ -43,11 +45,11 @@ public class ParallelismCommandPK implements Serializable {
         this.resourceJobManagerId = resourceJobManagerId;
     }
 
-    public String getCommandType() {
+    public ApplicationParallelismType getCommandType() {
         return commandType;
     }
 
-    public void setCommandType(String commandType) {
+    public void setCommandType(ApplicationParallelismType commandType) {
         this.commandType = commandType;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
index 14b8d06..ee2ca9a 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
@@ -20,10 +20,9 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
@@ -49,7 +48,8 @@ public class ResourceJobManagerEntity implements Serializable {
     private String pushMonitoringEndpoint;
 
     @Column(name = "RESOURCE_JOB_MANAGER_TYPE")
-    private String resourceJobManagerType;
+    @Enumerated(EnumType.STRING)
+    private ResourceJobManagerType resourceJobManagerType;
 
     @Column(name = "UPDATE_TIME")
     private Timestamp updateTime;
@@ -89,11 +89,11 @@ public class ResourceJobManagerEntity implements Serializable {
         this.pushMonitoringEndpoint = pushMonitoringEndpoint;
     }
 
-    public String getResourceJobManagerType() {
+    public ResourceJobManagerType getResourceJobManagerType() {
         return resourceJobManagerType;
     }
 
-    public void setResourceJobManagerType(String resourceJobManagerType) {
+    public void setResourceJobManagerType(ResourceJobManagerType resourceJobManagerType) {
         this.resourceJobManagerType = resourceJobManagerType;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java
index d402ec7..ba4919f 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ScpDataMovementEntity.java
@@ -20,10 +20,9 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.apache.airavata.model.data.movement.SecurityProtocol;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
@@ -50,7 +49,8 @@ public class ScpDataMovementEntity implements Serializable {
     private String queueDescription;
 
     @Column(name = "SECURITY_PROTOCOL")
-    private String securityProtocol;
+    @Enumerated(EnumType.STRING)
+    private SecurityProtocol securityProtocol;
 
     @Column(name = "SSH_PORT")
     private int sshPort;
@@ -93,11 +93,11 @@ public class ScpDataMovementEntity implements Serializable {
         this.queueDescription = queueDescription;
     }
 
-    public String getSecurityProtocol() {
+    public SecurityProtocol getSecurityProtocol() {
         return securityProtocol;
     }
 
-    public void setSecurityProtocol(String securityProtocol) {
+    public void setSecurityProtocol(SecurityProtocol securityProtocol) {
         this.securityProtocol = securityProtocol;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
index 93dcd2e..8070af7 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.data.movement.SecurityProtocol;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -52,7 +54,8 @@ public class SshJobSubmissionEntity implements Serializable {
 	private String monitorMode;
 
 	@Column(name="SECURITY_PROTOCOL")
-	private String securityProtocol;
+	@Enumerated(EnumType.STRING)
+	private SecurityProtocol securityProtocol;
 
 	@Column(name="SSH_PORT")
 	private int sshPort;
@@ -98,11 +101,11 @@ public class SshJobSubmissionEntity implements Serializable {
 		this.monitorMode = monitorMode;
 	}
 
-	public String getSecurityProtocol() {
+	public SecurityProtocol getSecurityProtocol() {
 		return securityProtocol;
 	}
 
-	public void setSecurityProtocol(String securityProtocol) {
+	public void setSecurityProtocol(SecurityProtocol securityProtocol) {
 		this.securityProtocol = securityProtocol;
 	}
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java
index 607094e..f39982d 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfaceEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.data.movement.DataMovementProtocol;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -45,7 +47,8 @@ public class StorageInterfaceEntity implements Serializable {
     private Timestamp creationTime;
 
     @Column(name = "DATA_MOVEMENT_PROTOCOL")
-    private String dataMovementProtocol;
+    @Enumerated(EnumType.STRING)
+    private DataMovementProtocol dataMovementProtocol;
 
     @Column(name = "PRIORITY_ORDER")
     private int priorityOrder;
@@ -84,11 +87,11 @@ public class StorageInterfaceEntity implements Serializable {
         this.storageResource = storageResource;
     }
 
-    public String getDataMovementProtocol() {
+    public DataMovementProtocol getDataMovementProtocol() {
         return dataMovementProtocol;
     }
 
-    public void setDataMovementProtocol(String dataMovementProtocol) {
+    public void setDataMovementProtocol(DataMovementProtocol dataMovementProtocol) {
         this.dataMovementProtocol = dataMovementProtocol;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java
index f3bb305..9c422fc 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreDatamovementEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
+import org.apache.airavata.model.data.movement.SecurityProtocol;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -41,7 +43,7 @@ public class UnicoreDatamovementEntity implements Serializable {
 	private String dataMovementInterfaceId;
 
 	@Column(name="SECURITY_PROTOCAL")
-	private String securityProtocal;
+	private SecurityProtocol securityProtocal;
 
 	@Column(name="UNICORE_ENDPOINT_URL")
 	private String unicoreEndpointUrl;
@@ -57,11 +59,11 @@ public class UnicoreDatamovementEntity implements Serializable {
 		this.dataMovementInterfaceId = dataMovementInterfaceId;
 	}
 
-	public String getSecurityProtocal() {
+	public SecurityProtocol getSecurityProtocal() {
 		return securityProtocal;
 	}
 
-	public void setSecurityProtocal(String securityProtocal) {
+	public void setSecurityProtocal(SecurityProtocol securityProtocal) {
 		this.securityProtocal = securityProtocal;
 	}
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java
index 62672d5..61754e4 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/UnicoreSubmissionEntity.java
@@ -20,10 +20,9 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.apache.airavata.model.data.movement.SecurityProtocol;
+
+import javax.persistence.*;
 import java.io.Serializable;
 
 
@@ -41,7 +40,8 @@ public class UnicoreSubmissionEntity implements Serializable {
 	private String jobSubmissionInterfaceId;
 
 	@Column(name="SECURITY_PROTOCAL")
-	private String securityProtocol;
+    @Enumerated(EnumType.STRING)
+	private SecurityProtocol securityProtocol;
 
 	@Column(name="UNICORE_ENDPOINT_URL")
 	private String unicoreEndPointURL;
@@ -57,11 +57,11 @@ public class UnicoreSubmissionEntity implements Serializable {
 		this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
 	}
 
-	public String getSecurityProtocol() {
+	public SecurityProtocol getSecurityProtocol() {
 		return securityProtocol;
 	}
 
-	public void setSecurityProtocol(String securityProtocol) {
+	public void setSecurityProtocol(SecurityProtocol securityProtocol) {
 		this.securityProtocol = securityProtocol;
 	}
 
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 194f63b..b148d81 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
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.expcatalog;
 
+import org.apache.airavata.model.experiment.ExperimentType;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -44,7 +46,8 @@ public class ExperimentEntity implements Serializable {
     public String gatewayId;
 
     @Column(name = "EXPERIMENT_TYPE")
-    public String experimentType;
+    @Enumerated(EnumType.STRING)
+    public ExperimentType experimentType;
 
     @Column(name = "USER_NAME")
     public String userName;
@@ -122,11 +125,11 @@ public class ExperimentEntity implements Serializable {
         this.gatewayId = gatewayId;
     }
 
-    public String getExperimentType() {
+    public ExperimentType getExperimentType() {
         return experimentType;
     }
 
-    public void setExperimentType(String experimentType) {
+    public void setExperimentType(ExperimentType experimentType) {
         this.experimentType = experimentType;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
index f32bf6c..d9b28fb 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.expcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -45,7 +47,8 @@ public class ExperimentInputEntity implements Serializable {
     private String value;
 
     @Column(name = "DATA_TYPE")
-    private String type;
+    @Enumerated(EnumType.STRING)
+    private DataType type;
 
     @Column(name = "APPLICATION_ARGUMENT")
     private String applicationArgument;
@@ -108,11 +111,11 @@ public class ExperimentInputEntity implements Serializable {
         this.value = value;
     }
 
-    public String getType() {
+    public DataType getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(DataType type) {
         this.type = type;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
index cda94c4..01ca250 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.expcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -45,7 +47,8 @@ public class ExperimentOutputEntity implements Serializable {
     private String value;
 
     @Column(name = "DATA_TYPE")
-    private String type;
+    @Enumerated(EnumType.STRING)
+    private DataType type;
 
     @Column(name = "APPLICATION_ARGUMENT")
     private String applicationArgument;
@@ -102,11 +105,11 @@ public class ExperimentOutputEntity implements Serializable {
         this.value = value;
     }
 
-    public String getType() {
+    public DataType getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(DataType type) {
         this.type = type;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
index ee8fe8a..91ec10f 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.expcatalog;
 
+import org.apache.airavata.model.status.ExperimentState;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -42,7 +44,8 @@ public class ExperimentStatusEntity implements Serializable {
     private String experimentId;
 
     @Column(name = "STATE")
-    private String state;
+    @Enumerated(EnumType.STRING)
+    private ExperimentState state;
 
     @Column(name = "TIME_OF_STATE_CHANGE")
     private Timestamp timeOfStateChange;
@@ -74,11 +77,11 @@ public class ExperimentStatusEntity implements Serializable {
         this.experimentId = experimentId;
     }
 
-    public String getState() {
+    public ExperimentState getState() {
         return state;
     }
 
-    public void setState(String state) {
+    public void setState(ExperimentState state) {
         this.state = state;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
index 46d0743..53685f7 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
@@ -48,6 +48,7 @@ public class JobStatusEntity implements Serializable {
     private String taskId;
 
     @Column(name = "STATE")
+    @Enumerated(EnumType.STRING)
     private JobState jobState;
 
     @Column(name = "TIME_OF_STATE_CHANGE")
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
index 515a999..e89bb5a 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/NotificationEntity.java
@@ -57,6 +57,7 @@ public class NotificationEntity implements Serializable {
     private Timestamp expirationTime;
 
     @Column(name = "PRIORITY")
+    @Enumerated(EnumType.STRING)
     private NotificationPriority priority;
 
     public NotificationEntity() {
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
index 383d4c7..622cad1 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.expcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -45,7 +47,8 @@ public class ProcessInputEntity implements Serializable {
     private String value;
 
     @Column(name = "DATA_TYPE")
-    private String type;
+    @Enumerated(EnumType.STRING)
+    private DataType type;
 
     @Column(name = "APPLICATION_ARGUMENT")
     private String applicationArgument;
@@ -108,11 +111,11 @@ public class ProcessInputEntity implements Serializable {
         this.value = value;
     }
 
-    public String getType() {
+    public DataType getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(DataType type) {
         this.type = type;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
index 3df8619..f331872 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.expcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -45,7 +47,8 @@ public class ProcessOutputEntity implements Serializable {
     private String value;
 
     @Column(name = "DATA_TYPE")
-    private String type;
+    @Enumerated(EnumType.STRING)
+    private DataType type;
 
     @Column(name = "APPLICATION_ARGUMENT")
     private String applicationArgument;
@@ -102,11 +105,11 @@ public class ProcessOutputEntity implements Serializable {
         this.value = value;
     }
 
-    public String getType() {
+    public DataType getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(DataType type) {
         this.type = type;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
index 543fb84..6764c97 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.expcatalog;
 
+import org.apache.airavata.model.status.ProcessState;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -42,7 +44,8 @@ public class ProcessStatusEntity implements Serializable {
     private String processId;
 
     @Column(name = "STATE")
-    private String state;
+    @Enumerated(EnumType.STRING)
+    private ProcessState state;
 
     @Column(name = "TIME_OF_STATE_CHANGE")
     private Timestamp timeOfStateChange;
@@ -74,11 +77,11 @@ public class ProcessStatusEntity implements Serializable {
         this.processId = processId;
     }
 
-    public String getState() {
+    public ProcessState getState() {
         return state;
     }
 
-    public void setState(String state) {
+    public void setState(ProcessState state) {
         this.state = state;
     }
 
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 0bda9b6..d1eee78 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
@@ -41,6 +41,7 @@ public class TaskEntity implements Serializable {
     private String taskId;
 
     @Column(name = "TASK_TYPE")
+    @Enumerated(EnumType.STRING)
     private TaskTypes taskType;
 
     @Column(name = "PARENT_PROCESS_ID")
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
index 2f5b2ff..50b242e 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.registry.core.entities.expcatalog;
 
+import org.apache.airavata.model.status.TaskState;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -42,7 +44,8 @@ public class TaskStatusEntity implements Serializable {
     private String taskId;
 
     @Column(name = "STATE")
-    private String state;
+    @Enumerated(EnumType.STRING)
+    private TaskState state;
 
     @Column(name = "TIME_OF_STATE_CHANGE")
     private Timestamp timeOfStateChange;
@@ -74,11 +77,11 @@ public class TaskStatusEntity implements Serializable {
         this.taskId = taskId;
     }
 
-    public String getState() {
+    public TaskState getState() {
         return state;
     }
 
-    public void setState(String state) {
+    public void setState(TaskState state) {
         this.state = state;
     }
 
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductEntity.java
index 7df4307..ba10d59 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataProductEntity.java
@@ -22,10 +22,11 @@ package org.apache.airavata.registry.core.entities.replicacatalog;
 
 import org.apache.airavata.model.data.replica.DataProductType;
 
-import java.util.*;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.List;
+import java.util.Map;
 
 /**
  * The persistent class for the data_product database table.
@@ -64,6 +65,7 @@ public class DataProductEntity implements Serializable {
     private Timestamp lastModifiedTime;
 
     @Column(name = "PRODUCT_TYPE")
+    @Enumerated(EnumType.STRING)
     private DataProductType dataProductType;
 
     @ElementCollection(fetch = FetchType.EAGER)
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaLocationEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaLocationEntity.java
index 831ec8d..458119c 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaLocationEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/replicacatalog/DataReplicaLocationEntity.java
@@ -23,10 +23,10 @@ package org.apache.airavata.registry.core.entities.replicacatalog;
 import org.apache.airavata.model.data.replica.ReplicaLocationCategory;
 import org.apache.airavata.model.data.replica.ReplicaPersistentType;
 
-import java.io.Serializable;
-import java.util.*;
 import javax.persistence.*;
+import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.Map;
 
 /**
  * The persistent class for the data_replica_location database table.
@@ -65,9 +65,11 @@ public class DataReplicaLocationEntity implements Serializable {
     private Timestamp validUntilTime;
 
     @Column(name = "REPLICA_LOCATION_CATEGORY")
+    @Enumerated(EnumType.STRING)
     private ReplicaLocationCategory replicaLocationCategory;
 
     @Column(name = "REPLICA_PERSISTENT_TYPE")
+    @Enumerated(EnumType.STRING)
     private ReplicaPersistentType replicaPersistentType;
 
     @ElementCollection(fetch = FetchType.EAGER)
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepository.java
index 5dc6c30..3f78700 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepository.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepository.java
@@ -89,7 +89,7 @@ public class ComputeResourceRepository extends AppCatAbstractRepository<ComputeR
             for (FileSystems key : fileSystems.keySet()) {
                 ComputeResourceFileSystemEntity computeResourceFileSystemEntity = new ComputeResourceFileSystemEntity();
                 computeResourceFileSystemEntity.setComputeResourceId(computeHostResource.getComputeResourceId());
-                computeResourceFileSystemEntity.setFileSystem(key.toString());
+                computeResourceFileSystemEntity.setFileSystem(key);
                 computeResourceFileSystemEntity.setPath(fileSystems.get(key));
                 computeResourceFileSystemEntity.setComputeResource(computeHostResource);
                 execute(entityManager -> entityManager.merge(computeResourceFileSystemEntity));
@@ -112,7 +112,7 @@ public class ComputeResourceRepository extends AppCatAbstractRepository<ComputeR
         List<ComputeResourceFileSystemEntity> computeResourceFileSystemEntityList = resultSet;
         Map<FileSystems, String> fileSystemsMap= new HashMap<FileSystems,String>();
         for (ComputeResourceFileSystemEntity fs: computeResourceFileSystemEntityList) {
-            fileSystemsMap.put(FileSystems.valueOf(fs.getFileSystem()), fs.getPath());
+            fileSystemsMap.put(fs.getFileSystem(), fs.getPath());
         }
         return fileSystemsMap;
     }
@@ -293,7 +293,7 @@ public class ComputeResourceRepository extends AppCatAbstractRepository<ComputeR
             (new ResourceJobManagerRepository()).createJobManagerCommand(localSubmission.getResourceJobManager().getJobManagerCommands(), localSubmissionEntity.getResourceJobManager());
         }
 
-        localSubmissionEntity.setSecurityProtocol(localSubmission.getSecurityProtocol().toString());
+        localSubmissionEntity.setSecurityProtocol(localSubmission.getSecurityProtocol());
         execute(entityManager -> entityManager.merge(localSubmissionEntity));
         return localSubmissionEntity.getJobSubmissionInterfaceId();
     }
@@ -309,7 +309,7 @@ public class ComputeResourceRepository extends AppCatAbstractRepository<ComputeR
         Mapper mapper = ObjectMapperSingleton.getInstance();
         UnicoreSubmissionEntity unicoreSubmissionEntity = mapper.map(unicoreJobSubmission, UnicoreSubmissionEntity.class);
         if (unicoreJobSubmission.getSecurityProtocol() !=  null) {
-            unicoreSubmissionEntity.setSecurityProtocol(unicoreJobSubmission.getSecurityProtocol().toString());
+            unicoreSubmissionEntity.setSecurityProtocol(unicoreJobSubmission.getSecurityProtocol());
         }
         execute(entityManager -> entityManager.merge(unicoreSubmissionEntity));
         return unicoreJobSubmission.getJobSubmissionInterfaceId();
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ResourceJobManagerRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ResourceJobManagerRepository.java
index c68fdd5..99f7376 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ResourceJobManagerRepository.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ResourceJobManagerRepository.java
@@ -44,7 +44,7 @@ public class ResourceJobManagerRepository extends AppCatAbstractRepository<Resou
                 jobManagerCommandEntity.setCommand(jobManagerCommands.get(commandType));
                 jobManagerCommandEntity.setResourceJobManager(resourceJobManagerEntity);
                 jobManagerCommandEntity.setResourceJobManagerId(resourceJobManagerEntity.getResourceJobManagerId());
-                jobManagerCommandEntity.setCommandType(commandType.toString());
+                jobManagerCommandEntity.setCommandType(commandType);
                 execute(entityManager -> entityManager.merge(jobManagerCommandEntity));
             }
         }
@@ -56,7 +56,7 @@ public class ResourceJobManagerRepository extends AppCatAbstractRepository<Resou
                 ParallelismCommandEntity parallelismCommandEntity = new ParallelismCommandEntity();
                 parallelismCommandEntity.setCommand(parallelismPrefix.get(commandType));
                 parallelismCommandEntity.setResourceJobManager(resourceJobManagerEntity);
-                parallelismCommandEntity.setCommandType(commandType.toString());
+                parallelismCommandEntity.setCommandType(commandType);
                 parallelismCommandEntity.setResourceJobManagerId(resourceJobManagerEntity.getResourceJobManagerId());
                 execute(entityManager -> entityManager.merge(parallelismCommandEntity));
             }
@@ -78,7 +78,7 @@ public class ResourceJobManagerRepository extends AppCatAbstractRepository<Resou
         List<JobManagerCommandEntity> jobManagerCommandEntityList = resultSet;
         Map<JobManagerCommand, String> jobManagerCommandMap= new HashMap<JobManagerCommand,String>();
         for (JobManagerCommandEntity jm: jobManagerCommandEntityList) {
-            jobManagerCommandMap.put(JobManagerCommand.valueOf(jm.getCommandType()), jm.getCommand());
+            jobManagerCommandMap.put(jm.getCommandType(), jm.getCommand());
         }
         return jobManagerCommandMap;
     }
@@ -98,7 +98,7 @@ public class ResourceJobManagerRepository extends AppCatAbstractRepository<Resou
         List<ParallelismCommandEntity> parallelismCommandEntityList = resultSet;
         Map<ApplicationParallelismType, String> applicationParallelismTypeMap= new HashMap<ApplicationParallelismType,String>();
         for (ParallelismCommandEntity pc: parallelismCommandEntityList) {
-            applicationParallelismTypeMap.put(ApplicationParallelismType.valueOf(pc.getCommandType()), pc.getCommand());
+            applicationParallelismTypeMap.put(pc.getCommandType(), pc.getCommand());
         }
         return applicationParallelismTypeMap;
     }
diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java
index 2a557c5..75a2491 100644
--- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java
+++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java
@@ -20,6 +20,7 @@
 */
 package org.apache.airavata.registry.core.repositories.expcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.experiment.ExperimentType;
@@ -94,6 +95,7 @@ public class ExperimentInputRepositoryTest {
 
         InputDataObjectType inputDataObjectTypeExp = new InputDataObjectType();
         inputDataObjectTypeExp.setName("inputE");
+        inputDataObjectTypeExp.setType(DataType.STRING);
 
         List<InputDataObjectType> inputDataObjectTypeExpList = new ArrayList<>();
         inputDataObjectTypeExpList.add(inputDataObjectTypeExp);
@@ -107,6 +109,7 @@ public class ExperimentInputRepositoryTest {
         List<InputDataObjectType> retrievedExpInputsList = experimentInputRepository.getExperimentInputs(experimentId);
         assertTrue(retrievedExpInputsList.size() == 1);
         assertEquals("iValueE", retrievedExpInputsList.get(0).getValue());
+        assertEquals(DataType.STRING, retrievedExpInputsList.get(0).getType());
 
         experimentRepository.removeExperiment(experimentId);
         gatewayRepository.removeGateway(gatewayId);
diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java
index ed6e672..1e712bb 100644
--- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java
+++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java
@@ -20,6 +20,7 @@
 */
 package org.apache.airavata.registry.core.repositories.expcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.experiment.ExperimentType;
@@ -94,6 +95,7 @@ public class ExperimentOutputRepositoryTest {
 
         OutputDataObjectType outputDataObjectTypeExp = new OutputDataObjectType();
         outputDataObjectTypeExp.setName("outputE");
+        outputDataObjectTypeExp.setType(DataType.STRING);
 
         List<OutputDataObjectType> outputDataObjectTypeExpList = new ArrayList<>();
         outputDataObjectTypeExpList.add(outputDataObjectTypeExp);
@@ -107,6 +109,7 @@ public class ExperimentOutputRepositoryTest {
         List<OutputDataObjectType> retrievedExpOutputList = experimentOutputRepository.getExperimentOutputs(experimentId);
         assertTrue(retrievedExpOutputList.size() == 1);
         assertEquals("oValueE", retrievedExpOutputList.get(0).getValue());
+        assertEquals(DataType.STRING, retrievedExpOutputList.get(0).getType());
 
         experimentRepository.removeExperiment(experimentId);
         gatewayRepository.removeGateway(gatewayId);
diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
index 57d0351..d79d7b3 100644
--- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
+++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
@@ -35,9 +35,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
+
+import static org.junit.Assert.*;
 
 public class ExperimentRepositoryTest {
 
@@ -96,6 +95,7 @@ public class ExperimentRepositoryTest {
 
         ExperimentModel retrievedExperimentModel = experimentRepository.getExperiment(experimentId);
         assertEquals(experimentModel.getDescription(), retrievedExperimentModel.getDescription());
+        assertEquals(ExperimentType.SINGLE_APPLICATION, retrievedExperimentModel.getExperimentType());
 
         UserConfigurationDataModel userConfigurationDataModel = new UserConfigurationDataModel();
         userConfigurationDataModel.setAiravataAutoSchedule(true);
diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java
index 590d469..f6bccd3 100644
--- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java
+++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java
@@ -20,6 +20,7 @@
 */
 package org.apache.airavata.registry.core.repositories.expcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
 import org.apache.airavata.model.application.io.InputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.experiment.ExperimentType;
@@ -100,6 +101,7 @@ public class ProcessInputRepositoryTest {
 
         InputDataObjectType inputDataObjectProType = new InputDataObjectType();
         inputDataObjectProType.setName("inputP");
+        inputDataObjectProType.setType(DataType.STDOUT);
 
         List<InputDataObjectType> inputDataObjectTypeProList = new ArrayList<>();
         inputDataObjectTypeProList.add(inputDataObjectProType);
@@ -113,6 +115,7 @@ public class ProcessInputRepositoryTest {
         List<InputDataObjectType> retrievedProInputsList = processInputRepository.getProcessInputs(processId);
         assertTrue(retrievedProInputsList.size() == 1);
         assertEquals("iValueP", retrievedProInputsList.get(0).getValue());
+        assertEquals(DataType.STDOUT, retrievedProInputsList.get(0).getType());
 
         experimentRepository.removeExperiment(experimentId);
         processRepository.removeProcess(processId);
diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java
index 68b286d..f22767a 100644
--- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java
+++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java
@@ -20,6 +20,7 @@
 */
 package org.apache.airavata.registry.core.repositories.expcatalog;
 
+import org.apache.airavata.model.application.io.DataType;
 import org.apache.airavata.model.application.io.OutputDataObjectType;
 import org.apache.airavata.model.experiment.ExperimentModel;
 import org.apache.airavata.model.experiment.ExperimentType;
@@ -100,6 +101,7 @@ public class ProcessOutputRepositoryTest {
 
         OutputDataObjectType outputDataObjectProType = new OutputDataObjectType();
         outputDataObjectProType.setName("outputP");
+        outputDataObjectProType.setType(DataType.STDERR);
 
         List<OutputDataObjectType> outputDataObjectTypeProList = new ArrayList<>();
         outputDataObjectTypeProList.add(outputDataObjectProType);
@@ -113,6 +115,7 @@ public class ProcessOutputRepositoryTest {
         List<OutputDataObjectType> retrievedProOutputList = processOutputRepository.getProcessOutputs(processId);
         assertTrue(retrievedProOutputList.size() == 1);
         assertEquals("oValueP", retrievedProOutputList.get(0).getValue());
+        assertEquals(DataType.STDERR, retrievedProOutputList.get(0).getType());
 
         experimentRepository.removeExperiment(experimentId);
         processRepository.removeProcess(processId);

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.

Mime
View raw message