[airavata] branch develop updated: AIRAVATA-2939 Don't merge referenced entities on app module mapping

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 079bbbc  AIRAVATA-2939 Don't merge referenced entities on app module mapping
079bbbc is described below

commit 079bbbca457b7d9c49e54a75235943d5d1d0459d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Nov 12 09:34:04 2018 -0500

    AIRAVATA-2939 Don't merge referenced entities on app module mapping
---
 .../registry/core/entities/appcatalog/AppModuleMappingEntity.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 eea5310..c805b48 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
@@ -42,11 +42,11 @@ public class AppModuleMappingEntity implements Serializable {
 	@Column(name="MODULE_ID")
 	private String moduleId;
 
-	@ManyToOne(targetEntity = ApplicationInterfaceEntity.class, cascade = CascadeType.MERGE)
+	@ManyToOne(targetEntity = ApplicationInterfaceEntity.class)
 	@JoinColumn(name = "INTERFACE_ID")
 	private ApplicationInterfaceEntity applicationInterface;
 
-	@ManyToOne(targetEntity = ApplicationModuleEntity.class, cascade = CascadeType.MERGE)
+	@ManyToOne(targetEntity = ApplicationModuleEntity.class)
 	@JoinColumn(name = "MODULE_ID")
 	private ApplicationModuleEntity applicationModule;