From 234e6a81f53079b0cd22818df48f39fd479883a4 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Mon, 8 Oct 2018 17:06:27 +0530 Subject: Test coverage : openecomp-nosqldb-api Increase test coverage Change-Id: If8b4b8e961278eb1448e8467cd7ac8e136c16315 Issue-ID: SDC-1673 Signed-off-by: siddharth0905 --- .../org/openecomp/core/util/UniqueValueUtil.java | 206 ++++++++++----------- 1 file changed, 103 insertions(+), 103 deletions(-) (limited to 'openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/main/java/org/openecomp/core/util/UniqueValueUtil.java') diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/main/java/org/openecomp/core/util/UniqueValueUtil.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/main/java/org/openecomp/core/util/UniqueValueUtil.java index 0ba7228cce..aded1fa99f 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/main/java/org/openecomp/core/util/UniqueValueUtil.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/main/java/org/openecomp/core/util/UniqueValueUtil.java @@ -28,120 +28,120 @@ import org.openecomp.sdc.common.errors.ErrorCode; public class UniqueValueUtil { - private static final String UNIQUE_VALUE_VIOLATION = "UNIQUE_VALUE_VIOLATION"; - private static final String UNIQUE_VALUE_VIOLATION_MSG = "%s with the value '%s' already exists."; - private static final char FORMATTED_UNIQUE_VALUE_SEPARATOR = '_'; - - private final UniqueValueDao uniqueValueDao; - - public UniqueValueUtil(UniqueValueDao uniqueValueDao) { - this.uniqueValueDao = uniqueValueDao; - } - - /** - * Create unique value. - * - * @param type the type - * @param uniqueCombination the unique combination - */ - public void createUniqueValue(String type, String... uniqueCombination) { - String originalEntityName = null; - if (ArrayUtils.isNotEmpty(uniqueCombination)) { - originalEntityName = uniqueCombination[uniqueCombination.length - 1]; + private static final String UNIQUE_VALUE_VIOLATION = "UNIQUE_VALUE_VIOLATION"; + private static final String UNIQUE_VALUE_VIOLATION_MSG = "%s with the value '%s' already exists."; + private static final char FORMATTED_UNIQUE_VALUE_SEPARATOR = '_'; + + private final UniqueValueDao uniqueValueDao; + + public UniqueValueUtil(UniqueValueDao uniqueValueDao) { + this.uniqueValueDao = uniqueValueDao; } - Optional formattedValue = formatValue(uniqueCombination); - if (formattedValue.isPresent()) { - validateUniqueValue(type, formattedValue.get(), originalEntityName); - uniqueValueDao.create(new UniqueValueEntity(type, formattedValue.get())); + /** + * Create unique value. + * + * @param type the type + * @param uniqueCombination the unique combination + */ + public void createUniqueValue(String type, String... uniqueCombination) { + String originalEntityName = null; + if (ArrayUtils.isNotEmpty(uniqueCombination)) { + originalEntityName = uniqueCombination[uniqueCombination.length - 1]; + } + + Optional formattedValue = formatValue(uniqueCombination); + if (formattedValue.isPresent()) { + validateUniqueValue(type, formattedValue.get(), originalEntityName); + uniqueValueDao.create(new UniqueValueEntity(type, formattedValue.get())); + } } - } - - /** - * Delete unique value. - * - * @param type the type - * @param uniqueCombination the unique combination - */ - public void deleteUniqueValue(String type, String... uniqueCombination) { - formatValue(uniqueCombination).ifPresent( - formattedValue -> uniqueValueDao.delete(new UniqueValueEntity(type, formattedValue))); - - } - - /** - * Update unique value. - * - * @param type the type - * @param oldValue the old value - * @param newValue the new value - * @param uniqueContext the unique context - */ - public void updateUniqueValue(String type, String oldValue, String newValue, - String... uniqueContext) { - if (newValue == null || oldValue == null || !newValue.equalsIgnoreCase(oldValue)) { - createUniqueValue(type, CommonMethods.concat(uniqueContext, new String[]{newValue})); - deleteUniqueValue(type, CommonMethods.concat(uniqueContext, new String[]{oldValue})); + + /** + * Delete unique value. + * + * @param type the type + * @param uniqueCombination the unique combination + */ + public void deleteUniqueValue(String type, String... uniqueCombination) { + formatValue(uniqueCombination).ifPresent( + formattedValue -> uniqueValueDao.delete(new UniqueValueEntity(type, formattedValue))); + } - } - - /** - * Validate unique value. - * - * @param type the type - * @param uniqueCombination the unique combination - */ - public void validateUniqueValue(String type, String... uniqueCombination) { - String originalEntityName = null; - if (ArrayUtils.isNotEmpty(uniqueCombination)) { - originalEntityName = uniqueCombination[uniqueCombination.length - 1]; + + /** + * Update unique value. + * + * @param type the type + * @param oldValue the old value + * @param newValue the new value + * @param uniqueContext the unique context + */ + public void updateUniqueValue(String type, String oldValue, String newValue, + String... uniqueContext) { + if (newValue == null || !newValue.equalsIgnoreCase(oldValue)) { + createUniqueValue(type, CommonMethods.concat(uniqueContext, new String[] {newValue})); + deleteUniqueValue(type, CommonMethods.concat(uniqueContext, new String[] {oldValue})); + } } - Optional formattedValue = formatValue(uniqueCombination); - if (formattedValue.isPresent()) { - validateUniqueValue(type, formattedValue.get(), originalEntityName); + /** + * Validate unique value. + * + * @param type the type + * @param uniqueCombination the unique combination + */ + public void validateUniqueValue(String type, String... uniqueCombination) { + String originalEntityName = null; + if (ArrayUtils.isNotEmpty(uniqueCombination)) { + originalEntityName = uniqueCombination[uniqueCombination.length - 1]; + } + + Optional formattedValue = formatValue(uniqueCombination); + if (formattedValue.isPresent()) { + validateUniqueValue(type, formattedValue.get(), originalEntityName); + } } - } - - /** - * Checks if a unique value is taken. - * - * @return true if the unique value is occupied, false otherwise - */ - public boolean isUniqueValueOccupied(String type, String... uniqueCombination) { - return formatValue(uniqueCombination) - .map(formattedValue -> isUniqueValueOccupied(type, formattedValue)) - .orElse(false); - } - - private void validateUniqueValue(String type, String formattedValue, String originalEntityName) { - if (isUniqueValueOccupied(type, formattedValue)) { - throw new CoreException(new ErrorCode.ErrorCodeBuilder() - .withCategory(ErrorCategory.APPLICATION) - .withId(UNIQUE_VALUE_VIOLATION) - .withMessage(String - .format(UNIQUE_VALUE_VIOLATION_MSG, type, originalEntityName)) - .build()); + + private void validateUniqueValue(String type, String formattedValue, String originalEntityName) { + if (isUniqueValueOccupied(type, formattedValue)) { + throw new CoreException(new ErrorCode.ErrorCodeBuilder() + .withCategory(ErrorCategory.APPLICATION) + .withId(UNIQUE_VALUE_VIOLATION) + .withMessage(String + .format(UNIQUE_VALUE_VIOLATION_MSG, type, originalEntityName)) + .build()); + } } - } - private boolean isUniqueValueOccupied(String type, String formattedValue) { - return uniqueValueDao.get(new UniqueValueEntity(type, formattedValue)) != null; - } + /** + * Checks if a unique value is taken. + * + * @return true if the unique value is occupied, false otherwise + */ + public boolean isUniqueValueOccupied(String type, String... uniqueCombination) { + return formatValue(uniqueCombination) + .map(formattedValue -> isUniqueValueOccupied(type, formattedValue)) + .orElse(false); + } - private static Optional formatValue(String[] uniqueCombination) { - if (uniqueCombination == null || uniqueCombination.length == 0 - || getValueWithoutContext(uniqueCombination) == null) { - return Optional.empty(); + private boolean isUniqueValueOccupied(String type, String formattedValue) { + return uniqueValueDao.get(new UniqueValueEntity(type, formattedValue)) != null; } - uniqueCombination[uniqueCombination.length - 1] = - getValueWithoutContext(uniqueCombination).toLowerCase(); - return Optional.of(CommonMethods - .arrayToSeparatedString(uniqueCombination, FORMATTED_UNIQUE_VALUE_SEPARATOR)); - } + private static Optional formatValue(String[] uniqueCombination) { + if (uniqueCombination == null || uniqueCombination.length == 0 + || getValueWithoutContext(uniqueCombination) == null) { + return Optional.empty(); + } - private static String getValueWithoutContext(String... uniqueCombination) { - return uniqueCombination[uniqueCombination.length - 1]; - } + uniqueCombination[uniqueCombination.length - 1] = + getValueWithoutContext(uniqueCombination).toLowerCase(); + return Optional.of(CommonMethods + .arrayToSeparatedString(uniqueCombination, FORMATTED_UNIQUE_VALUE_SEPARATOR)); + } + + private static String getValueWithoutContext(String... uniqueCombination) { + return uniqueCombination[uniqueCombination.length - 1]; + } } -- cgit 1.2.3-korg