diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java | 106 |
1 files changed, 49 insertions, 57 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java index 0f9c9be293..0297abeacb 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,6 @@ package org.openecomp.sdc.be.ecomp.converters; -import com.google.common.base.Strings; -import com.google.common.collect.Sets; import fj.data.Either; import org.openecomp.portalsdk.core.restful.domain.EcompRole; import org.openecomp.portalsdk.core.restful.domain.EcompUser; @@ -29,8 +27,9 @@ import org.openecomp.sdc.be.dao.utils.UserStatusEnum; import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.user.Role; +import java.util.HashSet; import java.util.Iterator; -import java.util.Objects; +import java.util.Set; public final class EcompUserConverter { @@ -38,41 +37,12 @@ public final class EcompUserConverter { } public static Either<EcompUser, String> convertUserToEcompUser(User asdcUser) { - return (Objects.nonNull(asdcUser)) ? Either.left(convertToEcompUser(asdcUser)) : Either.right("User is null"); - } - - - public static Either<User, String> convertEcompUserToUser(EcompUser ecompUser) { - return (Objects.nonNull(ecompUser)) ? Either.left(convertToUser(ecompUser)) : Either.right("EcompUser is null"); - } - - private static User convertToUser(EcompUser ecompUser) { - User convertedUser = new User(); - - convertedUser.setFirstName(ecompUser.getFirstName()); - convertedUser.setLastName(ecompUser.getLastName()); - convertedUser.setUserId((!isLoginIdEmpty(ecompUser) ? ecompUser.getLoginId() : ecompUser.getOrgUserId())); - - convertedUser.setEmail(ecompUser.getEmail()); - - if (Objects.nonNull(ecompUser.getRoles())) { - Iterator<EcompRole> iter = ecompUser.getRoles().iterator(); + EcompUser convertedUser = new EcompUser(); - if (iter.hasNext()) { - String updatedRole = EcompRoleConverter.convertEcompRoleToRole(iter.next()); - convertedUser.setRole(updatedRole); - } + if (asdcUser == null) { + return Either.right("User is null"); } - convertedUser.setStatus((ecompUser.isActive()) ? UserStatusEnum.ACTIVE : UserStatusEnum.INACTIVE); - - - return convertedUser; - } - - private static EcompUser convertToEcompUser(User asdcUser) { - EcompUser convertedUser = new EcompUser(); - convertedUser.setFirstName(asdcUser.getFirstName()); convertedUser.setLastName(asdcUser.getLastName()); convertedUser.setLoginId(asdcUser.getUserId()); @@ -85,33 +55,55 @@ public final class EcompUserConverter { convertedUser.setActive(false); } - EcompRole convertedRole = getEcompRole(asdcUser); + EcompRole convertedRole = new EcompRole(); + for (Role role : Role.values()) { + if (role.name().equals(asdcUser.getRole()) || role.toString().equals(asdcUser.getRole())) { + convertedRole.setName(role.name()); + convertedRole.setId(new Long(role.ordinal())); + break; + } + } - convertedUser.setRoles(Sets.newHashSet(convertedRole)); + Set<EcompRole> convertedRoleSet = new HashSet<>(); + convertedRoleSet.add(convertedRole); + convertedUser.setRoles(convertedRoleSet); - return convertedUser; + return Either.left(convertedUser); } + public static Either<User, String> convertEcompUserToUser(EcompUser ecompUser) { + User convertedUser = new User(); - private static boolean isLoginIdEmpty(EcompUser user) { - return Strings.isNullOrEmpty(user.getLoginId()); - } + if (ecompUser == null) { + return Either.right("EcompUser is null"); + } - private static EcompRole getEcompRole(User asdcUser) { - EcompRole convertedRole = new EcompRole(); - for (Role role : Role.values()) { - if (isRolesNamesEqual(asdcUser, role)) { - convertedRole.setName(role.name()); - convertedRole.setId((long) role.ordinal()); - break; + convertedUser.setFirstName(ecompUser.getFirstName()); + convertedUser.setLastName(ecompUser.getLastName()); + + if (ecompUser.getLoginId() != null && !ecompUser.getLoginId().isEmpty()) { + convertedUser.setUserId(ecompUser.getLoginId()); + } else { + convertedUser.setUserId(ecompUser.getOrgUserId()); + } + + convertedUser.setEmail(ecompUser.getEmail()); + + if (ecompUser.getRoles() != null) { + Iterator<EcompRole> iter = ecompUser.getRoles().iterator(); + + if (iter.hasNext()) { + String updatedRole = EcompRoleConverter.convertEcompRoleToRole(iter.next()); + convertedUser.setRole(updatedRole); } } - return convertedRole; - } - private static boolean isRolesNamesEqual(User asdcUser, Role role) { - String asdcUserRole = asdcUser.getRole(); - return role.name().equals(asdcUserRole) || role.toString().equals(asdcUserRole); - } + if (ecompUser.isActive()) { + convertedUser.setStatus(UserStatusEnum.ACTIVE); + } else { + convertedUser.setStatus(UserStatusEnum.INACTIVE); + } -} + return Either.left(convertedUser); + } +}
\ No newline at end of file |