Merge "Reduce number of parameters"

8 files changed, 336 insertions, 272 deletions

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
index ad164721..e2dd6588 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
@@ -46,10 +46,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import javax.validation.ConstraintViolation;
 import javax.validation.Valid;
 import javax.validation.Validation;
@@ -101,7 +99,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
-
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -333,7 +330,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 							if (existRole.getName().equalsIgnoreCase(role.getName()))
 								throw new DuplicateRecordException("Role already exists: " + existRole.getName());
 
-						domainRole = new CentralV2Role();
+                        domainRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 						domainRole.setName(role.getName());
 						domainRole.setPriority(role.getPriority());
 						domainRole.setActive(role.getActive());
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
index 3778a00f..9784356c 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
@@ -1229,11 +1229,14 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
 						} else {
 							userRoleId = userApp.getRole().getAppRoleId();
 						}
-						CentralV2Role cenRole = new CentralV2Role(userRoleId, userApp.getRole().getCreated(),
-								userApp.getRole().getModified(), userApp.getRole().getCreatedId(),
-								userApp.getRole().getModifiedId(), userApp.getRole().getRowNum(),
-								userApp.getRole().getName(), userApp.getRole().getActive(),
-								userApp.getRole().getPriority(), roleFunctionSet, null, null);
+                        CentralV2Role cenRole = new CentralV2Role.CentralV2RoleBuilder().setId(userRoleId)
+                                .setCreated(userApp.getRole().getCreated()).setModified(userApp.getRole().getModified())
+                                .setCreatedId(userApp.getRole().getCreatedId())
+                                .setModifiedId(userApp.getRole().getModifiedId())
+                                .setRowNum(userApp.getRole().getRowNum()).setName(userApp.getRole().getName())
+                                .setActive(userApp.getRole().getActive()).setPriority(userApp.getRole().getPriority())
+                                .setRoleFunctions(roleFunctionSet).setChildRoles(null).setParentRoles(null)
+                                .createCentralV2Role();
 						cua.setRole(cenRole);
 						userAppList.getUserApps().add(cua);
 					}
@@ -1276,7 +1279,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
 	public CentralV2Role getRoleInfo(Long roleId, String uebkey) throws Exception {
 		final Map<String, Long> params = new HashMap<>();
 		List<CentralV2Role> roleList = new ArrayList<>();
-		CentralV2Role cenRole = new CentralV2Role();
+        CentralV2Role cenRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		List<EPRole> roleInfo = null;
 		List<EPApp> app = null;
 		try {
@@ -1368,15 +1371,19 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
 			SortedSet<CentralV2Role> childRoles = new TreeSet<>();
 			SortedSet<CentralV2Role> parentRoles = new TreeSet<>();
 			CentralV2Role cenRole = null;
-			if (role.getAppRoleId() == null) {
-				cenRole = new CentralV2Role(role.getId(), role.getCreated(), role.getModified(), role.getCreatedId(),
-						role.getModifiedId(), role.getRowNum(), role.getName(), role.getActive(), role.getPriority(),
-						roleFunctionSet, childRoles, parentRoles);
-			} else {
-				cenRole = new CentralV2Role(role.getAppRoleId(), role.getCreated(), role.getModified(),
-						role.getCreatedId(), role.getModifiedId(), role.getRowNum(), role.getName(), role.getActive(),
-						role.getPriority(), roleFunctionSet, childRoles, parentRoles);
-			}
+            if (role.getAppRoleId() == null) {
+                cenRole = new CentralV2Role.CentralV2RoleBuilder().setId(role.getId()).setCreated(role.getCreated())
+                        .setModified(role.getModified()).setCreatedId(role.getCreatedId())
+                        .setModifiedId(role.getModifiedId()).setRowNum(role.getRowNum()).setName(role.getName())
+                        .setActive(role.getActive()).setPriority(role.getPriority()).setRoleFunctions(roleFunctionSet)
+                        .setChildRoles(childRoles).setParentRoles(parentRoles).createCentralV2Role();
+            } else {
+                cenRole = new CentralV2Role.CentralV2RoleBuilder().setId(role.getAppRoleId())
+                        .setCreated(role.getCreated()).setModified(role.getModified()).setCreatedId(role.getCreatedId())
+                        .setModifiedId(role.getModifiedId()).setRowNum(role.getRowNum()).setName(role.getName())
+                        .setActive(role.getActive()).setPriority(role.getPriority()).setRoleFunctions(roleFunctionSet)
+                        .setChildRoles(childRoles).setParentRoles(parentRoles).createCentralV2Role();
+            }
 			roleList.add(cenRole);
 		}
 		return roleList;
@@ -3289,7 +3296,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
 				}
 			}
 			if (!found) {
-				CentralV2Role cenrole = new CentralV2Role();
+				CentralV2Role cenrole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 				cenrole.setName(role.getRoleName());
 				cenrole.setId(role.getRoleId());
 				cenrole.setActive(role.isActive());
@@ -3336,9 +3343,11 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
 	}
 
 	private CentralV2Role convertRoleToCentralV2Role(EPRole role) {
-		return new CentralV2Role(role.getId(), role.getCreated(), role.getModified(), role.getCreatedId(),
-				role.getModifiedId(), role.getRowNum(), role.getName(), role.getActive(), role.getPriority(),
-				new TreeSet<>(), new TreeSet<>(), new TreeSet<>());
+        return new CentralV2Role.CentralV2RoleBuilder().setId(role.getId()).setCreated(role.getCreated())
+                .setModified(role.getModified()).setCreatedId(role.getCreatedId()).setModifiedId(role.getModifiedId())
+                .setRowNum(role.getRowNum()).setName(role.getName()).setActive(role.getActive())
+                .setPriority(role.getPriority()).setRoleFunctions(new TreeSet<>()).setChildRoles(new TreeSet<>())
+                .setParentRoles(new TreeSet<>()).createCentralV2Role();
 	}
 
 	@Override
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2Role.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2Role.java
index 54ce4f33..da084f5f 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2Role.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2Role.java
@@ -41,206 +41,282 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.SortedSet;
 import java.util.TreeSet;
-
 import org.onap.portalapp.portal.domain.CentralV2RoleFunction;
 
 @SuppressWarnings("rawtypes")
-public class CentralV2Role implements Serializable, Comparable{
-		/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4332644961113063714L;
-		private Long id;
-		private Date created;
-		private Date modified;
-		private Long createdId;
-		private Long modifiedId;
-		private Long rowNum;
-		
-	    private String  name;
-	    private boolean active;
-	    private Integer priority;
-	    
-        private SortedSet<CentralV2RoleFunction> roleFunctions = new TreeSet<>();
-	    
-	    private SortedSet<CentralV2Role> childRoles = new TreeSet<>();
-
-	    private SortedSet<CentralV2Role> parentRoles = new TreeSet<>();
-
-		public CentralV2Role(Long id, Date created, Date modified, Long createdId, Long modifiedId, Long rowNum,
-				String name, boolean active, Integer priority, SortedSet<CentralV2RoleFunction> roleFunctions,
-				SortedSet<CentralV2Role> childRoles, SortedSet<CentralV2Role> parentRoles) {
-			super();
-			this.id = id;
-			this.created = created;
-			this.modified = modified;
-			this.createdId = createdId;
-			this.modifiedId = modifiedId;
-			this.rowNum = rowNum;
-			this.name = name;
-			this.active = active;
-			this.priority = priority;
-			this.roleFunctions = roleFunctions;
-			this.childRoles = childRoles;
-			this.parentRoles = parentRoles;
-		}
-		
-		public CentralV2Role(){
-			
-		}
-		
-		public CentralV2Role(Long id, String name){
-			this.id = id;
-			this.name = name;
-		}
-
-		public Long getId() {
-			return id;
-		}
-
-		public void setId(Long id) {
-			this.id = id;
-		}
-
-		public Date getCreated() {
-			return created;
-		}
-
-		public void setCreated(Date created) {
-			this.created = created;
-		}
-
-		public Date getModified() {
-			return modified;
-		}
-
-		public void setModified(Date modified) {
-			this.modified = modified;
-		}
-
-		public Long getCreatedId() {
-			return createdId;
-		}
-
-		public void setCreatedId(Long createdId) {
-			this.createdId = createdId;
-		}
-
-		public Long getModifiedId() {
-			return modifiedId;
-		}
-
-		public void setModifiedId(Long modifiedId) {
-			this.modifiedId = modifiedId;
-		}
-
-		public Long getRowNum() {
-			return rowNum;
-		}
-
-		public void setRowNum(Long rowNum) {
-			this.rowNum = rowNum;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public boolean getActive() {
-			return active;
-		}
-
-		public void setActive(boolean active) {
-			this.active = active;
-		}
-
-		public Integer getPriority() {
-			return priority;
-		}
-
-		public void setPriority(Integer priority) {
-			this.priority = priority;
-		}
-
-		public SortedSet<CentralV2RoleFunction> getRoleFunctions() {
-			return roleFunctions;
-		}
-
-		public void setRoleFunctions(SortedSet<CentralV2RoleFunction> roleFunctions) {
-			this.roleFunctions = roleFunctions;
-		}
-
-		public SortedSet<CentralV2Role> getChildRoles() {
-			return childRoles;
-		}
-
-		public void setChildRoles(SortedSet<CentralV2Role> childRoles) {
-			this.childRoles = childRoles;
-		}
-
-		public SortedSet<CentralV2Role> getParentRoles() {
-			return parentRoles;
-		}
-
-		public void setParentRoles(SortedSet<CentralV2Role> parentRoles) {
-			this.parentRoles = parentRoles;
-		}
-		public void addRoleFunction(CentralV2RoleFunction roleFunction) {
-			this.roleFunctions.add(roleFunction);
-		}
-
-		public void addChildRole(CentralV2Role role) {
-			this.childRoles.add(role);
-		}
-
-		public void addParentRole(CentralV2Role role) {
-			this.parentRoles.add(role);
-		}
-		
-		public int compareTo(Object obj){
-	    	CentralV2Role other = (CentralV2Role)obj;
-
-	    	String c1 = getName();
-	    	String c2 = other.getName();
-
-	    	return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2);
-	    }
-
-		@Override
-		public int hashCode() {
-			final int prime = 31;
-			int result = 1;
-			result = prime * result + ((id == null) ? 0 : id.hashCode());
-			result = prime * result + ((name == null) ? 0 : name.hashCode());
-			return result;
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			if (obj == null)
-				return false;
-			if (getClass() != obj.getClass())
-				return false;
-			CentralV2Role other = (CentralV2Role) obj;
-			if (id == null) {
-				if (other.id != null)
-					return false;
-			} else if (!id.equals(other.id))
-				return false;
-			if (name == null) {
-				if (other.name != null)
-					return false;
-			} else if (!name.equals(other.name))
-				return false;
-			return true;
-		}
-		
-		
-		
+public class CentralV2Role implements Serializable, Comparable {
+    /**
+    *
+    */
+    private static final long serialVersionUID = -4332644961113063714L;
+    private Long id;
+    private Date created;
+    private Date modified;
+    private Long createdId;
+    private Long modifiedId;
+    private Long rowNum;
+
+    private String name;
+    private boolean active;
+    private Integer priority;
+
+    private SortedSet<CentralV2RoleFunction> roleFunctions = new TreeSet<>();
+
+    private SortedSet<CentralV2Role> childRoles = new TreeSet<>();
+
+    private SortedSet<CentralV2Role> parentRoles = new TreeSet<>();
+
+    public CentralV2Role(CentralV2RoleBuilder builder) {
+        super();
+        this.id = builder.id;
+        this.created = builder.created;
+        this.modified = builder.modified;
+        this.createdId = builder.createdId;
+        this.modifiedId = builder.modifiedId;
+        this.rowNum = builder.rowNum;
+        this.name = builder.name;
+        this.active = builder.active;
+        this.priority = builder.priority;
+        this.roleFunctions = builder.roleFunctions;
+        this.childRoles = builder.childRoles;
+        this.parentRoles = builder.parentRoles;
+    }
+
+    public CentralV2Role() {
+
+    }
+
+    public CentralV2Role(Long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public static class CentralV2RoleBuilder {
+        private Long id;
+        private Date created;
+        private Date modified;
+        private Long createdId;
+        private Long modifiedId;
+        private Long rowNum;
+        private String name;
+        private boolean active;
+        private Integer priority;
+        private SortedSet<CentralV2RoleFunction> roleFunctions;
+        private SortedSet<CentralV2Role> childRoles;
+        private SortedSet<CentralV2Role> parentRoles;
+
+        public CentralV2RoleBuilder setId(Long id) {
+            this.id = id;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setCreated(Date created) {
+            this.created = created;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setModified(Date modified) {
+            this.modified = modified;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setCreatedId(Long createdId) {
+            this.createdId = createdId;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setModifiedId(Long modifiedId) {
+            this.modifiedId = modifiedId;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setRowNum(Long rowNum) {
+            this.rowNum = rowNum;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setActive(boolean active) {
+            this.active = active;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setPriority(Integer priority) {
+            this.priority = priority;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setRoleFunctions(SortedSet<CentralV2RoleFunction> roleFunctions) {
+            this.roleFunctions = roleFunctions;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setChildRoles(SortedSet<CentralV2Role> childRoles) {
+            this.childRoles = childRoles;
+            return this;
+        }
+
+        public CentralV2RoleBuilder setParentRoles(SortedSet<CentralV2Role> parentRoles) {
+            this.parentRoles = parentRoles;
+            return this;
+        }
+
+        public CentralV2Role createCentralV2Role() {
+            return new CentralV2Role(this);
+        }
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public Date getModified() {
+        return modified;
+    }
+
+    public void setModified(Date modified) {
+        this.modified = modified;
+    }
+
+    public Long getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(Long createdId) {
+        this.createdId = createdId;
+    }
+
+    public Long getModifiedId() {
+        return modifiedId;
+    }
+
+    public void setModifiedId(Long modifiedId) {
+        this.modifiedId = modifiedId;
+    }
+
+    public Long getRowNum() {
+        return rowNum;
+    }
+
+    public void setRowNum(Long rowNum) {
+        this.rowNum = rowNum;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean getActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public SortedSet<CentralV2RoleFunction> getRoleFunctions() {
+        return roleFunctions;
+    }
+
+    public void setRoleFunctions(SortedSet<CentralV2RoleFunction> roleFunctions) {
+        this.roleFunctions = roleFunctions;
+    }
+
+    public SortedSet<CentralV2Role> getChildRoles() {
+        return childRoles;
+    }
+
+    public void setChildRoles(SortedSet<CentralV2Role> childRoles) {
+        this.childRoles = childRoles;
+    }
+
+    public SortedSet<CentralV2Role> getParentRoles() {
+        return parentRoles;
+    }
+
+    public void setParentRoles(SortedSet<CentralV2Role> parentRoles) {
+        this.parentRoles = parentRoles;
+    }
+
+    public void addRoleFunction(CentralV2RoleFunction roleFunction) {
+        this.roleFunctions.add(roleFunction);
+    }
+
+    public void addChildRole(CentralV2Role role) {
+        this.childRoles.add(role);
+    }
+
+    public void addParentRole(CentralV2Role role) {
+        this.parentRoles.add(role);
+    }
+
+    public int compareTo(Object obj) {
+        CentralV2Role other = (CentralV2Role) obj;
+
+        String c1 = getName();
+        String c2 = other.getName();
+
+        return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2);
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        CentralV2Role other = (CentralV2Role) obj;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
index 3d30f9f5..6b06ee22 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
@@ -417,7 +417,7 @@ public class ExternalAccessRolesControllerTest {
 		CentralRole expectedCentralRole = null;
 		List<EPApp> applicationList = new ArrayList<>();
 		long roleId = 1;
-		CentralV2Role centralV2Role = new CentralV2Role();
+		CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
 		applicationList.add(app);
@@ -438,7 +438,7 @@ public class ExternalAccessRolesControllerTest {
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
 		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
-		CentralV2Role answer = new CentralV2Role();
+		CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		long roleId = 1;
 		Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
 				.thenReturn(answer);
@@ -461,11 +461,11 @@ public class ExternalAccessRolesControllerTest {
 
 	@Test
 	public void getV2RoleInfoValidationTest() throws Exception {
-		CentralV2Role expectedCentralRole = new CentralV2Role();
+		CentralV2Role expectedCentralRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		expectedCentralRole.setActive(false);
 		List<EPApp> applicationList = new ArrayList<>();
 		long roleId = 1;
-		CentralV2Role centralV2Role = new CentralV2Role();
+		CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		EPApp app = mockApp();
 		app.setCentralAuth(true);
 		applicationList.add(app);
@@ -486,7 +486,7 @@ public class ExternalAccessRolesControllerTest {
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
 		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
-		CentralV2Role answer = new CentralV2Role();
+		CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		long roleId = 1;
 		Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
 				.thenReturn(answer);
@@ -1286,7 +1286,7 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response);
 		Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
 		List<CentralV2Role> cenRoleList = new ArrayList<>();
-		CentralV2Role role = new CentralV2Role();
+		CentralV2Role role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		role.setName("test");
 		cenRoleList.add(role);
 		Mockito.when(externalAccessRolesService.getActiveRoles(mockedRequest.getHeader(uebKey))).thenReturn(null);
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java
index 9673cb2c..b004a4a1 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java
@@ -41,7 +41,6 @@ package org.onap.portalapp.portal.controller;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -55,10 +54,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.json.simple.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
@@ -96,7 +93,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.DelegatingServletInputStream;
 import org.springframework.web.servlet.ModelAndView;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -186,7 +182,7 @@ public class RoleManageControllerTest {
 		Mockito.when(externalAccessRolesService.getApp(CentralApp().getUebKey())).thenReturn(apps);
 		ResponseEntity<String> result = new ResponseEntity<>(HttpStatus.OK);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(apps.get(0))).thenReturn(result);
-		CentralV2Role answer = new CentralV2Role();
+		CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		Mockito.when(externalAccessRolesService.getRoleInfo((long) 1, "test")).thenReturn(answer);
 		List<CentralV2RoleFunction> finalRoleFunctionList = new ArrayList<>();
 		Mockito.when(externalAccessRolesService.getRoleFuncList("test")).thenReturn(finalRoleFunctionList);
@@ -205,7 +201,7 @@ public class RoleManageControllerTest {
 	@Test(expected = Exception.class)
 	public void getRoleExceptionTest() throws Exception {
 		Mockito.when(appService.getApp((long) 1)).thenReturn(mockApp());
-		CentralV2Role answer = new CentralV2Role();
+		CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		Mockito.when(externalAccessRolesService.getRoleInfo((long) 1, "test")).thenReturn(answer);
 		Mockito.when(externalAccessRolesService.getRoleFuncList("test")).thenThrow(nullPointerException);
 		roleManageController.getRole(mockedRequest, mockedResponse, (long) 1, null);
@@ -215,16 +211,16 @@ public class RoleManageControllerTest {
 	@Test
 	public void getRoleIfRoleIdNotNullTest() throws Exception {
 		Mockito.when(appService.getApp((long) 1)).thenReturn(CentralApp());
-		CentralV2Role answer = new CentralV2Role();
+		CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		Mockito.when(externalAccessRolesService.getRoleInfo((long) 1, "test")).thenReturn(answer);
 		List<CentralV2RoleFunction> finalRoleFunctionList = new ArrayList<>();
 		Mockito.when(externalAccessRolesService.getRoleFuncList("test")).thenReturn(finalRoleFunctionList);
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
 		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
-		CentralV2Role currentRole = new CentralV2Role();
+		CentralV2Role currentRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		SortedSet<CentralV2Role> parentRoles = new TreeSet<>();
-		CentralV2Role centralV2Role = new CentralV2Role();
+        CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		centralV2Role.setName("test");
 		parentRoles.add(centralV2Role);
 		currentRole.setParentRoles(parentRoles);
@@ -714,7 +710,8 @@ public class RoleManageControllerTest {
 				.thenReturn(externalRequestFieldsValidator);
 		Map<String, Object> actual = roleManageController.saveRole(mockedRequest, mockedResponse, CentralApp().getId());
 		final Map<String, Object> expected = new HashMap<>();
-		expected.put("role", new CentralV2Role(null, "test"));
+        expected.put("role",
+                new CentralV2Role.CentralV2RoleBuilder().setId(null).setName("test").createCentralV2Role());
 		expected.put("status", "Success");
 		assertEquals(expected, actual);
 	}
@@ -765,7 +762,8 @@ public class RoleManageControllerTest {
 		ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(true, "");
 		Mockito.when(externalAccessRolesService.saveRoleForApplication(Matchers.any(), Matchers.any()))
 				.thenReturn(externalRequestFieldsValidator);
-		CentralV2Role cenV2Role = new CentralV2Role(1l, "test1");
+        CentralV2Role cenV2Role =
+                new CentralV2Role.CentralV2RoleBuilder().setId(1l).setName("test1").createCentralV2Role();
 		cenV2Role.setActive(true);
 		Mockito.when(externalAccessRolesService.getRoleInfo(Matchers.anyLong(), Matchers.any())).thenReturn(cenV2Role);
 		Map<String, Object> actual = roleManageController.saveRole(mockedRequest, mockedResponse, CentralApp().getId());
@@ -860,7 +858,7 @@ public class RoleManageControllerTest {
 		Mockito.when(externalAccessRolesService.getApp(Matchers.anyString())).thenReturn(appList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(Matchers.anyObject())).thenReturn(response);
-		CentralV2Role role = new CentralV2Role(1l, "test");
+        CentralV2Role role = new CentralV2Role.CentralV2RoleBuilder().setId(1l).setName("test").createCentralV2Role();
 		role.setActive(true);
 		Role currentRole = new Role();
 		currentRole.setName("test");
@@ -927,7 +925,7 @@ public class RoleManageControllerTest {
 		Mockito.when(externalAccessRolesService.getApp(Matchers.anyString())).thenReturn(appList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(Matchers.anyObject())).thenReturn(response);
-		CentralV2Role role = new CentralV2Role(1l, "test");
+        CentralV2Role role = new CentralV2Role.CentralV2RoleBuilder().setId(1l).setName("test").createCentralV2Role();
 		role.setActive(true);
 		Role currentRole = new Role();
 		currentRole.setName("test");
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java
index 0e59d643..0331633c 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java
@@ -82,16 +82,7 @@ import org.onap.portalapp.portal.ecomp.model.UploadRoleFunctionExtSystem;
 import org.onap.portalapp.portal.exceptions.InactiveApplicationException;
 import org.onap.portalapp.portal.exceptions.InvalidUserException;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
-import org.onap.portalapp.portal.transport.BulkUploadRoleFunction;
-import org.onap.portalapp.portal.transport.BulkUploadUserRoles;
-import org.onap.portalapp.portal.transport.CentralRole;
-import org.onap.portalapp.portal.transport.CentralUser;
-import org.onap.portalapp.portal.transport.CentralV2Role;
-import org.onap.portalapp.portal.transport.CentralizedAppRoles;
-import org.onap.portalapp.portal.transport.EcompUserRoles;
-import org.onap.portalapp.portal.transport.ExternalRequestFieldsValidator;
-import org.onap.portalapp.portal.transport.GlobalRoleWithApplicationRoleFunction;
-import org.onap.portalapp.portal.transport.LocalRole;
+import org.onap.portalapp.portal.transport.*;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.portal.utils.PortalConstants;
@@ -820,8 +811,8 @@ public class ExternalAccessRolesServiceImplTest {
 		globalRoles.add(globalRole);
 		Mockito.when(dataAccessService.executeNamedQuery("getGlobalRolesOfPortal", null, null)).thenReturn(globalRoles);
 		List<CentralV2Role> expected = new ArrayList<>();
-		CentralV2Role cenV2Role = new CentralV2Role();
-		CentralV2Role cenV2Role2 = new CentralV2Role();
+		CentralV2Role cenV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
+		CentralV2Role cenV2Role2 = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		expected.add(cenV2Role);
 		expected.add(cenV2Role2);
 		List<CentralV2Role> actual = externalAccessRolesServiceImpl.getRolesForApp(app.getUebKey());
@@ -2366,7 +2357,7 @@ public class ExternalAccessRolesServiceImplTest {
 	@Test
 	public void convertV2CentralRoleListToOldVerisonCentralRoleListTest() {
 		List<CentralV2Role> v2CenRoleList = new ArrayList<>();
-		CentralV2Role cenV2Role = new CentralV2Role(2l, "test1");
+		CentralV2Role cenV2Role = new CentralV2Role.CentralV2RoleBuilder().setId(2l).setName("test1").createCentralV2Role();
 		CentralV2RoleFunction CentralV2Role = new CentralV2RoleFunction("testcode", "test_name");
 		SortedSet<CentralV2RoleFunction> setV2RoleFuncs = new TreeSet<>();
 		setV2RoleFuncs.add(CentralV2Role);
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java
index 4d07c792..785522d4 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java
@@ -82,18 +82,7 @@ import org.onap.portalapp.portal.domain.EPUserAppRoles;
 import org.onap.portalapp.portal.domain.EPUserAppRolesRequest;
 import org.onap.portalapp.portal.domain.EPUserAppRolesRequestDetail;
 import org.onap.portalapp.portal.domain.ExternalSystemAccess;
-import org.onap.portalapp.portal.transport.AppWithRolesForUser;
-import org.onap.portalapp.portal.transport.CentralV2Role;
-import org.onap.portalapp.portal.transport.EPUserAppCurrentRoles;
-import org.onap.portalapp.portal.transport.EcompUserAppRoles;
-import org.onap.portalapp.portal.transport.ExternalRequestFieldsValidator;
-import org.onap.portalapp.portal.transport.FieldsValidator;
-import org.onap.portalapp.portal.transport.FunctionalMenuItem;
-import org.onap.portalapp.portal.transport.FunctionalMenuRole;
-import org.onap.portalapp.portal.transport.RemoteRole;
-import org.onap.portalapp.portal.transport.RemoteUserWithRoles;
-import org.onap.portalapp.portal.transport.RoleInAppForUser;
-import org.onap.portalapp.portal.transport.UserApplicationRoles;
+import org.onap.portalapp.portal.transport.*;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.portal.utils.PortalConstants;
@@ -204,10 +193,14 @@ public class UserRolesCommonServiceImplTest {
 		Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
 		List<RoleInAppForUser> mockRoleInAppForUserList = getMockedRoleInAppUserList();
 		List<CentralV2Role> mockCenV2Role = new ArrayList<>();
-		CentralV2Role cenV2Role = new CentralV2Role(1l, null, null, null, null, null, "test1", true, null,
-				new TreeSet<>(), new TreeSet<>(), new TreeSet<>());
-		CentralV2Role cenV2Role2 = new CentralV2Role(16l, null, null, null, null, null, "test2", true, null,
-				new TreeSet<>(), new TreeSet<>(), new TreeSet<>());
+        CentralV2Role cenV2Role = new CentralV2Role.CentralV2RoleBuilder().setId(1l).setCreated(null).setModified(null)
+                .setCreatedId(null).setModifiedId(null).setRowNum(null).setName("test1").setActive(true)
+                .setPriority(null).setRoleFunctions(new TreeSet<>()).setChildRoles(new TreeSet<>())
+                .setParentRoles(new TreeSet<>()).createCentralV2Role();
+        CentralV2Role cenV2Role2 = new CentralV2Role.CentralV2RoleBuilder().setId(16l).setCreated(null)
+                .setModified(null).setCreatedId(null).setModifiedId(null).setRowNum(null).setName("test2")
+                .setActive(true).setPriority(null).setRoleFunctions(new TreeSet<>()).setChildRoles(new TreeSet<>())
+                .setParentRoles(new TreeSet<>()).createCentralV2Role();
 		mockCenV2Role.add(cenV2Role);
 		mockCenV2Role.add(cenV2Role2);
 		Mockito.when(externalAccessRolesServiceImpl.getRolesForApp(mockApp.getUebKey())).thenReturn(mockCenV2Role);
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
index 57b1ab73..2240f9cf 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
@@ -91,7 +91,7 @@ public class CentralUserAppTest {
                 .setThumbnail(null).setUsername(TEST).setUebKey(TEST).setUebSecret(TEST).setUebTopicName(TEST)
                 .createCentralApp();
 
-        CentralV2Role role = new CentralV2Role();
+        CentralV2Role role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 
         centralV2UserApp.setUserId((long) 1);
         centralV2UserApp.setApp(app);
@@ -112,7 +112,7 @@ public class CentralUserAppTest {
                 .setThumbnail(null).setUsername(TEST).setUebKey(TEST).setUebSecret(TEST).setUebTopicName(TEST)
                 .createCentralApp();
 
-        CentralV2Role role1 = new CentralV2Role();
+        CentralV2Role role1 = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 
         assertEquals(centralV2UserApp.getUserId(), new Long(1));
         assertEquals(centralV2UserApp.getPriority(), new Integer((Integer) 123));