Merge "Reduce number of parameters in constructor"
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 3d23401..09afcf7 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
@@ -1158,7 +1158,7 @@
@SuppressWarnings("unchecked")
private CentralV2User createEPUser(EPUser userInfo, Set<EPUserApp> userAppSet, EPApp app) throws Exception {
final Map<String, Long> params = new HashMap<>();
- CentralV2User userAppList = new CentralV2User();
+ CentralV2User userAppList = new CentralV2User.CentralV2UserBuilder().createCentralV2User();
CentralV2User user1 = null;
final Map<String, Long> params1 = new HashMap<>();
List<EPRole> globalRoleList = new ArrayList<>();
@@ -1234,21 +1234,32 @@
}
}
}
- user1 = new CentralV2User(null, userInfo.getCreated(), userInfo.getModified(), userInfo.getCreatedId(),
- userInfo.getModifiedId(), userInfo.getRowNum(), userInfo.getOrgId(), userInfo.getManagerId(),
- userInfo.getFirstName(), userInfo.getMiddleInitial(), userInfo.getLastName(), userInfo.getPhone(),
- userInfo.getFax(), userInfo.getCellular(), userInfo.getEmail(), userInfo.getAddressId(),
- userInfo.getAlertMethodCd(), userInfo.getHrid(), userInfo.getOrgUserId(), userInfo.getOrgCode(),
- userInfo.getAddress1(), userInfo.getAddress2(), userInfo.getCity(), userInfo.getState(),
- userInfo.getZipCode(), userInfo.getCountry(), userInfo.getOrgManagerUserId(),
- userInfo.getLocationClli(), userInfo.getBusinessCountryCode(), userInfo.getBusinessCountryName(),
- userInfo.getBusinessUnit(), userInfo.getBusinessUnitName(), userInfo.getDepartment(),
- userInfo.getDepartmentName(), userInfo.getCompanyCode(), userInfo.getCompany(),
- userInfo.getZipCodeSuffix(), userInfo.getJobTitle(), userInfo.getCommandChain(),
- userInfo.getSiloStatus(), userInfo.getCostCenter(), userInfo.getFinancialLocCode(),
- userInfo.getLoginId(), userInfo.getLoginPwd(), userInfo.getLastLoginDate(), userInfo.getActive(),
- userInfo.getInternal(), userInfo.getSelectedProfileId(), userInfo.getTimeZoneId(),
- userInfo.isOnline(), userInfo.getChatId(), userAppList.getUserApps(), null);
+ user1 = new CentralV2User.CentralV2UserBuilder().setId(null).setCreated(userInfo.getCreated())
+ .setModified(userInfo.getModified()).setCreatedId(userInfo.getCreatedId())
+ .setModifiedId(userInfo.getModifiedId()).setRowNum(userInfo.getRowNum())
+ .setOrgId(userInfo.getOrgId()).setManagerId(userInfo.getManagerId())
+ .setFirstName(userInfo.getFirstName()).setMiddleInitial(userInfo.getMiddleInitial())
+ .setLastName(userInfo.getLastName()).setPhone(userInfo.getPhone()).setFax(userInfo.getFax())
+ .setCellular(userInfo.getCellular()).setEmail(userInfo.getEmail())
+ .setAddressId(userInfo.getAddressId()).setAlertMethodCd(userInfo.getAlertMethodCd())
+ .setHrid(userInfo.getHrid()).setOrgUserId(userInfo.getOrgUserId()).setOrgCode(userInfo.getOrgCode())
+ .setAddress1(userInfo.getAddress1()).setAddress2(userInfo.getAddress2()).setCity(userInfo.getCity())
+ .setState(userInfo.getState()).setZipCode(userInfo.getZipCode()).setCountry(userInfo.getCountry())
+ .setOrgManagerUserId(userInfo.getOrgManagerUserId()).setLocationClli(userInfo.getLocationClli())
+ .setBusinessCountryCode(userInfo.getBusinessCountryCode())
+ .setBusinessCountryName(userInfo.getBusinessCountryName())
+ .setBusinessUnit(userInfo.getBusinessUnit()).setBusinessUnitName(userInfo.getBusinessUnitName())
+ .setDepartment(userInfo.getDepartment()).setDepartmentName(userInfo.getDepartmentName())
+ .setCompanyCode(userInfo.getCompanyCode()).setCompany(userInfo.getCompany())
+ .setZipCodeSuffix(userInfo.getZipCodeSuffix()).setJobTitle(userInfo.getJobTitle())
+ .setCommandChain(userInfo.getCommandChain()).setSiloStatus(userInfo.getSiloStatus())
+ .setCostCenter(userInfo.getCostCenter()).setFinancialLocCode(userInfo.getFinancialLocCode())
+ .setLoginId(userInfo.getLoginId()).setLoginPwd(userInfo.getLoginPwd())
+ .setLastLoginDate(userInfo.getLastLoginDate()).setActive(userInfo.getActive())
+ .setInternal(userInfo.getInternal()).setSelectedProfileId(userInfo.getSelectedProfileId())
+ .setTimeZoneId(userInfo.getTimeZoneId()).setOnline(userInfo.isOnline())
+ .setChatId(userInfo.getChatId()).setUserApps(userAppList.getUserApps()).setPseudoRoles(null)
+ .createCentralV2User();
} catch (Exception e) {
logger.error(EELFLoggerDelegate.errorLogger, "createEPUser: createEPUser failed", e);
throw e;
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2User.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2User.java
index 6889495..a1bee21 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2User.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2User.java
@@ -109,70 +109,386 @@
}
- public CentralV2User(Long id, Date created, Date modified, Long createdId, Long modifiedId, Long rowNum, Long orgId,
- Long managerId, String firstName, String middleInitial, String lastName, String phone, String fax,
- String cellular, String email, Long addressId, String alertMethodCd, String hrid, String orgUserId,
- String orgCode, String address1, String address2, String city, String state, String zipCode, String country,
- String orgManagerUserId, String locationClli, String businessCountryCode, String businessCountryName,
- String businessUnit, String businessUnitName, String department, String departmentName, String companyCode,
- String company, String zipCodeSuffix, String jobTitle, String commandChain, String siloStatus,
- String costCenter, String financialLocCode, String loginId, String loginPwd, Date lastLoginDate,
- boolean active, boolean internal, Long selectedProfileId, Long timeZoneId, boolean online, String chatId,
- Set<CentralV2UserApp> userApps, Set<CentralV2Role> pseudoRoles) {
+ public CentralV2User(CentralV2UserBuilder builder) {
super();
- this.id = id;
- this.created = created;
- this.modified = modified;
- this.createdId = createdId;
- this.modifiedId = modifiedId;
- this.rowNum = rowNum;
- this.orgId = orgId;
- this.managerId = managerId;
- this.firstName = firstName;
- this.middleInitial = middleInitial;
- this.lastName = lastName;
- this.phone = phone;
- this.fax = fax;
- this.cellular = cellular;
- this.email = email;
- this.addressId = addressId;
- this.alertMethodCd = alertMethodCd;
- this.hrid = hrid;
- this.orgUserId = orgUserId;
- this.orgCode = orgCode;
- this.address1 = address1;
- this.address2 = address2;
- this.city = city;
- this.state = state;
- this.zipCode = zipCode;
- this.country = country;
- this.orgManagerUserId = orgManagerUserId;
- this.locationClli = locationClli;
- this.businessCountryCode = businessCountryCode;
- this.businessCountryName = businessCountryName;
- this.businessUnit = businessUnit;
- this.businessUnitName = businessUnitName;
- this.department = department;
- this.departmentName = departmentName;
- this.companyCode = companyCode;
- this.company = company;
- this.zipCodeSuffix = zipCodeSuffix;
- this.jobTitle = jobTitle;
- this.commandChain = commandChain;
- this.siloStatus = siloStatus;
- this.costCenter = costCenter;
- this.financialLocCode = financialLocCode;
- this.loginId = loginId;
- this.loginPwd = loginPwd;
- this.lastLoginDate = lastLoginDate;
- this.active = active;
- this.internal = internal;
- this.selectedProfileId = selectedProfileId;
- this.timeZoneId = timeZoneId;
- this.online = online;
- this.chatId = chatId;
- this.userApps = userApps;
- this.pseudoRoles = pseudoRoles;
+ 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.orgId = builder.orgId;
+ this.managerId = builder.managerId;
+ this.firstName = builder.firstName;
+ this.middleInitial = builder.middleInitial;
+ this.lastName = builder.lastName;
+ this.phone = builder.phone;
+ this.fax = builder.fax;
+ this.cellular = builder.cellular;
+ this.email = builder.email;
+ this.addressId = builder.addressId;
+ this.alertMethodCd = builder.alertMethodCd;
+ this.hrid = builder.hrid;
+ this.orgUserId = builder.orgUserId;
+ this.orgCode = builder.orgCode;
+ this.address1 = builder.address1;
+ this.address2 = builder.address2;
+ this.city = builder.city;
+ this.state = builder.state;
+ this.zipCode = builder.zipCode;
+ this.country = builder.country;
+ this.orgManagerUserId = builder.orgManagerUserId;
+ this.locationClli = builder.locationClli;
+ this.businessCountryCode = builder.businessCountryCode;
+ this.businessCountryName = builder.businessCountryName;
+ this.businessUnit = builder.businessUnit;
+ this.businessUnitName = builder.businessUnitName;
+ this.department = builder.department;
+ this.departmentName = builder.departmentName;
+ this.companyCode = builder.companyCode;
+ this.company = builder.company;
+ this.zipCodeSuffix = builder.zipCodeSuffix;
+ this.jobTitle = builder.jobTitle;
+ this.commandChain = builder.commandChain;
+ this.siloStatus = builder.siloStatus;
+ this.costCenter = builder.costCenter;
+ this.financialLocCode = builder.financialLocCode;
+ this.loginId = builder.loginId;
+ this.loginPwd = builder.loginPwd;
+ this.lastLoginDate = builder.lastLoginDate;
+ this.active = builder.active;
+ this.internal = builder.internal;
+ this.selectedProfileId = builder.selectedProfileId;
+ this.timeZoneId = builder.timeZoneId;
+ this.online = builder.online;
+ this.chatId = builder.chatId;
+ this.userApps = builder.userApps;
+ this.pseudoRoles = builder.pseudoRoles;
+ }
+
+ public static class CentralV2UserBuilder {
+ private Long id;
+ private Date created;
+ private Date modified;
+ private Long createdId;
+ private Long modifiedId;
+ private Long rowNum;
+ private Long orgId;
+ private Long managerId;
+ private String firstName;
+ private String middleInitial;
+ private String lastName;
+ private String phone;
+ private String fax;
+ private String cellular;
+ private String email;
+ private Long addressId;
+ private String alertMethodCd;
+ private String hrid;
+ private String orgUserId;
+ private String orgCode;
+ private String address1;
+ private String address2;
+ private String city;
+ private String state;
+ private String zipCode;
+ private String country;
+ private String orgManagerUserId;
+ private String locationClli;
+ private String businessCountryCode;
+ private String businessCountryName;
+ private String businessUnit;
+ private String businessUnitName;
+ private String department;
+ private String departmentName;
+ private String companyCode;
+ private String company;
+ private String zipCodeSuffix;
+ private String jobTitle;
+ private String commandChain;
+ private String siloStatus;
+ private String costCenter;
+ private String financialLocCode;
+ private String loginId;
+ private String loginPwd;
+ private Date lastLoginDate;
+ private boolean active;
+ private boolean internal;
+ private Long selectedProfileId;
+ private Long timeZoneId;
+ private boolean online;
+ private String chatId;
+ private Set<CentralV2UserApp> userApps;
+ private Set<CentralV2Role> pseudoRoles;
+
+ public CentralV2UserBuilder setId(Long id) {
+ this.id = id;
+ return this;
+ }
+
+ public CentralV2UserBuilder setCreated(Date created) {
+ this.created = created;
+ return this;
+ }
+
+ public CentralV2UserBuilder setModified(Date modified) {
+ this.modified = modified;
+ return this;
+ }
+
+ public CentralV2UserBuilder setCreatedId(Long createdId) {
+ this.createdId = createdId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setModifiedId(Long modifiedId) {
+ this.modifiedId = modifiedId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setRowNum(Long rowNum) {
+ this.rowNum = rowNum;
+ return this;
+ }
+
+ public CentralV2UserBuilder setOrgId(Long orgId) {
+ this.orgId = orgId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setManagerId(Long managerId) {
+ this.managerId = managerId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setFirstName(String firstName) {
+ this.firstName = firstName;
+ return this;
+ }
+
+ public CentralV2UserBuilder setMiddleInitial(String middleInitial) {
+ this.middleInitial = middleInitial;
+ return this;
+ }
+
+ public CentralV2UserBuilder setLastName(String lastName) {
+ this.lastName = lastName;
+ return this;
+ }
+
+ public CentralV2UserBuilder setPhone(String phone) {
+ this.phone = phone;
+ return this;
+ }
+
+ public CentralV2UserBuilder setFax(String fax) {
+ this.fax = fax;
+ return this;
+ }
+
+ public CentralV2UserBuilder setCellular(String cellular) {
+ this.cellular = cellular;
+ return this;
+ }
+
+ public CentralV2UserBuilder setEmail(String email) {
+ this.email = email;
+ return this;
+ }
+
+ public CentralV2UserBuilder setAddressId(Long addressId) {
+ this.addressId = addressId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setAlertMethodCd(String alertMethodCd) {
+ this.alertMethodCd = alertMethodCd;
+ return this;
+ }
+
+ public CentralV2UserBuilder setHrid(String hrid) {
+ this.hrid = hrid;
+ return this;
+ }
+
+ public CentralV2UserBuilder setOrgUserId(String orgUserId) {
+ this.orgUserId = orgUserId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setOrgCode(String orgCode) {
+ this.orgCode = orgCode;
+ return this;
+ }
+
+ public CentralV2UserBuilder setAddress1(String address1) {
+ this.address1 = address1;
+ return this;
+ }
+
+ public CentralV2UserBuilder setAddress2(String address2) {
+ this.address2 = address2;
+ return this;
+ }
+
+ public CentralV2UserBuilder setCity(String city) {
+ this.city = city;
+ return this;
+ }
+
+ public CentralV2UserBuilder setState(String state) {
+ this.state = state;
+ return this;
+ }
+
+ public CentralV2UserBuilder setZipCode(String zipCode) {
+ this.zipCode = zipCode;
+ return this;
+ }
+
+ public CentralV2UserBuilder setCountry(String country) {
+ this.country = country;
+ return this;
+ }
+
+ public CentralV2UserBuilder setOrgManagerUserId(String orgManagerUserId) {
+ this.orgManagerUserId = orgManagerUserId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setLocationClli(String locationClli) {
+ this.locationClli = locationClli;
+ return this;
+ }
+
+ public CentralV2UserBuilder setBusinessCountryCode(String businessCountryCode) {
+ this.businessCountryCode = businessCountryCode;
+ return this;
+ }
+
+ public CentralV2UserBuilder setBusinessCountryName(String businessCountryName) {
+ this.businessCountryName = businessCountryName;
+ return this;
+ }
+
+ public CentralV2UserBuilder setBusinessUnit(String businessUnit) {
+ this.businessUnit = businessUnit;
+ return this;
+ }
+
+ public CentralV2UserBuilder setBusinessUnitName(String businessUnitName) {
+ this.businessUnitName = businessUnitName;
+ return this;
+ }
+
+ public CentralV2UserBuilder setDepartment(String department) {
+ this.department = department;
+ return this;
+ }
+
+ public CentralV2UserBuilder setDepartmentName(String departmentName) {
+ this.departmentName = departmentName;
+ return this;
+ }
+
+ public CentralV2UserBuilder setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ return this;
+ }
+
+ public CentralV2UserBuilder setCompany(String company) {
+ this.company = company;
+ return this;
+ }
+
+ public CentralV2UserBuilder setZipCodeSuffix(String zipCodeSuffix) {
+ this.zipCodeSuffix = zipCodeSuffix;
+ return this;
+ }
+
+ public CentralV2UserBuilder setJobTitle(String jobTitle) {
+ this.jobTitle = jobTitle;
+ return this;
+ }
+
+ public CentralV2UserBuilder setCommandChain(String commandChain) {
+ this.commandChain = commandChain;
+ return this;
+ }
+
+ public CentralV2UserBuilder setSiloStatus(String siloStatus) {
+ this.siloStatus = siloStatus;
+ return this;
+ }
+
+ public CentralV2UserBuilder setCostCenter(String costCenter) {
+ this.costCenter = costCenter;
+ return this;
+ }
+
+ public CentralV2UserBuilder setFinancialLocCode(String financialLocCode) {
+ this.financialLocCode = financialLocCode;
+ return this;
+ }
+
+ public CentralV2UserBuilder setLoginId(String loginId) {
+ this.loginId = loginId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setLoginPwd(String loginPwd) {
+ this.loginPwd = loginPwd;
+ return this;
+ }
+
+ public CentralV2UserBuilder setLastLoginDate(Date lastLoginDate) {
+ this.lastLoginDate = lastLoginDate;
+ return this;
+ }
+
+ public CentralV2UserBuilder setActive(boolean active) {
+ this.active = active;
+ return this;
+ }
+
+ public CentralV2UserBuilder setInternal(boolean internal) {
+ this.internal = internal;
+ return this;
+ }
+
+ public CentralV2UserBuilder setSelectedProfileId(Long selectedProfileId) {
+ this.selectedProfileId = selectedProfileId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setTimeZoneId(Long timeZoneId) {
+ this.timeZoneId = timeZoneId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setOnline(boolean online) {
+ this.online = online;
+ return this;
+ }
+
+ public CentralV2UserBuilder setChatId(String chatId) {
+ this.chatId = chatId;
+ return this;
+ }
+
+ public CentralV2UserBuilder setUserApps(Set<CentralV2UserApp> userApps) {
+ this.userApps = userApps;
+ return this;
+ }
+
+ public CentralV2UserBuilder setPseudoRoles(Set<CentralV2Role> pseudoRoles) {
+ this.pseudoRoles = pseudoRoles;
+ return this;
+ }
+
+ public CentralV2User createCentralV2User() {
+ return new CentralV2User(this);
+ }
}
/**
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserTest.java
index 28292ba..5291c0d 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserTest.java
@@ -62,15 +62,20 @@
public CentralV2User mockCentralUser(){
Set<CentralV2UserApp> userApps = new HashSet<CentralV2UserApp>();
Set<CentralV2Role> pseudoRoles = new HashSet<CentralV2Role>();
- CentralV2User centralV2User = new CentralV2User((long)1, null, null, (long)1, (long)1, (long)1, (long)1,
- (long)1, "test", "test", "test", "test", "test",
- "test", "test", (long)1, "test", "test", "test",
- "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test",
- "test", "test", "test", "test", "test",
- "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null,
- false, false, (long)1, (long)1, false, "test", userApps, pseudoRoles);
+ CentralV2User centralV2User = new CentralV2User.CentralV2UserBuilder().setId((long) 1).setCreated(null)
+ .setModified(null).setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setOrgId((long) 1)
+ .setManagerId((long) 1).setFirstName("test").setMiddleInitial("test").setLastName("test")
+ .setPhone("test").setFax("test").setCellular("test").setEmail("test").setAddressId((long) 1)
+ .setAlertMethodCd("test").setHrid("test").setOrgUserId("test").setOrgCode("test").setAddress1("test")
+ .setAddress2("test").setCity("test").setState("test").setZipCode("test").setCountry("test")
+ .setOrgManagerUserId("test").setLocationClli("test").setBusinessCountryCode("test")
+ .setBusinessCountryName("test").setBusinessUnit("test").setBusinessUnitName("test")
+ .setDepartment("test").setDepartmentName("test").setCompanyCode("test").setCompany("test")
+ .setZipCodeSuffix("test").setJobTitle("test").setCommandChain("test").setSiloStatus("test")
+ .setCostCenter("test").setFinancialLocCode("test").setLoginId("test").setLoginPwd("test")
+ .setLastLoginDate(null).setActive(false).setInternal(false).setSelectedProfileId((long) 1)
+ .setTimeZoneId((long) 1).setOnline(false).setChatId("test").setUserApps(userApps)
+ .setPseudoRoles(pseudoRoles).createCentralV2User();
return centralV2User;
}
@@ -81,15 +86,20 @@
Set<CentralV2UserApp> userApps = new HashSet<CentralV2UserApp>();
Set<CentralV2Role> pseudoRoles = new HashSet<CentralV2Role>();
- CentralV2User centralV2User1 = new CentralV2User((long)1, null, null, (long)1, (long)1, (long)1, (long)1,
- (long)1, "test", "test", "test", "test", "test",
- "test", "test", (long)1, "test", "test", "test",
- "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test",
- "test", "test", "test", "test", "test",
- "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null,
- false, false, (long)1, (long)1, false, "test", userApps, pseudoRoles);
+ CentralV2User centralV2User1 = new CentralV2User.CentralV2UserBuilder().setId((long) 1).setCreated(null)
+ .setModified(null).setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setOrgId((long) 1)
+ .setManagerId((long) 1).setFirstName("test").setMiddleInitial("test").setLastName("test")
+ .setPhone("test").setFax("test").setCellular("test").setEmail("test").setAddressId((long) 1)
+ .setAlertMethodCd("test").setHrid("test").setOrgUserId("test").setOrgCode("test").setAddress1("test")
+ .setAddress2("test").setCity("test").setState("test").setZipCode("test").setCountry("test")
+ .setOrgManagerUserId("test").setLocationClli("test").setBusinessCountryCode("test")
+ .setBusinessCountryName("test").setBusinessUnit("test").setBusinessUnitName("test")
+ .setDepartment("test").setDepartmentName("test").setCompanyCode("test").setCompany("test")
+ .setZipCodeSuffix("test").setJobTitle("test").setCommandChain("test").setSiloStatus("test")
+ .setCostCenter("test").setFinancialLocCode("test").setLoginId("test").setLoginPwd("test")
+ .setLastLoginDate(null).setActive(false).setInternal(false).setSelectedProfileId((long) 1)
+ .setTimeZoneId((long) 1).setOnline(false).setChatId("test").setUserApps(userApps)
+ .setPseudoRoles(pseudoRoles).createCentralV2User();
assertEquals(centralV2User, centralV2User1);
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralV2UserTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralV2UserTest.java
index 0f7da0a..81650bd 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralV2UserTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralV2UserTest.java
@@ -61,7 +61,7 @@
CentralV2User user=buildV2User();
user.setZipCodeSuffix(TEST);
- CentralV2User centrlUser=new CentralV2User();
+ CentralV2User centrlUser = new CentralV2User.CentralV2UserBuilder().createCentralV2User();
centrlUser.setId(user.getId());
centrlUser.setCreated(user.getCreated());
centrlUser.setModified(user.getModified());
@@ -249,15 +249,18 @@
public CentralV2User buildV2User(){
Set<CentralV2UserApp> userApps = new HashSet<CentralV2UserApp>();
Set<CentralV2Role> pseudoRoles = new HashSet<CentralV2Role>();
- CentralV2User centralV2User = new CentralV2User(ID, DATE, DATE, ID, ID, ID, ID,
- ID, TEST, TEST, TEST, TEST, TEST,
- TEST, TEST, ID, TEST, TEST, TEST,
- TEST, TEST, TEST, TEST, TEST, TEST, TEST,
- TEST, TEST, TEST, TEST,
- TEST, TEST, TEST, TEST, TEST,
- TEST, TEST, TEST, TEST, TEST,
- TEST, TEST, TEST, TEST, null,
- false, false, ID, ID, false, TEST, userApps, pseudoRoles);
+ CentralV2User centralV2User = new CentralV2User.CentralV2UserBuilder().setId(ID).setCreated(DATE)
+ .setModified(DATE).setCreatedId(ID).setModifiedId(ID).setRowNum(ID).setOrgId(ID).setManagerId(ID)
+ .setFirstName(TEST).setMiddleInitial(TEST).setLastName(TEST).setPhone(TEST).setFax(TEST)
+ .setCellular(TEST).setEmail(TEST).setAddressId(ID).setAlertMethodCd(TEST).setHrid(TEST)
+ .setOrgUserId(TEST).setOrgCode(TEST).setAddress1(TEST).setAddress2(TEST).setCity(TEST).setState(TEST)
+ .setZipCode(TEST).setCountry(TEST).setOrgManagerUserId(TEST).setLocationClli(TEST)
+ .setBusinessCountryCode(TEST).setBusinessCountryName(TEST).setBusinessUnit(TEST)
+ .setBusinessUnitName(TEST).setDepartment(TEST).setDepartmentName(TEST).setCompanyCode(TEST)
+ .setCompany(TEST).setZipCodeSuffix(TEST).setJobTitle(TEST).setCommandChain(TEST).setSiloStatus(TEST)
+ .setCostCenter(TEST).setFinancialLocCode(TEST).setLoginId(TEST).setLoginPwd(TEST).setLastLoginDate(null)
+ .setActive(false).setInternal(false).setSelectedProfileId(ID).setTimeZoneId(ID).setOnline(false)
+ .setChatId(TEST).setUserApps(userApps).setPseudoRoles(pseudoRoles).createCentralV2User();
return centralV2User;
}