This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch registry-refactoring in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 3f2e05676e9205799afd2a8b80165fbd2e4add4d Author: Abhiit Karanjkar <[email protected]> AuthorDate: Thu Oct 13 15:55:54 2016 -0400 Workflow catalog Junit --- .../entities/appcatalog/AppEnvironmentEntity.java | 4 +- .../appcatalog/AppModuleMappingEntity.java | 4 +- .../entities/appcatalog/AppModuleMappingPK.java | 10 ++- .../appcatalog/ApplicationDeploymentEntity.java | 4 +- .../appcatalog/ApplicationInputEntity.java | 4 +- .../entities/appcatalog/ApplicationInputPK.java | 10 ++- .../appcatalog/ApplicationInterfaceEntity.java | 4 +- .../appcatalog/ApplicationModuleEntity.java | 5 +- .../appcatalog/ApplicationOutputEntity.java | 4 +- .../entities/appcatalog/ApplicationOutputPK.java | 10 ++- .../core/entities/appcatalog/BatchQueueEntity.java | 4 +- .../core/entities/appcatalog/BatchQueuePK.java | 10 ++- .../entities/appcatalog/ComputeResourceEntity.java | 4 +- .../ComputeResourceFileSystemEntity.java | 5 +- .../appcatalog/ComputeResourceFileSystemPK.java | 10 ++- .../ComputeResourcePreferenceEntity.java | 4 +- .../appcatalog/ComputeResourcePreferencePK.java | 97 +++++++++++----------- .../appcatalog/DataMovementInterfaceEntity.java | 4 +- .../appcatalog/DataMovementInterfacePK.java | 97 +++++++++++----------- .../appcatalog/DataStoragePreferenceEntity.java | 4 +- .../appcatalog/DataStoragePreferencePK.java | 97 +++++++++++----------- .../entities/appcatalog/GatewayProfileEntity.java | 4 +- .../appcatalog/GlobusGkEndpointEntity.java | 4 +- .../entities/appcatalog/GlobusGkEndpointPK.java | 10 ++- .../appcatalog/GlobusSubmissionEntity.java | 4 +- .../appcatalog/GridftpDataMovementEntity.java | 4 +- .../entities/appcatalog/GridftpEndpointEntity.java | 4 +- .../entities/appcatalog/GridftpEndpointPK.java | 95 +++++++++++---------- .../entities/appcatalog/GsisshExportEntity.java | 4 +- .../core/entities/appcatalog/GsisshExportPK.java | 10 ++- .../appcatalog/GsisshPostjobcommandEntity.java | 4 +- .../appcatalog/GsisshPostjobcommandPK.java | 6 +- .../appcatalog/GsisshPrejobcommandEntity.java | 4 +- .../entities/appcatalog/GsisshPrejobcommandPK.java | 10 ++- .../appcatalog/GsisshSubmissionEntity.java | 4 +- .../core/entities/appcatalog/HostAliasEntity.java | 4 +- .../core/entities/appcatalog/HostAliasPK.java | 9 +- .../entities/appcatalog/HostIpaddressEntity.java | 4 +- .../core/entities/appcatalog/HostIpaddressPK.java | 97 +++++++++++----------- .../appcatalog/JobManagerCommandEntity.java | 5 +- .../entities/appcatalog/JobManagerCommandPK.java | 97 +++++++++++----------- .../appcatalog/JobSubmissionInterfaceEntity.java | 5 +- .../appcatalog/JobSubmissionInterfacePK.java | 97 +++++++++++----------- .../appcatalog/LibraryApendPathEntity.java | 4 +- .../appcatalog/LibraryPrependPathEntity.java | 4 +- .../appcatalog/LocalDataMovementEntity.java | 4 +- .../entities/appcatalog/LocalSubmissionEntity.java | 4 +- .../appcatalog/ParallelismCommandEntity.java | 4 +- .../entities/appcatalog/ParallelismCommandPK.java | 97 +++++++++++----------- .../entities/appcatalog/PostjobCommandEntity.java | 4 +- .../core/entities/appcatalog/PostjobCommandPK.java | 97 +++++++++++----------- .../entities/appcatalog/PrejobCommandEntity.java | 5 +- .../core/entities/appcatalog/PrejobCommandPK.java | 11 ++- .../appcatalog/ResourceJobManagerEntity.java | 4 +- .../entities/appcatalog/ScpDataMovementEntity.java | 4 +- .../appcatalog/SshJobSubmissionEntity.java | 4 +- .../appcatalog/StorageInterfaceEntity.java | 5 +- .../entities/appcatalog/StorageInterfacePK.java | 10 ++- .../entities/appcatalog/StorageResourceEntity.java | 4 +- .../appcatalog/UnicoreDatamovementEntity.java | 4 +- .../appcatalog/UnicoreSubmissionEntity.java | 4 +- .../entities/workflowcatalog/WorkflowEntity.java | 19 ++--- .../core/repositories/AbstractRepository.java | 78 +++++++++++++++++ .../workspacecatalog/GatewayRepository.java | 36 ++++++++ .../src/main/resources/META-INF/persistence.xml | 66 +++++++++++++++ .../registry/core/repositories/RepositoryTest.java | 85 +++++++++++++++++++ 66 files changed, 879 insertions(+), 558 deletions(-) diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java index a4e141e..175d15d 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java @@ -8,7 +8,7 @@ import javax.persistence.*; */ @Entity @Table(name = "app_environment") -public class AppEnvironment implements Serializable { +public class AppEnvironmentEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -21,7 +21,7 @@ public class AppEnvironment implements Serializable { @Column(name = "name") private String name; - public AppEnvironment() { + public AppEnvironmentEntity() { } public String getDeploymentId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java index d539408..f40b232 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java @@ -10,13 +10,13 @@ import javax.persistence.*; */ @Entity @Table(name="app_module_mapping") -public class AppModuleMapping implements Serializable { +public class AppModuleMappingEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId private AppModuleMappingPK id; - public AppModuleMapping() { + public AppModuleMappingEntity() { } public AppModuleMappingPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingPK.java index 2890f14..df7e3ee 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingPK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -20,15 +20,19 @@ public class AppModuleMappingPK implements Serializable { public AppModuleMappingPK() { } + public String getInterfaceId() { - return this.interfaceId; + return interfaceId; } + public void setInterfaceId(String interfaceId) { this.interfaceId = interfaceId; } + public String getModuleId() { - return this.moduleId; + return moduleId; } + public void setModuleId(String moduleId) { this.moduleId = moduleId; } 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 a7132a0..735c9ac 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 @@ -10,7 +10,7 @@ import java.util.List; */ @Entity @Table(name = "application_deployment") -public class ApplicationDeployment implements Serializable { +public class ApplicationDeploymentEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -44,7 +44,7 @@ public class ApplicationDeployment implements Serializable { @Column(name = "APP_MODULE_ID") private String applicationModuleId; - public ApplicationDeployment() { + public ApplicationDeploymentEntity() { } public String getDeploymentId() { 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 a3a827e..6bbd4db 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 @@ -9,7 +9,7 @@ import javax.persistence.*; */ @Entity @Table(name = "application_input") -public class ApplicationInput implements Serializable { +public class ApplicationInputEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -45,7 +45,7 @@ public class ApplicationInput implements Serializable { @Column(name = "USER_FRIENDLY_DESC") private String userFriendlyDesc; - public ApplicationInput() { + public ApplicationInputEntity() { } public ApplicationInputPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputPK.java index ad8b44f..b993d67 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputPK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -20,15 +20,19 @@ public class ApplicationInputPK implements Serializable { public ApplicationInputPK() { } + public String getInterfaceId() { - return this.interfaceId; + return interfaceId; } + public void setInterfaceId(String interfaceId) { this.interfaceId = interfaceId; } + public String getInputKey() { - return this.inputKey; + return inputKey; } + public void setInputKey(String inputKey) { this.inputKey = inputKey; } diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java index 9c068fa..4ce927e 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java @@ -12,7 +12,7 @@ import java.util.List; */ @Entity @Table(name="application_interface") -public class ApplicationInterface implements Serializable { +public class ApplicationInterfaceEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -38,7 +38,7 @@ public class ApplicationInterface implements Serializable { private Timestamp updateTime; - public ApplicationInterface() { + public ApplicationInterfaceEntity() { } public String getInterfaceId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java index 362bffb..d646a4f 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java @@ -11,8 +11,7 @@ import java.util.List; */ @Entity @Table(name = "application_module") -@NamedQuery(name = "ApplicationModule.findAll", query = "SELECT a FROM ApplicationModule a") -public class ApplicationModule implements Serializable { +public class ApplicationModuleEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -37,7 +36,7 @@ public class ApplicationModule implements Serializable { @Column(name = "UPDATE_TIME") private Timestamp updateTime; - public ApplicationModule() { + public ApplicationModuleEntity() { } public String getModuleId() { 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 497a70a..f63aff3 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 @@ -8,7 +8,7 @@ import javax.persistence.*; */ @Entity @Table(name = "application_output") -public class ApplicationOutput implements Serializable { +public class ApplicationOutputEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -41,7 +41,7 @@ public class ApplicationOutput implements Serializable { @Column(name = "SEARCH_QUERY") private String searchQuery; - public ApplicationOutput() { + public ApplicationOutputEntity() { } public ApplicationOutputPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputPK.java index 564bf81..31bcedc 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputPK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -20,15 +20,19 @@ public class ApplicationOutputPK implements Serializable { public ApplicationOutputPK() { } + public String getInterfaceId() { - return this.interfaceId; + return interfaceId; } + public void setInterfaceId(String interfaceId) { this.interfaceId = interfaceId; } + public String getOutputKey() { - return this.outputKey; + return outputKey; } + public void setOutputKey(String outputKey) { this.outputKey = outputKey; } diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java index a1fb6d9..2ccb6fb 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java @@ -8,7 +8,7 @@ import javax.persistence.*; */ @Entity @Table(name = "batch_queue") -public class BatchQueue implements Serializable { +public class BatchQueueEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -32,7 +32,7 @@ public class BatchQueue implements Serializable { @Column(name = "QUEUE_DESCRIPTION") private String queueDescription; - public BatchQueue() { + public BatchQueueEntity() { } public BatchQueuePK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueuePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueuePK.java index decfa9e..4e30f43 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueuePK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueuePK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -20,15 +20,19 @@ public class BatchQueuePK implements Serializable { public BatchQueuePK() { } + public String getComputeResourceId() { - return this.computeResourceId; + return computeResourceId; } + public void setComputeResourceId(String computeResourceId) { this.computeResourceId = computeResourceId; } + public String getQueueName() { - return this.queueName; + return queueName; } + public void setQueueName(String queueName) { this.queueName = queueName; } diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java index 9177607..30adad1 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java @@ -10,7 +10,7 @@ import java.util.List; */ @Entity @Table(name = "compute_resource") -public class ComputeResource implements Serializable { +public class ComputeResourceEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -43,7 +43,7 @@ public class ComputeResource implements Serializable { @Column(name = "UPDATE_TIME") private Timestamp updateTime; - public ComputeResource() { + public ComputeResourceEntity() { } public String getResourceId() { 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 514ee86..18877ff 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 @@ -10,8 +10,7 @@ import javax.persistence.*; */ @Entity @Table(name="compute_resource_file_system") -@NamedQuery(name="ComputeResourceFileSystem.findAll", query="SELECT c FROM ComputeResourceFileSystem c") -public class ComputeResourceFileSystem implements Serializable { +public class ComputeResourceFileSystemEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -21,7 +20,7 @@ public class ComputeResourceFileSystem implements Serializable { private String path; - public ComputeResourceFileSystem() { + public ComputeResourceFileSystemEntity() { } public ComputeResourceFileSystemPK getId() { 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 81586de..8ea88cd 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 @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -20,15 +20,19 @@ public class ComputeResourceFileSystemPK implements Serializable { public ComputeResourceFileSystemPK() { } + public String getComputeResourceId() { - return this.computeResourceId; + return computeResourceId; } + public void setComputeResourceId(String computeResourceId) { this.computeResourceId = computeResourceId; } + public String getFileSystem() { - return this.fileSystem; + return fileSystem; } + public void setFileSystem(String 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 51ef509..05265e5 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 @@ -10,7 +10,7 @@ import java.sql.Timestamp; */ @Entity @Table(name = "compute_resource_preference") -public class ComputeResourcePreference implements Serializable { +public class ComputeResourcePreferenceEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -54,7 +54,7 @@ public class ComputeResourcePreference implements Serializable { @Column(name = "USAGE_REPORTING_GATEWAY_ID") private String usageReportingGatewayId; - public ComputeResourcePreference() { + public ComputeResourcePreferenceEntity() { } public ComputeResourcePreferencePK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferencePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferencePK.java index 8ee1ed4..d3c9219 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferencePK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferencePK.java @@ -1,57 +1,60 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; /** * The primary key class for the compute_resource_preference database table. - * */ @Embeddable public class ComputeResourcePreferencePK implements Serializable { - //default serial version id, required for serializable classes. - private static final long serialVersionUID = 1L; - - @Column(name="GATEWAY_ID", insertable=false, updatable=false) - private String gatewayId; - - @Column(name="RESOURCE_ID", insertable=false, updatable=false) - private String resourceId; - - public ComputeResourcePreferencePK() { - } - public String getGatewayId() { - return this.gatewayId; - } - public void setGatewayId(String gatewayId) { - this.gatewayId = gatewayId; - } - public String getResourceId() { - return this.resourceId; - } - public void setResourceId(String resourceId) { - this.resourceId = resourceId; - } - - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof ComputeResourcePreferencePK)) { - return false; - } - ComputeResourcePreferencePK castOther = (ComputeResourcePreferencePK)other; - return - this.gatewayId.equals(castOther.gatewayId) - && this.resourceId.equals(castOther.resourceId); - } - - public int hashCode() { - final int prime = 31; - int hash = 17; - hash = hash * prime + this.gatewayId.hashCode(); - hash = hash * prime + this.resourceId.hashCode(); - - return hash; - } + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name = "GATEWAY_ID", insertable = false, updatable = false) + private String gatewayId; + + @Column(name = "RESOURCE_ID", insertable = false, updatable = false) + private String resourceId; + + public ComputeResourcePreferencePK() { + } + + public String getGatewayId() { + return gatewayId; + } + + public void setGatewayId(String gatewayId) { + this.gatewayId = gatewayId; + } + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof ComputeResourcePreferencePK)) { + return false; + } + ComputeResourcePreferencePK castOther = (ComputeResourcePreferencePK) other; + return + this.gatewayId.equals(castOther.gatewayId) + && this.resourceId.equals(castOther.resourceId); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.gatewayId.hashCode(); + hash = hash * prime + this.resourceId.hashCode(); + + return hash; + } } \ No newline at end of file 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 08a3a2d..b63f50e 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 @@ -9,7 +9,7 @@ import java.sql.Timestamp; */ @Entity @Table(name = "data_movement_interface") -public class DataMovementInterface implements Serializable { +public class DataMovementInterfaceEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -27,7 +27,7 @@ public class DataMovementInterface implements Serializable { @Column(name = "UPDATE_TIME") private Timestamp updateTime; - public DataMovementInterface() { + public DataMovementInterfaceEntity() { } public DataMovementInterfacePK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfacePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfacePK.java index 921570f..a5cd67f 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfacePK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfacePK.java @@ -1,57 +1,60 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; /** * The primary key class for the data_movement_interface database table. - * */ @Embeddable public class DataMovementInterfacePK implements Serializable { - //default serial version id, required for serializable classes. - private static final long serialVersionUID = 1L; - - @Column(name="COMPUTE_RESOURCE_ID", insertable=false, updatable=false) - private String computeResourceId; - - @Column(name="DATA_MOVEMENT_INTERFACE_ID") - private String dataMovementInterfaceId; - - public DataMovementInterfacePK() { - } - public String getComputeResourceId() { - return this.computeResourceId; - } - public void setComputeResourceId(String computeResourceId) { - this.computeResourceId = computeResourceId; - } - public String getDataMovementInterfaceId() { - return this.dataMovementInterfaceId; - } - public void setDataMovementInterfaceId(String dataMovementInterfaceId) { - this.dataMovementInterfaceId = dataMovementInterfaceId; - } - - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof DataMovementInterfacePK)) { - return false; - } - DataMovementInterfacePK castOther = (DataMovementInterfacePK)other; - return - this.computeResourceId.equals(castOther.computeResourceId) - && this.dataMovementInterfaceId.equals(castOther.dataMovementInterfaceId); - } - - public int hashCode() { - final int prime = 31; - int hash = 17; - hash = hash * prime + this.computeResourceId.hashCode(); - hash = hash * prime + this.dataMovementInterfaceId.hashCode(); - - return hash; - } + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name = "COMPUTE_RESOURCE_ID", insertable = false, updatable = false) + private String computeResourceId; + + @Column(name = "DATA_MOVEMENT_INTERFACE_ID") + private String dataMovementInterfaceId; + + public DataMovementInterfacePK() { + } + + public String getComputeResourceId() { + return computeResourceId; + } + + public void setComputeResourceId(String computeResourceId) { + this.computeResourceId = computeResourceId; + } + + public String getDataMovementInterfaceId() { + return dataMovementInterfaceId; + } + + public void setDataMovementInterfaceId(String dataMovementInterfaceId) { + this.dataMovementInterfaceId = dataMovementInterfaceId; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof DataMovementInterfacePK)) { + return false; + } + DataMovementInterfacePK castOther = (DataMovementInterfacePK) other; + return + this.computeResourceId.equals(castOther.computeResourceId) + && this.dataMovementInterfaceId.equals(castOther.dataMovementInterfaceId); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.computeResourceId.hashCode(); + hash = hash * prime + this.dataMovementInterfaceId.hashCode(); + + return hash; + } } \ No newline at end of file diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferenceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferenceEntity.java index f3d7c55..9d3c464 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferenceEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferenceEntity.java @@ -8,7 +8,7 @@ import javax.persistence.*; */ @Entity @Table(name = "data_storage_preference") -public class DataStoragePreference implements Serializable { +public class DataStoragePreferenceEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -23,7 +23,7 @@ public class DataStoragePreference implements Serializable { @Column(name = "RESOURCE_CS_TOKEN") private String resourceCsToken; - public DataStoragePreference() { + public DataStoragePreferenceEntity() { } public DataStoragePreferencePK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferencePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferencePK.java index 24b28cf..8aa94d5 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferencePK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataStoragePreferencePK.java @@ -1,57 +1,60 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; /** * The primary key class for the data_storage_preference database table. - * */ @Embeddable public class DataStoragePreferencePK implements Serializable { - //default serial version id, required for serializable classes. - private static final long serialVersionUID = 1L; - - @Column(name="GATEWAY_ID", insertable=false, updatable=false) - private String gatewayId; - - @Column(name="STORAGE_RESOURCE_ID") - private String storageResourceId; - - public DataStoragePreferencePK() { - } - public String getGatewayId() { - return this.gatewayId; - } - public void setGatewayId(String gatewayId) { - this.gatewayId = gatewayId; - } - public String getStorageResourceId() { - return this.storageResourceId; - } - public void setStorageResourceId(String storageResourceId) { - this.storageResourceId = storageResourceId; - } - - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof DataStoragePreferencePK)) { - return false; - } - DataStoragePreferencePK castOther = (DataStoragePreferencePK)other; - return - this.gatewayId.equals(castOther.gatewayId) - && this.storageResourceId.equals(castOther.storageResourceId); - } - - public int hashCode() { - final int prime = 31; - int hash = 17; - hash = hash * prime + this.gatewayId.hashCode(); - hash = hash * prime + this.storageResourceId.hashCode(); - - return hash; - } + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name = "GATEWAY_ID", insertable = false, updatable = false) + private String gatewayId; + + @Column(name = "STORAGE_RESOURCE_ID") + private String storageResourceId; + + public DataStoragePreferencePK() { + } + + public String getGatewayId() { + return gatewayId; + } + + public void setGatewayId(String gatewayId) { + this.gatewayId = gatewayId; + } + + public String getStorageResourceId() { + return storageResourceId; + } + + public void setStorageResourceId(String storageResourceId) { + this.storageResourceId = storageResourceId; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof DataStoragePreferencePK)) { + return false; + } + DataStoragePreferencePK castOther = (DataStoragePreferencePK) other; + return + this.gatewayId.equals(castOther.gatewayId) + && this.storageResourceId.equals(castOther.storageResourceId); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.gatewayId.hashCode(); + hash = hash * prime + this.storageResourceId.hashCode(); + + return hash; + } } \ No newline at end of file diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java index 9ae0214..b62ef31 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayProfileEntity.java @@ -11,7 +11,7 @@ import java.util.List; */ @Entity @Table(name = "gateway_profile") -public class GatewayProfile implements Serializable { +public class GatewayProfileEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -34,7 +34,7 @@ public class GatewayProfile implements Serializable { private Timestamp updateTime; - public GatewayProfile() { + public GatewayProfileEntity() { } public String getGatewayId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java index 71acd69..d3923fb 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointEntity.java @@ -10,7 +10,7 @@ import javax.persistence.*; */ @Entity @Table(name="globus_gk_endpoint") -public class GlobusGkEndpoint implements Serializable { +public class GlobusGkEndpointEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -18,7 +18,7 @@ public class GlobusGkEndpoint implements Serializable { - public GlobusGkEndpoint() { + public GlobusGkEndpointEntity() { } public GlobusGkEndpointPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointPK.java index ea8f651..53d4214 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GlobusGkEndpointPK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -20,15 +20,19 @@ public class GlobusGkEndpointPK implements Serializable { public GlobusGkEndpointPK() { } + public String getSubmissionId() { - return this.submissionId; + return submissionId; } + public void setSubmissionId(String submissionId) { this.submissionId = submissionId; } + public String getEndpoint() { - return this.endpoint; + return endpoint; } + public void setEndpoint(String endpoint) { this.endpoint = endpoint; } 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 39d8fe8..db63241 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 @@ -10,7 +10,7 @@ import java.util.List; */ @Entity @Table(name = "globus_submission") -public class GlobusSubmission implements Serializable { +public class GlobusSubmissionEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -23,7 +23,7 @@ public class GlobusSubmission implements Serializable { @Column(name = "SECURITY_PROTOCAL") private String securityProtocal; - public GlobusSubmission() { + public GlobusSubmissionEntity() { } public String getSubmissionId() { 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 ea76a6a..6b0b723 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 @@ -11,7 +11,7 @@ import java.util.List; */ @Entity @Table(name = "gridftp_data_movement") -public class GridftpDataMovement implements Serializable { +public class GridftpDataMovementEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -28,7 +28,7 @@ public class GridftpDataMovement implements Serializable { private Timestamp updateTime; - public GridftpDataMovement() { + public GridftpDataMovementEntity() { } public String getDataMovementInterfaceId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java index fab10d0..c280949 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java @@ -10,7 +10,7 @@ import java.sql.Timestamp; */ @Entity @Table(name = "gridftp_endpoint") -public class GridftpEndpoint implements Serializable { +public class GridftpEndpointEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -23,7 +23,7 @@ public class GridftpEndpoint implements Serializable { private Timestamp updateTime; - public GridftpEndpoint() { + public GridftpEndpointEntity() { } public GridftpEndpointPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointPK.java index da0bfc5..dbde0cd 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointPK.java @@ -1,56 +1,59 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; /** * The primary key class for the gridftp_endpoint database table. - * */ @Embeddable public class GridftpEndpointPK implements Serializable { - //default serial version id, required for serializable classes. - private static final long serialVersionUID = 1L; - - @Column(name="DATA_MOVEMENT_INTERFACE_ID", insertable=false, updatable=false) - private String dataMovementInterfaceId; - - private String endpoint; - - public GridftpEndpointPK() { - } - public String getDataMovementInterfaceId() { - return this.dataMovementInterfaceId; - } - public void setDataMovementInterfaceId(String dataMovementInterfaceId) { - this.dataMovementInterfaceId = dataMovementInterfaceId; - } - public String getEndpoint() { - return this.endpoint; - } - public void setEndpoint(String endpoint) { - this.endpoint = endpoint; - } - - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof GridftpEndpointPK)) { - return false; - } - GridftpEndpointPK castOther = (GridftpEndpointPK)other; - return - this.dataMovementInterfaceId.equals(castOther.dataMovementInterfaceId) - && this.endpoint.equals(castOther.endpoint); - } - - public int hashCode() { - final int prime = 31; - int hash = 17; - hash = hash * prime + this.dataMovementInterfaceId.hashCode(); - hash = hash * prime + this.endpoint.hashCode(); - - return hash; - } + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name = "DATA_MOVEMENT_INTERFACE_ID", insertable = false, updatable = false) + private String dataMovementInterfaceId; + + private String endpoint; + + public GridftpEndpointPK() { + } + + public String getDataMovementInterfaceId() { + return dataMovementInterfaceId; + } + + public void setDataMovementInterfaceId(String dataMovementInterfaceId) { + this.dataMovementInterfaceId = dataMovementInterfaceId; + } + + public String getEndpoint() { + return endpoint; + } + + public void setEndpoint(String endpoint) { + this.endpoint = endpoint; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof GridftpEndpointPK)) { + return false; + } + GridftpEndpointPK castOther = (GridftpEndpointPK) other; + return + this.dataMovementInterfaceId.equals(castOther.dataMovementInterfaceId) + && this.endpoint.equals(castOther.endpoint); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.dataMovementInterfaceId.hashCode(); + hash = hash * prime + this.endpoint.hashCode(); + + return hash; + } } \ No newline at end of file diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java index 1f908ca..3065e33 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportEntity.java @@ -9,13 +9,13 @@ import javax.persistence.*; */ @Entity @Table(name = "gsissh_export") -public class GsisshExport implements Serializable { +public class GsisshExportEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId private GsisshExportPK id; - public GsisshExport() { + public GsisshExportEntity() { } public GsisshExportPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportPK.java index 0fbeae6..ae4d3da 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshExportPK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -20,15 +20,19 @@ public class GsisshExportPK implements Serializable { public GsisshExportPK() { } + public String getSubmissionId() { - return this.submissionId; + return submissionId; } + public void setSubmissionId(String submissionId) { this.submissionId = submissionId; } + public String getExport() { - return this.export; + return export; } + public void setExport(String export) { this.export = export; } diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java index 5a0e038..c28963e 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandEntity.java @@ -9,13 +9,13 @@ import javax.persistence.*; */ @Entity @Table(name = "gsissh_postjobcommand") -public class GsisshPostjobcommand implements Serializable { +public class GsisshPostjobcommandEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId private GsisshPostjobcommandPK id; - public GsisshPostjobcommand() { + public GsisshPostjobcommandEntity() { } public GsisshPostjobcommandPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandPK.java index e86dfc0..0100350 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPostjobcommandPK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -22,7 +22,7 @@ public class GsisshPostjobcommandPK implements Serializable { } public String getSubmissionId() { - return this.submissionId; + return submissionId; } public void setSubmissionId(String submissionId) { @@ -30,7 +30,7 @@ public class GsisshPostjobcommandPK implements Serializable { } public String getCommand() { - return this.command; + return command; } public void setCommand(String command) { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java index 30b0852..618b7f9 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandEntity.java @@ -9,14 +9,14 @@ import javax.persistence.*; */ @Entity @Table(name = "gsissh_prejobcommand") -public class GsisshPrejobcommand implements Serializable { +public class GsisshPrejobcommandEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId private GsisshPrejobcommandPK id; - public GsisshPrejobcommand() { + public GsisshPrejobcommandEntity() { } public GsisshPrejobcommandPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandPK.java index f1f5d88..6c22043 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshPrejobcommandPK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -20,15 +20,19 @@ public class GsisshPrejobcommandPK implements Serializable { public GsisshPrejobcommandPK() { } + public String getSubmissionId() { - return this.submissionId; + return submissionId; } + public void setSubmissionId(String submissionId) { this.submissionId = submissionId; } + public String getCommand() { - return this.command; + return command; } + public void setCommand(String command) { this.command = command; } diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java index 852d944..0403dc0 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GsisshSubmissionEntity.java @@ -10,7 +10,7 @@ import java.util.List; */ @Entity @Table(name = "gsissh_submission") -public class GsisshSubmission implements Serializable { +public class GsisshSubmissionEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -29,7 +29,7 @@ public class GsisshSubmission implements Serializable { @Column(name = "SSH_PORT") private int sshPort; - public GsisshSubmission() { + public GsisshSubmissionEntity() { } public String getSubmissionId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostAliasEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostAliasEntity.java index c2a3c28..25deead 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostAliasEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostAliasEntity.java @@ -9,7 +9,7 @@ import javax.persistence.*; */ @Entity @Table(name = "host_alias") -public class HostAlias implements Serializable { +public class HostAliasEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -18,7 +18,7 @@ public class HostAlias implements Serializable { @Column(name = "RESOURCE_ID") private String resourceId; - public HostAlias() { + public HostAliasEntity() { } public HostAliasPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostAliasPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostAliasPK.java index 1320f33..77239b0 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostAliasPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostAliasPK.java @@ -8,16 +8,17 @@ import javax.persistence.*; * */ @Embeddable -public class HostAliaPK implements Serializable { +public class HostAliasPK implements Serializable { //default serial version id, required for serializable classes. private static final long serialVersionUID = 1L; @Column(name="RESOURCE_ID", insertable=false, updatable=false) private String resourceId; + @Column(name = "ALIAS") private String alias; - public HostAliaPK() { + public HostAliasPK() { } public String getResourceId() { @@ -40,10 +41,10 @@ public class HostAliaPK implements Serializable { if (this == other) { return true; } - if (!(other instanceof HostAliaPK)) { + if (!(other instanceof HostAliasPK)) { return false; } - HostAliaPK castOther = (HostAliaPK)other; + HostAliasPK castOther = (HostAliasPK)other; return this.resourceId.equals(castOther.resourceId) && this.alias.equals(castOther.alias); diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostIpaddressEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostIpaddressEntity.java index 9675fc6..c303ef1 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostIpaddressEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostIpaddressEntity.java @@ -9,7 +9,7 @@ import javax.persistence.*; */ @Entity @Table(name = "host_ipaddress") -public class HostIpaddress implements Serializable { +public class HostIpaddressEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -18,7 +18,7 @@ public class HostIpaddress implements Serializable { @Column(name = "RESOURCE_ID") private String resourceId; - public HostIpaddress() { + public HostIpaddressEntity() { } diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostIpaddressPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostIpaddressPK.java index a09b0a7..6fdf003 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostIpaddressPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/HostIpaddressPK.java @@ -1,57 +1,60 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; /** * The primary key class for the host_ipaddress database table. - * */ @Embeddable public class HostIpaddressPK implements Serializable { - //default serial version id, required for serializable classes. - private static final long serialVersionUID = 1L; - - @Column(name="RESOURCE_ID", insertable=false, updatable=false) - private String resourceId; - - @Column(name="IP_ADDRESS") - private String ipAddress; - - public HostIpaddressPK() { - } - public String getResourceId() { - return this.resourceId; - } - public void setResourceId(String resourceId) { - this.resourceId = resourceId; - } - public String getIpAddress() { - return this.ipAddress; - } - public void setIpAddress(String ipAddress) { - this.ipAddress = ipAddress; - } - - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof HostIpaddressPK)) { - return false; - } - HostIpaddressPK castOther = (HostIpaddressPK)other; - return - this.resourceId.equals(castOther.resourceId) - && this.ipAddress.equals(castOther.ipAddress); - } - - public int hashCode() { - final int prime = 31; - int hash = 17; - hash = hash * prime + this.resourceId.hashCode(); - hash = hash * prime + this.ipAddress.hashCode(); - - return hash; - } + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name = "RESOURCE_ID", insertable = false, updatable = false) + private String resourceId; + + @Column(name = "IP_ADDRESS") + private String ipAddress; + + public HostIpaddressPK() { + } + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public String getIpAddress() { + return ipAddress; + } + + public void setIpAddress(String ipAddress) { + this.ipAddress = ipAddress; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof HostIpaddressPK)) { + return false; + } + HostIpaddressPK castOther = (HostIpaddressPK) other; + return + this.resourceId.equals(castOther.resourceId) + && this.ipAddress.equals(castOther.ipAddress); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.resourceId.hashCode(); + hash = hash * prime + this.ipAddress.hashCode(); + + return hash; + } } \ No newline at end of file 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 e6473b6..36f8bca 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 @@ -8,8 +8,7 @@ import javax.persistence.*; */ @Entity @Table(name = "job_manager_command") -@NamedQuery(name = "JobManagerCommand.findAll", query = "SELECT j FROM JobManagerCommand j") -public class JobManagerCommand implements Serializable { +public class JobManagerCommandEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -18,7 +17,7 @@ public class JobManagerCommand implements Serializable { @Column(name = "COMMAND") private String command; - public JobManagerCommand() { + public JobManagerCommandEntity() { } public JobManagerCommandPK getId() { 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 3e50527..4fd57b6 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 @@ -1,57 +1,60 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; /** * The primary key class for the job_manager_command database table. - * */ @Embeddable public class JobManagerCommandPK implements Serializable { - //default serial version id, required for serializable classes. - private static final long serialVersionUID = 1L; - - @Column(name="RESOURCE_JOB_MANAGER_ID", insertable=false, updatable=false) - private String resourceJobManagerId; - - @Column(name="COMMAND_TYPE") - private String commandType; - - public JobManagerCommandPK() { - } - public String getResourceJobManagerId() { - return this.resourceJobManagerId; - } - public void setResourceJobManagerId(String resourceJobManagerId) { - this.resourceJobManagerId = resourceJobManagerId; - } - public String getCommandType() { - return this.commandType; - } - public void setCommandType(String commandType) { - this.commandType = commandType; - } - - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof JobManagerCommandPK)) { - return false; - } - JobManagerCommandPK castOther = (JobManagerCommandPK)other; - return - this.resourceJobManagerId.equals(castOther.resourceJobManagerId) - && this.commandType.equals(castOther.commandType); - } - - public int hashCode() { - final int prime = 31; - int hash = 17; - hash = hash * prime + this.resourceJobManagerId.hashCode(); - hash = hash * prime + this.commandType.hashCode(); - - return hash; - } + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name = "RESOURCE_JOB_MANAGER_ID", insertable = false, updatable = false) + private String resourceJobManagerId; + + @Column(name = "COMMAND_TYPE") + private String commandType; + + public JobManagerCommandPK() { + } + + public String getResourceJobManagerId() { + return resourceJobManagerId; + } + + public void setResourceJobManagerId(String resourceJobManagerId) { + this.resourceJobManagerId = resourceJobManagerId; + } + + public String getCommandType() { + return commandType; + } + + public void setCommandType(String commandType) { + this.commandType = commandType; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof JobManagerCommandPK)) { + return false; + } + JobManagerCommandPK castOther = (JobManagerCommandPK) other; + return + this.resourceJobManagerId.equals(castOther.resourceJobManagerId) + && this.commandType.equals(castOther.commandType); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.resourceJobManagerId.hashCode(); + hash = hash * prime + this.commandType.hashCode(); + + return hash; + } } \ No newline at end of file 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 677db94..014bbb9 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 @@ -9,8 +9,7 @@ import java.sql.Timestamp; */ @Entity @Table(name = "job_submission_interface") -@NamedQuery(name = "JobSubmissionInterface.findAll", query = "SELECT j FROM JobSubmissionInterface j") -public class JobSubmissionInterface implements Serializable { +public class JobSubmissionInterfaceEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -28,7 +27,7 @@ public class JobSubmissionInterface implements Serializable { @Column(name = "UPDATE_TIME") private Timestamp updateTime; - public JobSubmissionInterface() { + public JobSubmissionInterfaceEntity() { } public JobSubmissionInterfacePK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfacePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfacePK.java index 540cf9a..430951f 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfacePK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfacePK.java @@ -1,57 +1,60 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; /** * The primary key class for the job_submission_interface database table. - * */ @Embeddable public class JobSubmissionInterfacePK implements Serializable { - //default serial version id, required for serializable classes. - private static final long serialVersionUID = 1L; - - @Column(name="COMPUTE_RESOURCE_ID", insertable=false, updatable=false) - private String computeResourceId; - - @Column(name="JOB_SUBMISSION_INTERFACE_ID") - private String jobSubmissionInterfaceId; - - public JobSubmissionInterfacePK() { - } - public String getComputeResourceId() { - return this.computeResourceId; - } - public void setComputeResourceId(String computeResourceId) { - this.computeResourceId = computeResourceId; - } - public String getJobSubmissionInterfaceId() { - return this.jobSubmissionInterfaceId; - } - public void setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) { - this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; - } - - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof JobSubmissionInterfacePK)) { - return false; - } - JobSubmissionInterfacePK castOther = (JobSubmissionInterfacePK)other; - return - this.computeResourceId.equals(castOther.computeResourceId) - && this.jobSubmissionInterfaceId.equals(castOther.jobSubmissionInterfaceId); - } - - public int hashCode() { - final int prime = 31; - int hash = 17; - hash = hash * prime + this.computeResourceId.hashCode(); - hash = hash * prime + this.jobSubmissionInterfaceId.hashCode(); - - return hash; - } + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name = "COMPUTE_RESOURCE_ID", insertable = false, updatable = false) + private String computeResourceId; + + @Column(name = "JOB_SUBMISSION_INTERFACE_ID") + private String jobSubmissionInterfaceId; + + public JobSubmissionInterfacePK() { + } + + public String getComputeResourceId() { + return computeResourceId; + } + + public void setComputeResourceId(String computeResourceId) { + this.computeResourceId = computeResourceId; + } + + public String getJobSubmissionInterfaceId() { + return jobSubmissionInterfaceId; + } + + public void setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) { + this.jobSubmissionInterfaceId = jobSubmissionInterfaceId; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof JobSubmissionInterfacePK)) { + return false; + } + JobSubmissionInterfacePK castOther = (JobSubmissionInterfacePK) other; + return + this.computeResourceId.equals(castOther.computeResourceId) + && this.jobSubmissionInterfaceId.equals(castOther.jobSubmissionInterfaceId); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.computeResourceId.hashCode(); + hash = hash * prime + this.jobSubmissionInterfaceId.hashCode(); + + return hash; + } } \ No newline at end of file diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java index 3fcf543..0eee4cc 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java @@ -9,7 +9,7 @@ import javax.persistence.*; */ @Entity @Table(name = "library_apend_path") -public class LibraryApendPath implements Serializable { +public class LibraryApendPathEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -23,7 +23,7 @@ public class LibraryApendPath implements Serializable { private String name; - public LibraryApendPath() { + public LibraryApendPathEntity() { } public String getDeploymentId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java index deb0dcd..e25f5b9 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java @@ -10,7 +10,7 @@ import javax.persistence.*; */ @Entity @Table(name="library_prepand_path") -public class LibraryPrependPath implements Serializable { +public class LibraryPrependPathEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -25,7 +25,7 @@ public class LibraryPrependPath implements Serializable { - public LibraryPrependPath() { + public LibraryPrependPathEntity() { } public String getDeploymentId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java index 5ccc304..9520abe 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalDataMovementEntity.java @@ -9,14 +9,14 @@ import javax.persistence.*; */ @Entity @Table(name = "local_data_movement") -public class LocalDataMovement implements Serializable { +public class LocalDataMovementEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @Column(name = "DATA_MOVEMENT_INTERFACE_ID") private String dataMovementInterfaceId; - public LocalDataMovement() { + public LocalDataMovementEntity() { } public String getDataMovementInterfaceId() { 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 7931eda..e7f721d 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 @@ -9,7 +9,7 @@ import java.sql.Timestamp; */ @Entity @Table(name = "local_submission") -public class LocalSubmission implements Serializable { +public class LocalSubmissionEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -25,7 +25,7 @@ public class LocalSubmission implements Serializable { @Column(name = "RESOURCE_JOB_MANAGER_ID") private String resourceJobManagerId; - public LocalSubmission() { + public LocalSubmissionEntity() { } public String getJobSubmissionInterfaceId() { 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 25e104a..1a0510b 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 @@ -8,7 +8,7 @@ import javax.persistence.*; */ @Entity @Table(name = "parallelism_command") -public class ParallelismCommand implements Serializable { +public class ParallelismCommandEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -17,7 +17,7 @@ public class ParallelismCommand implements Serializable { @Column(name = "COMMAND") private String command; - public ParallelismCommand() { + public ParallelismCommandEntity() { } public ParallelismCommandPK getId() { 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 23479e4..c4472cc 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 @@ -1,57 +1,60 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; /** * The primary key class for the parallelism_command database table. - * */ @Embeddable public class ParallelismCommandPK implements Serializable { - //default serial version id, required for serializable classes. - private static final long serialVersionUID = 1L; - - @Column(name="RESOURCE_JOB_MANAGER_ID", insertable=false, updatable=false) - private String resourceJobManagerId; - - @Column(name="COMMAND_TYPE") - private String commandType; - - public ParallelismCommandPK() { - } - public String getResourceJobManagerId() { - return this.resourceJobManagerId; - } - public void setResourceJobManagerId(String resourceJobManagerId) { - this.resourceJobManagerId = resourceJobManagerId; - } - public String getCommandType() { - return this.commandType; - } - public void setCommandType(String commandType) { - this.commandType = commandType; - } - - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof ParallelismCommandPK)) { - return false; - } - ParallelismCommandPK castOther = (ParallelismCommandPK)other; - return - this.resourceJobManagerId.equals(castOther.resourceJobManagerId) - && this.commandType.equals(castOther.commandType); - } - - public int hashCode() { - final int prime = 31; - int hash = 17; - hash = hash * prime + this.resourceJobManagerId.hashCode(); - hash = hash * prime + this.commandType.hashCode(); - - return hash; - } + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name = "RESOURCE_JOB_MANAGER_ID", insertable = false, updatable = false) + private String resourceJobManagerId; + + @Column(name = "COMMAND_TYPE") + private String commandType; + + public ParallelismCommandPK() { + } + + public String getResourceJobManagerId() { + return resourceJobManagerId; + } + + public void setResourceJobManagerId(String resourceJobManagerId) { + this.resourceJobManagerId = resourceJobManagerId; + } + + public String getCommandType() { + return commandType; + } + + public void setCommandType(String commandType) { + this.commandType = commandType; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof ParallelismCommandPK)) { + return false; + } + ParallelismCommandPK castOther = (ParallelismCommandPK) other; + return + this.resourceJobManagerId.equals(castOther.resourceJobManagerId) + && this.commandType.equals(castOther.commandType); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.resourceJobManagerId.hashCode(); + hash = hash * prime + this.commandType.hashCode(); + + return hash; + } } \ No newline at end of file diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java index 40ae839..3f10311 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java @@ -9,14 +9,14 @@ import javax.persistence.*; */ @Entity @Table(name = "postjob_command") -public class PostjobCommand implements Serializable { +public class PostjobCommandEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId private PostjobCommandPK id; - public PostjobCommand() { + public PostjobCommandEntity() { } public PostjobCommandPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandPK.java index eefd082..da5a1a7 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandPK.java @@ -1,59 +1,58 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; /** * The primary key class for the postjob_command database table. - * */ @Embeddable public class PostjobCommandPK implements Serializable { - // default serial version id, required for serializable classes. - private static final long serialVersionUID = 1L; - - @Column(name = "APPDEPLOYMENT_ID", insertable = false, updatable = false) - private String appdeploymentId; - - private String command; - - @Column(name = "COMMAND") - public PostjobCommandPK() { - } - - public String getAppdeploymentId() { - return this.appdeploymentId; - } - - public void setAppdeploymentId(String appdeploymentId) { - this.appdeploymentId = appdeploymentId; - } - - public String getCommand() { - return this.command; - } - - public void setCommand(String command) { - this.command = command; - } - - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof PostjobCommandPK)) { - return false; - } - PostjobCommandPK castOther = (PostjobCommandPK) other; - return this.appdeploymentId.equals(castOther.appdeploymentId) && this.command.equals(castOther.command); - } - - public int hashCode() { - final int prime = 31; - int hash = 17; - hash = hash * prime + this.appdeploymentId.hashCode(); - hash = hash * prime + this.command.hashCode(); - - return hash; - } + // default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name = "APPDEPLOYMENT_ID", insertable = false, updatable = false) + private String appdeploymentId; + + @Column(name = "COMMAND") + private String command; + + public PostjobCommandPK() { + } + + public String getAppdeploymentId() { + return appdeploymentId; + } + + public void setAppdeploymentId(String appdeploymentId) { + this.appdeploymentId = appdeploymentId; + } + + public String getCommand() { + return command; + } + + public void setCommand(String command) { + this.command = command; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof PostjobCommandPK)) { + return false; + } + PostjobCommandPK castOther = (PostjobCommandPK) other; + return this.appdeploymentId.equals(castOther.appdeploymentId) && this.command.equals(castOther.command); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.appdeploymentId.hashCode(); + hash = hash * prime + this.command.hashCode(); + + return hash; + } } \ No newline at end of file diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java index f223bed..fc8b803 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java @@ -9,15 +9,14 @@ import javax.persistence.*; */ @Entity @Table(name = "prejob_command") -@NamedQuery(name = "PrejobCommand.findAll", query = "SELECT p FROM PrejobCommand p") -public class PrejobCommand implements Serializable { +public class PrejobCommandEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId private PrejobCommandPK id; - public PrejobCommand() { + public PrejobCommandEntity() { } public PrejobCommandPK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandPK.java index 8bd3994..1eca9d3 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandPK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandPK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -15,19 +15,24 @@ public class PrejobCommandPK implements Serializable { @Column(name="APPDEPLOYMENT_ID", insertable=false, updatable=false) private String appdeploymentId; + @Column(name="COMMAND") private String command; public PrejobCommandPK() { } + public String getAppdeploymentId() { - return this.appdeploymentId; + return appdeploymentId; } + public void setAppdeploymentId(String appdeploymentId) { this.appdeploymentId = appdeploymentId; } + public String getCommand() { - return this.command; + return command; } + public void setCommand(String command) { this.command = command; } 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 141f29f..5c999ea 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 @@ -10,7 +10,7 @@ import java.util.List; */ @Entity @Table(name = "resource_job_manager") -public class ResourceJobManager implements Serializable { +public class ResourceJobManagerEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -32,7 +32,7 @@ public class ResourceJobManager implements Serializable { @Column(name = "UPDATE_TIME") private Timestamp updateTime; - public ResourceJobManager() { + public ResourceJobManagerEntity() { } public String getResourceJobManagerId() { 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 1746119..de80e69 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 @@ -10,7 +10,7 @@ import java.sql.Timestamp; */ @Entity @Table(name = "scp_data_movement") -public class ScpDataMovement implements Serializable { +public class ScpDataMovementEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -35,7 +35,7 @@ public class ScpDataMovement implements Serializable { @Column(name = "UPDATE_TIME") private Timestamp updateTime; - public ScpDataMovement() { + public ScpDataMovementEntity() { } public String getDataMovementInterfaceId() { 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 d2c8e16..0ed8607 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 @@ -11,7 +11,7 @@ import java.sql.Timestamp; */ @Entity @Table(name="ssh_job_submission") -public class SshJobSubmission implements Serializable { +public class SshJobSubmissionEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -39,7 +39,7 @@ public class SshJobSubmission implements Serializable { @Column(name="RESOURCE_JOB_MANAGER_ID") private String resourceJobManagerId; - public SshJobSubmission() { + public SshJobSubmissionEntity() { } public String getJobSubmissionInterfaceId() { 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 5b1c63f..a1ad646 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 @@ -9,8 +9,7 @@ import java.sql.Timestamp; */ @Entity @Table(name = "storage_interface") -@NamedQuery(name = "StorageInterface.findAll", query = "SELECT s FROM StorageInterface s") -public class StorageInterface implements Serializable { +public class StorageInterfaceEntity implements Serializable { private static final long serialVersionUID = 1L; @EmbeddedId @@ -28,7 +27,7 @@ public class StorageInterface implements Serializable { @Column(name = "UPDATE_TIME") private Timestamp updateTime; - public StorageInterface() { + public StorageInterfaceEntity() { } public StorageInterfacePK getId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfacePK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfacePK.java index e2f10cf..5a9bcb1 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfacePK.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageInterfacePK.java @@ -1,4 +1,4 @@ -package appcatlog; +package org.apache.airavata.registry.core.entities.appcatalog; import java.io.Serializable; import javax.persistence.*; @@ -20,15 +20,19 @@ public class StorageInterfacePK implements Serializable { public StorageInterfacePK() { } + public String getStorageResourceId() { - return this.storageResourceId; + return storageResourceId; } + public void setStorageResourceId(String storageResourceId) { this.storageResourceId = storageResourceId; } + public String getDataMovementInterfaceId() { - return this.dataMovementInterfaceId; + return dataMovementInterfaceId; } + public void setDataMovementInterfaceId(String dataMovementInterfaceId) { this.dataMovementInterfaceId = dataMovementInterfaceId; } diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java index b423ef4..a9ad6d2 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/StorageResourceEntity.java @@ -10,7 +10,7 @@ import java.util.List; */ @Entity @Table(name = "storage_resource") -public class StorageResource implements Serializable { +public class StorageResourceEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -30,7 +30,7 @@ public class StorageResource implements Serializable { @Column(name = "UPDATE_TIME") private Timestamp updateTime; - public StorageResource() { + public StorageResourceEntity() { } public String getStorageResourceId() { 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 6e01ba3..74a038c 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 @@ -10,7 +10,7 @@ import javax.persistence.*; */ @Entity @Table(name="unicore_datamovement") -public class UnicoreDatamovement implements Serializable { +public class UnicoreDatamovementEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -23,7 +23,7 @@ public class UnicoreDatamovement implements Serializable { @Column(name="UNICORE_ENDPOINT_URL") private String unicoreEndpointUrl; - public UnicoreDatamovement() { + public UnicoreDatamovementEntity() { } public String getDatamovementId() { 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 6ccc0bd..303a512 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 @@ -10,7 +10,7 @@ import javax.persistence.*; */ @Entity @Table(name="unicore_submission") -public class UnicoreSubmission implements Serializable { +public class UnicoreSubmissionEntity implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -23,7 +23,7 @@ public class UnicoreSubmission implements Serializable { @Column(name="UNICORE_ENDPOINT_URL") private String unicoreEndpointUrl; - public UnicoreSubmission() { + public UnicoreSubmissionEntity() { } public String getSubmissionId() { diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java index d1d8c46..f526be1 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workflowcatalog/WorkflowEntity.java @@ -10,6 +10,7 @@ import java.util.List; * The persistent class for the workflow database table. */ @Entity +@Table(name="workflow") public class WorkflowEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -20,7 +21,8 @@ public class WorkflowEntity implements Serializable { @Column(name = "CREATED_USER") private String createdUser; - @Column(name = "CREATION_TIME") + @Column(name = "CREATION_TIME", insertable = false, updatable = false) + @Temporal(TemporalType.TIMESTAMP) private Timestamp creationTime; @Column(name = "GATEWAY_ID") @@ -30,14 +32,13 @@ public class WorkflowEntity implements Serializable { private String graph; @Column(name = "IMAGE") - @Lob private byte[] image; @Column(name = "UPDATE_TIME") private Timestamp updateTime; @Column(name = "WORKFLOW_NAME") - private String workflowName; + private String name; public WorkflowEntity() { @@ -113,15 +114,11 @@ public class WorkflowEntity implements Serializable { this.updateTime = updateTime; } - public String getWorkflowName() { - - return this.workflowName; + public String getName() { + return name; } - public void setWorkflowName(String workflowName) { - - this.workflowName = workflowName; + public void setName(String name) { + this.name = name; } - - } \ No newline at end of file diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java new file mode 100644 index 0000000..bc3a9da --- /dev/null +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java @@ -0,0 +1,78 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ +package org.apache.airavata.registry.core.repositories; + +import org.apache.airavata.registry.core.utils.JPAUtils; +import org.apache.airavata.registry.core.utils.ObjectMapperSingleton; +import org.dozer.Mapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; + +public abstract class AbstractRepository<T, E, Id> { + private final static Logger logger = LoggerFactory.getLogger(AbstractRepository.class); + + private Class<T> thriftGenericClass; + private Class<E> dbEntityGenericClass; + + public AbstractRepository(Class<T> thriftGenericClass, Class<E> dbEntityGenericClass){ + this.thriftGenericClass = thriftGenericClass; + this.dbEntityGenericClass = dbEntityGenericClass; + } + + public T create(T t){ + return update(t); + } + + public T update(T t){ + Mapper mapper = ObjectMapperSingleton.getInstance(); + E entity = mapper.map(t, dbEntityGenericClass); + E persistedCopy = JPAUtils.execute(entityManager -> entityManager.merge(entity)); + return mapper.map(persistedCopy, thriftGenericClass); + } + + public boolean delete(Id id){ + JPAUtils.execute(entityManager -> { + E entity = entityManager.find(dbEntityGenericClass, id); + entityManager.remove(entity); + return entity; + }); + return true; + } + + public T get(Id id){ + E entity = JPAUtils.execute(entityManager -> entityManager + .find(dbEntityGenericClass, id)); + Mapper mapper = ObjectMapperSingleton.getInstance(); + return mapper.map(entity, thriftGenericClass); + } + + public List<T> select(String query, int limit, int offset){ + List resultSet = (List) JPAUtils.execute(entityManager -> entityManager.createQuery(query).setFirstResult(offset) + .setMaxResults(offset).getResultList()); + Mapper mapper = ObjectMapperSingleton.getInstance(); + List<T> gatewayList = new ArrayList<>(); + resultSet.stream().forEach(rs -> gatewayList.add(mapper.map(rs, thriftGenericClass))); + return gatewayList; + } +} \ No newline at end of file diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/GatewayRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/GatewayRepository.java new file mode 100644 index 0000000..9a1c6d6 --- /dev/null +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/GatewayRepository.java @@ -0,0 +1,36 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ +package org.apache.airavata.registry.core.repositories.workspacecatalog; + +import org.apache.airavata.model.workspace.Gateway; +import org.apache.airavata.registry.core.entities.workspacecatalog.GatewayEntity; +import org.apache.airavata.registry.core.repositories.AbstractRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class GatewayRepository extends AbstractRepository<Gateway, GatewayEntity, String> { + private final static Logger logger = LoggerFactory.getLogger(GatewayRepository.class); + + public GatewayRepository(Class<Gateway> thriftGenericClass, Class<GatewayEntity> dbEntityGenericClass) { + super(thriftGenericClass, dbEntityGenericClass); + + } +} \ No newline at end of file diff --git a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000..ddc99ef --- /dev/null +++ b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<!--* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +* --> +<persistence xmlns="http://java.sun.com/xml/ns/persistence"; version="2.0"> + <persistence-unit name="airavata_catalog"> + <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> + <class>org.apache.airavata.registry.core.entities.workspacecatalog.GatewayEntity</class> + <class>org.apache.airavata.registry.core.entities.workspacecatalog.UserProfileEntity</class> + <class>org.apache.airavata.registry.core.entities.workspacecatalog.NSFDemographicsEntity</class> + <class>org.apache.airavata.registry.core.entities.workspacecatalog.NotificationEntity</class> + <class>org.apache.airavata.registry.core.entities.workspacecatalog.ProjectEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ComputeResourceSchedulingEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentErrorEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentInputEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentOutputEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentStatusEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.UserConfigurationEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessErrorEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessInputEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessOutputEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessResourceSchedulingEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessStatusEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.TaskEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.TaskErrorEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.TaskStatusEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.JobEntity</class> + <class>org.apache.airavata.registry.core.entities.expcatalog.JobStatusEntity</class> + + <class>org.apache.airavata.registry.core.entities.workflowcatalog.WorkflowEntity</class> + <class>org.apache.airavata.registry.core.entities.workflowcatalog.EdgeEntity</class> + <class>org.apache.airavata.registry.core.entities.workflowcatalog.ComponentStatusEntity</class> + <class>org.apache.airavata.registry.core.entities.workflowcatalog.NodeEntity</class> + <class>org.apache.airavata.registry.core.entities.workflowcatalog.PortEntity</class> + <class>org.apache.airavata.registry.core.entities.workflowcatalog.WorkflowInputEntity</class> + <class>org.apache.airavata.registry.core.entities.workflowcatalog.WorkflowOutputEntity</class> + <class>org.apache.airavata.registry.core.entities.workflowcatalog.WorkflowStatusEntity</class> + + + + + + + + <exclude-unlisted-classes>true</exclude-unlisted-classes> + </persistence-unit> +</persistence> diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/RepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/RepositoryTest.java index ec1e4a0..bc61bbb 100644 --- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/RepositoryTest.java +++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/RepositoryTest.java @@ -20,6 +20,7 @@ */ package org.apache.airavata.registry.core.repositories; +import org.apache.airavata.model.WorkflowModel; import org.apache.airavata.model.experiment.ExperimentModel; import org.apache.airavata.model.experiment.UserConfigurationDataModel; import org.apache.airavata.model.user.NSFDemographics; @@ -29,11 +30,13 @@ import org.apache.airavata.model.workspace.GatewayApprovalStatus; import org.apache.airavata.model.workspace.Notification; import org.apache.airavata.model.workspace.Project; import org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity; +import org.apache.airavata.registry.core.entities.workflowcatalog.WorkflowEntity; import org.apache.airavata.registry.core.entities.workspacecatalog.GatewayEntity; import org.apache.airavata.registry.core.entities.workspacecatalog.NotificationEntity; import org.apache.airavata.registry.core.entities.workspacecatalog.ProjectEntity; import org.apache.airavata.registry.core.entities.workspacecatalog.UserProfileEntity; import org.apache.airavata.registry.core.repositories.expcatalog.ExperimentRepository; +import org.apache.airavata.registry.core.repositories.workflowcatalog.WorkflowRepository; import org.apache.airavata.registry.core.repositories.workspacecatalog.GatewayRepository; import org.apache.airavata.registry.core.repositories.workspacecatalog.NotificationRepository; import org.apache.airavata.registry.core.repositories.workspacecatalog.ProjectRepository; @@ -57,11 +60,13 @@ public class RepositoryTest { private UserProfileRepository userProfileRepository; private ProjectRepository projectRepository; private ExperimentRepository experimentRepository; + private WorkflowRepository workflowRepository; private String gatewayId; private String notificationId; private String userId; private String projectId; private String experimentId; + private String templateId; private final String GATEWAY_DOMAIN = "test1.com"; private final String NOTIFY_MESSAGE = "NotifyMe"; @@ -69,6 +74,8 @@ public class RepositoryTest { private final String PROJECT_DESCRIPTION = "Test Description"; private final String EXPERIMENT_NAME = "sample experiment"; private final String EXPERIMENT_DESCRIPTION = "sample description"; + private final String WORKFLOW_NAME = "test Workflow"; + @Before public void setupRepository() { @@ -79,12 +86,14 @@ public class RepositoryTest { userProfileRepository = new UserProfileRepository(UserProfile.class, UserProfileEntity.class); projectRepository = new ProjectRepository(Project.class, ProjectEntity.class); experimentRepository = new ExperimentRepository(ExperimentModel.class, ExperimentEntity.class); + workflowRepository = new WorkflowRepository(WorkflowModel.class, WorkflowEntity.class); gatewayId = "test.com" + System.currentTimeMillis(); notificationId = UUID.randomUUID().toString(); userId = "testuser" + System.currentTimeMillis(); projectId = "project" + System.currentTimeMillis(); experimentId = "exp" + System.currentTimeMillis(); + templateId = "templateId" + System.currentTimeMillis(); } @@ -381,4 +390,80 @@ public class RepositoryTest { } + + + @Test + public void workflowRepositoryTest() { + + + System.out.println(); + /* + * Creating Gateway required for UserProfile & Workflow creation + */ + Gateway gateway = new Gateway(); + gateway.setGatewayApprovalStatus(GatewayApprovalStatus.ACTIVE); + gateway.setGatewayId(gatewayId); + gateway.setDomain(GATEWAY_DOMAIN); + gateway = gatewayRepository.create(gateway); + Assert.assertTrue(!gateway.getGatewayId().isEmpty()); + + /* + * UserProfile Instance creation required for Workflow Creation + */ + UserProfile userProfile = new UserProfile(); + userProfile.setAiravataInternalUserId(userId); + userProfile.setGatewayId(gateway.getGatewayId()); + userProfile = userProfileRepository.create(userProfile); + Assert.assertTrue(!userProfile.getAiravataInternalUserId().isEmpty()); + + /* + * Workflow Instance Creation + */ + + WorkflowModel workflowModel = new WorkflowModel(); + workflowModel.setTemplateId(templateId); + workflowModel.setCreatedUser(userId); + workflowModel.setGatewayId(gatewayId); + workflowModel.setName(WORKFLOW_NAME); + + + /* + * Workflow Repository Insert Operation Test + */ + workflowModel = workflowRepository.create(workflowModel); + Assert.assertTrue(!workflowModel.getTemplateId().isEmpty()); + + + + + /* + * Workflow Repository Update Operation Test + */ + workflowModel.setGraph("test"); + workflowRepository.update(workflowModel); + workflowModel = workflowRepository.get(templateId); + Assert.assertEquals(workflowModel.getGraph(), "test"); + + /* + * Workflow Repository Select Operation Test + */ + workflowModel = null; + workflowModel = workflowRepository.get(templateId); + Assert.assertNotNull(workflowModel); + + /* + * Workflow Repository Delete Operation + */ + + boolean deleteResult = workflowRepository.delete(templateId); + Assert.assertTrue(deleteResult); + + deleteResult = userProfileRepository.delete(userId); + Assert.assertTrue(deleteResult); + + deleteResult = gatewayRepository.delete(gatewayId); + Assert.assertTrue(deleteResult); + + + } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
