diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/types')
3 files changed, 96 insertions, 117 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 3bc760c805..9b8e53744c 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 @@ -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. @@ -17,38 +17,35 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - 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(); - private byte[] content; - public FileValidationContext(String fileName, byte[] fileContent) { - this.fileName = fileName; - this.content = fileContent; - } + private String fileName; + private MessageContainer messageContainer = new MessageContainer(); + private byte[] content; + public FileValidationContext(String fileName, byte[] fileContent) { + this.fileName = fileName; + this.content = fileContent; + } - MessageContainer getMessageContainer() { - return this.messageContainer; - } + MessageContainer getMessageContainer() { + return this.messageContainer; + } - public InputStream getContent() { - return new ByteArrayInputStream(content); - } + public InputStream getContent() { + return new ByteArrayInputStream(content); + } - public String getFileName() { - return this.fileName; - } + public String getFileName() { + return this.fileName; + } - public boolean isEmpty() { - return content == null || content.length == 0; - } + public boolean isEmpty() { + return content == null || content.length == 0; + } } 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 42ea681b1b..b5ebf11240 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 @@ -13,15 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.openecomp.core.validation.types; -import org.apache.commons.collections4.CollectionUtils; -import org.openecomp.core.validation.ErrorMessageCode; -import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.openecomp.sdc.logging.api.Logger; -import org.openecomp.sdc.logging.api.LoggerFactory; - import java.io.InputStream; import java.util.Collection; import java.util.HashMap; @@ -29,95 +22,89 @@ import java.util.Map; import java.util.Optional; import java.util.function.BiPredicate; import java.util.stream.Collectors; +import org.apache.commons.collections4.CollectionUtils; +import org.openecomp.core.validation.ErrorMessageCode; +import org.openecomp.sdc.datatypes.error.ErrorLevel; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; public class GlobalValidationContext { - private static final Logger LOGGER = LoggerFactory.getLogger(GlobalValidationContext.class); - private final Map<String, FileValidationContext> fileContextMap = new HashMap<>(); - private final Map<String, MessageContainer> messageContainerMap = new HashMap<>(); - private ErrorMessageCode messageCode; + private static final Logger LOGGER = LoggerFactory.getLogger(GlobalValidationContext.class); + private final Map<String, FileValidationContext> fileContextMap = new HashMap<>(); + private final Map<String, MessageContainer> messageContainerMap = new HashMap<>(); + private ErrorMessageCode messageCode; - public ErrorMessageCode getMessageCode() { - return messageCode; - } - - public void setMessageCode(ErrorMessageCode messageCode) { - this.messageCode = messageCode; - } - - - /** - * Add message. - * - * @param fileName the file name - * @param level the level - * @param message the message - */ - public void addMessage(String fileName, ErrorLevel level, String message) { - - LOGGER.debug("'{}' [{}] in file '{}' ", message, level, fileName); - - if (fileContextMap.containsKey(fileName)) { - fileContextMap.get(fileName).getMessageContainer().getMessageBuilder() - .setMessage(level.toString() + ": " + message).setLevel(level).create(); - } else { - MessageContainer messageContainer; - synchronized (this) { - messageContainer = messageContainerMap.computeIfAbsent(fileName, k -> new MessageContainer()); - } - messageContainer.getMessageBuilder().setMessage(level.toString() + ": " + message) - .setLevel(level).create(); + public ErrorMessageCode getMessageCode() { + return messageCode; } - } - /** - * Gets file content. - * - * @param fileName the file name - * @return the file content - */ - public Optional<InputStream> getFileContent(String fileName) { - FileValidationContext fileContext = fileContextMap.get(fileName); - if (fileContext == null || fileContext.isEmpty()) { - return Optional.empty(); + public void setMessageCode(ErrorMessageCode messageCode) { + this.messageCode = messageCode; } - return Optional.of(fileContext.getContent()); - } - public void addFileContext(String fileName, byte[] fileContent) { - fileContextMap.put(fileName, new FileValidationContext(fileName, fileContent)); - } + /** + * Add message. + * + * @param fileName the file name + * @param level the level + * @param message the message + */ + public void addMessage(String fileName, ErrorLevel level, String message) { + LOGGER.debug("'{}' [{}] in file '{}' ", message, level, fileName); + if (fileContextMap.containsKey(fileName)) { + fileContextMap.get(fileName).getMessageContainer().getMessageBuilder().setMessage(level.toString() + ": " + message).setLevel(level) + .create(); + } else { + MessageContainer messageContainer; + synchronized (this) { + messageContainer = messageContainerMap.computeIfAbsent(fileName, k -> new MessageContainer()); + } + messageContainer.getMessageBuilder().setMessage(level.toString() + ": " + message).setLevel(level).create(); + } + } - /** - * Gets context message containers. - * - * @return the context message containers - */ - public Map<String, MessageContainer> getContextMessageContainers() { + /** + * Gets file content. + * + * @param fileName the file name + * @return the file content + */ + public Optional<InputStream> getFileContent(String fileName) { + FileValidationContext fileContext = fileContextMap.get(fileName); + if (fileContext == null || fileContext.isEmpty()) { + return Optional.empty(); + } + return Optional.of(fileContext.getContent()); + } - Map<String, MessageContainer> contextMessageContainer = new HashMap<>(); - fileContextMap.entrySet().stream().filter(entry -> CollectionUtils - .isNotEmpty(entry.getValue().getMessageContainer().getErrorMessageList())).forEach( - entry -> contextMessageContainer.put( - entry.getKey(), entry.getValue() - .getMessageContainer())); - messageContainerMap.entrySet().stream() - .filter(entry -> CollectionUtils.isNotEmpty(entry.getValue().getErrorMessageList())) - .forEach(entry -> contextMessageContainer.put(entry.getKey(), entry.getValue())); - return contextMessageContainer; - } + public void addFileContext(String fileName, byte[] fileContent) { + fileContextMap.put(fileName, new FileValidationContext(fileName, fileContent)); + } - public Map<String, FileValidationContext> getFileContextMap() { - return fileContextMap; - } + /** + * Gets context message containers. + * + * @return the context message containers + */ + public Map<String, MessageContainer> getContextMessageContainers() { + Map<String, MessageContainer> contextMessageContainer = new HashMap<>(); + fileContextMap.entrySet().stream().filter(entry -> CollectionUtils.isNotEmpty(entry.getValue().getMessageContainer().getErrorMessageList())) + .forEach(entry -> contextMessageContainer.put(entry.getKey(), entry.getValue().getMessageContainer())); + messageContainerMap.entrySet().stream().filter(entry -> CollectionUtils.isNotEmpty(entry.getValue().getErrorMessageList())) + .forEach(entry -> contextMessageContainer.put(entry.getKey(), entry.getValue())); + return contextMessageContainer; + } - public Collection<String> files(BiPredicate<String, GlobalValidationContext> func) { - return fileContextMap.keySet().stream().filter(t -> func.test(t, this)) - .collect(Collectors.toList()); - } + public Map<String, FileValidationContext> getFileContextMap() { + return fileContextMap; + } - public Collection<String> getFiles() { - return this.getFileContextMap().keySet(); - } + public Collection<String> files(BiPredicate<String, GlobalValidationContext> func) { + return fileContextMap.keySet().stream().filter(t -> func.test(t, this)).collect(Collectors.toList()); + } + public Collection<String> getFiles() { + return this.getFileContextMap().keySet(); + } } 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 eb57672315..bbe6247b76 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 @@ -17,15 +17,13 @@ * 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.List; import java.util.stream.Collectors; +import org.openecomp.sdc.datatypes.error.ErrorLevel; +import org.openecomp.sdc.datatypes.error.ErrorMessage; public class MessageContainer { @@ -40,16 +38,13 @@ public class MessageContainer { } /** - * Gets error message list by level. - * Only this level, not this level and above + * Gets error message list by level. Only this level, not this level and above * * @param level the level * @return the error message list by level */ public List<ErrorMessage> getErrorMessageListByLevel(ErrorLevel level) { - return errorMessageList.stream() - .filter(message -> message.getLevel().equals(level)) - .collect(Collectors.toList()); + return errorMessageList.stream().filter(message -> message.getLevel().equals(level)).collect(Collectors.toList()); } public class MessageBuilder { |