Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Domain model change
[portal.git]
/
portal-BE
/
src
/
main
/
java
/
org
/
onap
/
portal
/
domain
/
mapper
/
FnUserMapper.java
diff --git
a/portal-BE/src/main/java/org/onap/portal/domain/mapper/FnUserMapper.java
b/portal-BE/src/main/java/org/onap/portal/domain/mapper/FnUserMapper.java
index
869ba81
..
0a71850
100644
(file)
--- a/
portal-BE/src/main/java/org/onap/portal/domain/mapper/FnUserMapper.java
+++ b/
portal-BE/src/main/java/org/onap/portal/domain/mapper/FnUserMapper.java
@@
-50,9
+50,8
@@
import org.springframework.stereotype.Component;
public class FnUserMapper {
public FnUserDto fnUserToFnUserDto(final FnUser fnUser){
return FnUserDto.builder()
public class FnUserMapper {
public FnUserDto fnUserToFnUserDto(final FnUser fnUser){
return FnUserDto.builder()
- .userId(fnUser.get
User
Id())
+ .userId(fnUser.getId())
.orgId(fnUser.getOrgId().getOrgId())
.orgId(fnUser.getOrgId().getOrgId())
- .managerId(fnUser.getManagerId().getUserId())
.firstName(fnUser.getFirstName())
.middleName(fnUser.getMiddleName())
.lastName(fnUser.getLastName())
.firstName(fnUser.getFirstName())
.middleName(fnUser.getMiddleName())
.lastName(fnUser.getLastName())
@@
-69,9
+68,7
@@
public class FnUserMapper {
.loginPwd(fnUser.getLoginPwd())
.lastLoginDate(fnUser.getLastLoginDate())
.activeYn(fnUser.getActiveYn())
.loginPwd(fnUser.getLoginPwd())
.lastLoginDate(fnUser.getLastLoginDate())
.activeYn(fnUser.getActiveYn())
- .createdId(fnUser.getCreatedId().getUserId())
.createdDate(fnUser.getCreatedDate())
.createdDate(fnUser.getCreatedDate())
- .modifiedId(fnUser.getModifiedId().getUserId())
.modifiedDate(fnUser.getModifiedDate())
.isInternalYn(fnUser.getIsInternalYn())
.addressLine1(fnUser.getAddressLine1())
.modifiedDate(fnUser.getModifiedDate())
.isInternalYn(fnUser.getIsInternalYn())
.addressLine1(fnUser.getAddressLine1())
@@
-100,9
+97,8
@@
public class FnUserMapper {
public FnUser fnUserToFnUser(final FnUser fnUser){
return FnUser.builder()
public FnUser fnUserToFnUser(final FnUser fnUser){
return FnUser.builder()
- .
userId(fnUser.getUser
Id())
+ .
id(fnUser.get
Id())
.orgId(fnUser.getOrgId())
.orgId(fnUser.getOrgId())
- .managerId(fnUser.getManagerId())
.firstName(fnUser.getFirstName())
.middleName(fnUser.getMiddleName())
.lastName(fnUser.getLastName())
.firstName(fnUser.getFirstName())
.middleName(fnUser.getMiddleName())
.lastName(fnUser.getLastName())
@@
-119,9
+115,7
@@
public class FnUserMapper {
.loginPwd(fnUser.getLoginPwd())
.lastLoginDate(fnUser.getLastLoginDate())
.activeYn(fnUser.getActiveYn())
.loginPwd(fnUser.getLoginPwd())
.lastLoginDate(fnUser.getLastLoginDate())
.activeYn(fnUser.getActiveYn())
- .createdId(fnUser.getCreatedId())
.createdDate(fnUser.getCreatedDate())
.createdDate(fnUser.getCreatedDate())
- .modifiedId(fnUser.getModifiedId())
.modifiedDate(fnUser.getModifiedDate())
.isInternalYn(fnUser.getIsInternalYn())
.addressLine1(fnUser.getAddressLine1())
.modifiedDate(fnUser.getModifiedDate())
.isInternalYn(fnUser.getIsInternalYn())
.addressLine1(fnUser.getAddressLine1())