Merge "RoleApp class DB constraints"

1 files changed, 7 insertions, 76 deletions

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/RoleApp.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/RoleApp.java
index d4ca5457..cf3e06b9 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/RoleApp.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/RoleApp.java
@@ -39,90 +39,21 @@ package org.onap.portalapp.portal.domain;
 
 import java.io.Serializable;
 import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-//@Entity
-//@Table(name = "FN_ROLE")
+@Getter
+@Setter
 public class RoleApp implements Serializable{
 	private static final long serialVersionUID = 1L;
 
-	//@Id
-	//@Column(name = "ROLE_ID")
-	//@GeneratedValue(strategy=GenerationType.AUTO)
 	private Long roleId;
-	
-	
-	//@Column(name = "ROLE_Name")
-	private String roleName;
-	
-	//@ManyToOne(fetch = FetchType.EAGER)
-	//@JoinColumn(name="APP_ID")
-	private App app;
-	
-	//@JsonIgnore
-	//@ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}, mappedBy="widgetRoles")
-	private Set<WidgetCatalog> widgets;
-
-	/*@PreRemove
-	private void removeGroupsFromUsers() {
-	    for (WidgetCatalog w : widgets) {
-	        w.getWidgetRoles().remove(this);
-	    }
-	}*/
-	
-	/*@ManyToOne
-	@JoinColumn(name = "WIDGET_ID", nullable = false)
-	WidgetCatalog widgetCatalog;*/
-
-	//@JsonIgnore
-	//@ManyToMany(mappedBy = "widgetRoles")
-	//@ManyToMany(fetch = FetchType.EAGER, mappedBy = "widgetRoles")
-	//private Set<WidgetCatalog> widgets  = new HashSet<WidgetCatalog>();
-	
-	public Long getRoleId() {
-		return roleId;
-	}
-
-	public void setRoleId(Long roleId) {
-		this.roleId = roleId;
-	}
-
-	public String getRoleName() {
-		return roleName;
-	}
-
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
-
-	public App getApp() {
-		return app;
-	}
 
-	public void setApp(App app) {
-		this.app = app;
-	}
-	
-	
+	private String roleName;
 
-	public Set<WidgetCatalog> getWidgets() {
-		return widgets;
-	}
+	private App app;
 
-	public void setWidgets(Set<WidgetCatalog> widgets) {
-		this.widgets = widgets;
-	}
+	private Set<WidgetCatalog> widgets;
 
 	@Override
 	public String toString() {