1 files changed, 39 insertions, 52 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/util/MessageContainerUtil.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/util/MessageContainerUtil.java
index aab83837b8..e5ee3f2e95 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/util/MessageContainerUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/src/main/java/org/openecomp/core/validation/util/MessageContainerUtil.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,69 +17,56 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.core.validation.util;
 
-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;
-
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.datatypes.error.ErrorMessage;
 
 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().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.computeIfAbsent(fileName, k -> new ArrayList<>());
-    messageList.add(message);
-  }
+    /**
+     * 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().forEach(entry -> entry.getValue().stream().filter(message -> message.getLevel().equals(level))
+            .forEach(message -> addMessage(entry.getKey(), message, filteredMessages)));
+        return filteredMessages;
+    }
 
-  public static String getErrorMessagesListAsString(Map<String, List<ErrorMessage>> messages) {
-    StringBuilder concatErrorMessage = new StringBuilder();
+    private static void addMessage(String fileName, ErrorMessage message, Map<String, List<ErrorMessage>> messages) {
+        List<ErrorMessage> messageList = messages.computeIfAbsent(fileName, k -> new ArrayList<>());
+        messageList.add(message);
+    }
 
-    for (Map.Entry<String, List<ErrorMessage>> errorMessageEntry : messages.entrySet()) {
-      appendErrorMessageAsString(concatErrorMessage, errorMessageEntry.getKey(),
-          errorMessageEntry.getValue());
+    public static String getErrorMessagesListAsString(Map<String, List<ErrorMessage>> messages) {
+        StringBuilder concatErrorMessage = new StringBuilder();
+        for (Map.Entry<String, List<ErrorMessage>> errorMessageEntry : messages.entrySet()) {
+            appendErrorMessageAsString(concatErrorMessage, errorMessageEntry.getKey(), errorMessageEntry.getValue());
+        }
+        return concatErrorMessage.toString();
     }
-    return concatErrorMessage.toString();
-  }
 
-  private static void appendErrorMessageAsString(StringBuilder concatErrorMessage,
-                                                 String fileName,
-                                                 List<ErrorMessage> errorMessageList) {
-    for (ErrorMessage errorMessage : errorMessageList) {
-      addErrorMessage(concatErrorMessage, fileName, errorMessage);
+    private static void appendErrorMessageAsString(StringBuilder concatErrorMessage, String fileName, List<ErrorMessage> errorMessageList) {
+        for (ErrorMessage errorMessage : errorMessageList) {
+            addErrorMessage(concatErrorMessage, fileName, errorMessage);
+        }
     }
-  }
 
-  private static void addErrorMessage(StringBuilder concatErrorMessage,
-                                      String fileName,
-                                      ErrorMessage errorMessage) {
-    concatErrorMessage.append(fileName).append(" : ");
-    concatErrorMessage.append(errorMessage.getMessage());
-    concatErrorMessage.append("\n");
-  }
+    private static void addErrorMessage(StringBuilder concatErrorMessage, String fileName, ErrorMessage errorMessage) {
+        concatErrorMessage.append(fileName).append(" : ");
+        concatErrorMessage.append(errorMessage.getMessage());
+        concatErrorMessage.append("\n");
+    }
 }