You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/08/07 19:29:15 UTC
[airavata] branch staging updated: AIRAVATA-3124 Fix JPA mapping of
SshJobSubmissionEntity
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/staging by this push:
new 3800ea2 AIRAVATA-3124 Fix JPA mapping of SshJobSubmissionEntity
3800ea2 is described below
commit 3800ea2e1f0dc3dae6b6322aa16638fc74e69378
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Aug 7 15:29:04 2019 -0400
AIRAVATA-3124 Fix JPA mapping of SshJobSubmissionEntity
---
.../entities/appcatalog/ResourceJobManagerEntity.java | 4 ++--
.../entities/appcatalog/SshJobSubmissionEntity.java | 17 +++--------------
.../appcatalog/ComputeResourceRepository.java | 1 -
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
index ee2ca9a..681d420 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
@@ -38,7 +38,7 @@ public class ResourceJobManagerEntity implements Serializable {
@Column(name = "RESOURCE_JOB_MANAGER_ID")
private String resourceJobManagerId;
- @Column(name = "CREATION_TIME")
+ @Column(name = "CREATION_TIME", nullable = false, updatable = false)
private Timestamp creationTime;
@Column(name = "JOB_MANAGER_BIN_PATH")
@@ -104,4 +104,4 @@ public class ResourceJobManagerEntity implements Serializable {
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
-}
\ No newline at end of file
+}
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
index 8070af7..c8f8ea8 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
@@ -41,13 +41,13 @@ public class SshJobSubmissionEntity implements Serializable {
private String jobSubmissionInterfaceId;
@ManyToOne(cascade= CascadeType.MERGE)
- @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID")
+ @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID", nullable = false, updatable = false)
private ResourceJobManagerEntity resourceJobManager;
@Column(name="ALTERNATIVE_SSH_HOSTNAME")
private String alternativeSshHostname;
- @Column(name="CREATION_TIME")
+ @Column(name="CREATION_TIME", nullable = false, updatable = false)
private Timestamp creationTime;
@Column(name="MONITOR_MODE")
@@ -63,9 +63,6 @@ public class SshJobSubmissionEntity implements Serializable {
@Column(name="UPDATE_TIME")
private Timestamp updateTime;
- @Column(name="RESOURCE_JOB_MANAGER_ID")
- private String resourceJobManagerId;
-
public SshJobSubmissionEntity() {
}
@@ -125,14 +122,6 @@ public class SshJobSubmissionEntity implements Serializable {
this.updateTime = updateTime;
}
- public String getResourceJobManagerId() {
- return resourceJobManagerId;
- }
-
- public void setResourceJobManagerId(String resourceJobManagerId) {
- this.resourceJobManagerId = resourceJobManagerId;
- }
-
public ResourceJobManagerEntity getResourceJobManager() {
return resourceJobManager;
}
@@ -140,4 +129,4 @@ public class SshJobSubmissionEntity implements Serializable {
public void setResourceJobManager(ResourceJobManagerEntity resourceJobManager) {
this.resourceJobManager = resourceJobManager;
}
-}
\ No newline at end of file
+}
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepository.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepository.java
index ca2696c..fc86785 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepository.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepository.java
@@ -230,7 +230,6 @@ public class ComputeResourceRepository extends AppCatAbstractRepository<ComputeR
String resourceJobManagerId = addResourceJobManager(sshJobSubmission.getResourceJobManager());
Mapper mapper = ObjectMapperSingleton.getInstance();
SshJobSubmissionEntity sshJobSubmissionEntity = mapper.map(sshJobSubmission, SshJobSubmissionEntity.class);
- sshJobSubmissionEntity.setResourceJobManagerId(resourceJobManagerId);
sshJobSubmissionEntity.getResourceJobManager().setResourceJobManagerId(resourceJobManagerId);
if (sshJobSubmission.getResourceJobManager().getParallelismPrefix() != null) {
(new ResourceJobManagerRepository()).createParallesimPrefix(sshJobSubmission.getResourceJobManager().getParallelismPrefix(), sshJobSubmissionEntity.getResourceJobManager());