diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types')
4 files changed, 33 insertions, 84 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/FileValidationContext.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/FileValidationContext.java index 81e8931dab..993ea6b4df 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/FileValidationContext.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/FileValidationContext.java @@ -24,6 +24,7 @@ package org.openecomp.core.validation.types; import java.io.ByteArrayInputStream; import java.io.InputStream; + public class FileValidationContext { private String fileName; private MessageContainer messageContainer = new MessageContainer(); @@ -40,7 +41,8 @@ public class FileValidationContext { } public InputStream getContent() { - return new ByteArrayInputStream(content); + ByteArrayInputStream is = new ByteArrayInputStream(content); + return is; } public String getFileName() { diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/GlobalValidationContext.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/GlobalValidationContext.java index e6917e84f6..1fb31a3d8d 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/GlobalValidationContext.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/GlobalValidationContext.java @@ -21,23 +21,24 @@ package org.openecomp.core.validation.types; import org.apache.commons.collections4.CollectionUtils; -import org.openecomp.core.utilities.CommonMethods; -import org.openecomp.core.validation.interfaces.Validator; -import org.openecomp.sdc.common.utils.AsdcCommon; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.openecomp.sdc.logging.context.MdcUtil; +import org.openecomp.sdc.logging.types.LoggerConstants; +import org.openecomp.sdc.logging.types.LoggerErrorCode; import java.io.InputStream; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import java.util.function.BiPredicate; import java.util.stream.Collectors; public class GlobalValidationContext { - private static Logger logger = LoggerFactory.getLogger(Validator.class); + private static Logger logger = (Logger) LoggerFactory.getLogger(GlobalValidationContext.class); private Map<String, FileValidationContext> fileContextMap = new HashMap<>(); private Map<String, MessageContainer> messageContainerMap = new HashMap<>(); @@ -47,18 +48,21 @@ public class GlobalValidationContext { * @param fileName the file name * @param level the level * @param message the message + * @param targetServiceName the target service name + * @param errorDescription the error details */ - public void addMessage(String fileName, ErrorLevel level, String message) { + public void addMessage(String fileName, ErrorLevel level, String message, + String targetServiceName, String errorDescription) { - printLog(fileName, message, level); + printLog(fileName, message, level, targetServiceName, errorDescription); if (fileContextMap.containsKey(fileName)) { - fileContextMap.get(fileName).getMessageContainer().getMessageBuilder().setMessage(message) - .setLevel(level).create(); + fileContextMap.get(fileName).getMessageContainer().getMessageBuilder() + .setMessage(level.toString() + ": " + message).setLevel(level).create(); } else { - if (CommonMethods.isEmpty(fileName)) { - fileName = AsdcCommon.UPLOAD_FILE; - } +// if (CommonMethods.isEmpty(fileName)) { +// fileName = SdcCommon.UPLOAD_FILE; +// } MessageContainer messageContainer; synchronized (this) { messageContainer = messageContainerMap.get(fileName); @@ -67,7 +71,8 @@ public class GlobalValidationContext { messageContainerMap.put(fileName, messageContainer); } } - messageContainer.getMessageBuilder().setMessage(message).setLevel(level).create(); + messageContainer.getMessageBuilder().setMessage(level.toString() + ": " + message) + .setLevel(level).create(); } } @@ -77,12 +82,12 @@ public class GlobalValidationContext { * @param fileName the file name * @return the file content */ - public InputStream getFileContent(String fileName) { + public Optional<InputStream> getFileContent(String fileName) { FileValidationContext fileContext = fileContextMap.get(fileName); if (fileContext == null || fileContext.isEmpty()) { - return null; + return Optional.empty(); } - return fileContext.getContent(); + return Optional.of(fileContext.getContent()); } public void addFileContext(String fileName, byte[] fileContent) { @@ -100,7 +105,8 @@ public class GlobalValidationContext { fileContextMap.entrySet().stream().filter(entry -> CollectionUtils .isNotEmpty(entry.getValue().getMessageContainer().getErrorMessageList())).forEach( entry -> contextMessageContainer.put( - entry.getKey(), entry.getValue().getMessageContainer())); + entry.getKey(), entry.getValue() + .getMessageContainer())); messageContainerMap.entrySet().stream() .filter(entry -> CollectionUtils.isNotEmpty(entry.getValue().getErrorMessageList())) .forEach(entry -> contextMessageContainer.put(entry.getKey(), entry.getValue())); @@ -111,9 +117,12 @@ public class GlobalValidationContext { return fileContextMap; } - private void printLog(String fileName, String message, ErrorLevel level) { + private void printLog(String fileName, String message, ErrorLevel level, String targetServiceName, + String errorDescription) { String messageToPrint = message + " in file[" + fileName + "]"; + MdcUtil.setValuesForMdc(LoggerConstants.TARGET_ENTITY_API, targetServiceName, level.name(), + LoggerErrorCode.DATA_ERROR.getErrorCode(), errorDescription); switch (level) { case ERROR: @@ -130,6 +139,7 @@ public class GlobalValidationContext { } } + public Collection<String> files(BiPredicate<String, GlobalValidationContext> func) { return fileContextMap.keySet().stream().filter(t -> func.test(t, this)) .collect(Collectors.toList()); diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/MessageContainer.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/MessageContainer.java index 9d37bade67..977c5cc27d 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/MessageContainer.java +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/MessageContainer.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; + public class MessageContainer { private List<ErrorMessage> errorMessageList = new ArrayList<>(); diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/MessageContainerUtil.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/MessageContainerUtil.java deleted file mode 100644 index c678bb5014..0000000000 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types/MessageContainerUtil.java +++ /dev/null @@ -1,64 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.core.validation.types; - -import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.openecomp.sdc.datatypes.error.ErrorMessage; - - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class MessageContainerUtil { - - /** - * Gets message by level. - * - * @param level the level - * @param messages the messages - * @return the message by level - */ - public static Map<String, - List<ErrorMessage>> getMessageByLevel( - ErrorLevel level,Map<String,List<ErrorMessage>> messages) { - if (messages == null) { - return null; - } - Map<String, List<ErrorMessage>> filteredMessages = new HashMap<>(); - messages.entrySet().stream().forEach( - entry -> entry.getValue().stream().filter(message -> message.getLevel().equals(level)) - .forEach(message -> addMessage(entry.getKey(), message, filteredMessages - ))); - return filteredMessages; - } - - private static void addMessage(String fileName, ErrorMessage message, - Map<String, List<ErrorMessage>> messages) { - List<ErrorMessage> messageList = messages.get(fileName); - if (messageList == null) { - messageList = new ArrayList<>(); - messages.put(fileName, messageList); - } - messageList.add(message); - } -} |