From 8fbf2846655dbad0e19789e510c51127ad35104d Mon Sep 17 00:00:00 2001 From: Parshad Patel Date: Fri, 30 Aug 2019 15:42:52 +0900 Subject: Reduce number of parameters Constructor has 12 parameters, which is greater than 7 authorized Issue-ID: PORTAL-562 Change-Id: Ie2007420ab2b3d3b304e0b8dddd8afa7314a79ff Signed-off-by: Parshad Patel --- .../portal/controller/RoleManageController.java | 5 +- .../service/ExternalAccessRolesServiceImpl.java | 47 +- .../portalapp/portal/transport/CentralV2Role.java | 474 ++++++++++++--------- 3 files changed, 304 insertions(+), 222 deletions(-) (limited to 'ecomp-portal-BE-common/src/main/java/org') 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 params = new HashMap<>(); List roleList = new ArrayList<>(); - CentralV2Role cenRole = new CentralV2Role(); + CentralV2Role cenRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); List roleInfo = null; List app = null; try { @@ -1368,15 +1371,19 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic SortedSet childRoles = new TreeSet<>(); SortedSet 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 roleFunctions = new TreeSet<>(); - - private SortedSet childRoles = new TreeSet<>(); - - private SortedSet parentRoles = new TreeSet<>(); - - public CentralV2Role(Long id, Date created, Date modified, Long createdId, Long modifiedId, Long rowNum, - String name, boolean active, Integer priority, SortedSet roleFunctions, - SortedSet childRoles, SortedSet 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 getRoleFunctions() { - return roleFunctions; - } - - public void setRoleFunctions(SortedSet roleFunctions) { - this.roleFunctions = roleFunctions; - } - - public SortedSet getChildRoles() { - return childRoles; - } - - public void setChildRoles(SortedSet childRoles) { - this.childRoles = childRoles; - } - - public SortedSet getParentRoles() { - return parentRoles; - } - - public void setParentRoles(SortedSet 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 roleFunctions = new TreeSet<>(); + + private SortedSet childRoles = new TreeSet<>(); + + private SortedSet 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 roleFunctions; + private SortedSet childRoles; + private SortedSet 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 roleFunctions) { + this.roleFunctions = roleFunctions; + return this; + } + + public CentralV2RoleBuilder setChildRoles(SortedSet childRoles) { + this.childRoles = childRoles; + return this; + } + + public CentralV2RoleBuilder setParentRoles(SortedSet 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 getRoleFunctions() { + return roleFunctions; + } + + public void setRoleFunctions(SortedSet roleFunctions) { + this.roleFunctions = roleFunctions; + } + + public SortedSet getChildRoles() { + return childRoles; + } + + public void setChildRoles(SortedSet childRoles) { + this.childRoles = childRoles; + } + + public SortedSet getParentRoles() { + return parentRoles; + } + + public void setParentRoles(SortedSet 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; + } } -- cgit 1.2.3-korg