From ca297aeb432b3d718bf09f0bac7b9f051c26e66d Mon Sep 17 00:00:00 2001 From: vempo Date: Tue, 30 Jan 2018 21:35:14 +0200 Subject: Removed log constants Removed constants associated with audit/metrics logging. Deleted unused code. Some other safe cleanup and refactoring. Change-Id: Idfda72e1fb27ca695a74f2a09cb46381c9caed1a Issue-ID: SDC-772 Signed-off-by: vempo --- .../main/java/org/openecomp/sdc/common/utils/CommonUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp') diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java index 72485d7162..25c89e1270 100644 --- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java +++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java @@ -31,9 +31,6 @@ import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.common.errors.Messages; -import org.openecomp.sdc.logging.types.LoggerConstants; -import org.openecomp.sdc.logging.types.LoggerErrorDescription; -import org.slf4j.MDC; import java.io.ByteArrayInputStream; import java.io.File; @@ -49,6 +46,10 @@ import java.util.zip.ZipInputStream; public class CommonUtil { + private CommonUtil() { + // prevent instantiation + } + public static FileContentHandler validateAndUploadFileContent(OnboardingTypesEnum type, byte[] uploadedFileData) throws IOException { @@ -113,7 +114,6 @@ public class CommonUtil { private static void validateNoFolders(List folderList) { if (CollectionUtils.isNotEmpty(folderList)) { - MDC.put(LoggerConstants.ERROR_DESCRIPTION, LoggerErrorDescription.INVALID_ZIP); throw new CoreException((new ErrorCode.ErrorCodeBuilder()) .withMessage(Messages.ZIP_SHOULD_NOT_CONTAIN_FOLDERS.getErrorMessage()) .withId(Messages.ZIP_SHOULD_NOT_CONTAIN_FOLDERS.getErrorMessage()) @@ -151,6 +151,6 @@ public class CommonUtil { public static boolean isFileOriginFromZip(String fileOrigin){ return Objects.nonNull(fileOrigin) - && fileOrigin.toLowerCase().equals(OnboardingTypesEnum.ZIP.toString()); + && fileOrigin.equalsIgnoreCase(OnboardingTypesEnum.ZIP.toString()); } } -- cgit 1.2.3-korg