1 files changed, 39 insertions, 45 deletions
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 977c5cc27d..eb57672315 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
@@ -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.
@@ -25,59 +25,53 @@ import org.openecomp.sdc.datatypes.error.ErrorMessage;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Predicate;
-
+import java.util.stream.Collectors;
 
 public class MessageContainer {
 
-  private List<ErrorMessage> errorMessageList = new ArrayList<>();
-
-  public List<ErrorMessage> getErrorMessageList() {
-    return errorMessageList;
-  }
+    private final List<ErrorMessage> errorMessageList = new ArrayList<>();
 
-  public MessageBuilder getMessageBuilder() {
-    return new MessageBuilder();
-  }
+    public List<ErrorMessage> getErrorMessageList() {
+        return errorMessageList;
+    }
 
-  /**
-   * Gets error message list by level.
-   *
-   * @param level the level
-   * @return the error message list by level
-   */
-  public List<ErrorMessage> getErrorMessageListByLevel(ErrorLevel level) {
+    public MessageBuilder getMessageBuilder() {
+        return new MessageBuilder();
+    }
 
-    List<ErrorMessage> errors = new ArrayList<>();
-    errorMessageList.stream().filter(new Predicate<ErrorMessage>() {
-      @Override
-      public boolean test(ErrorMessage errorMessage) {
-        return errorMessage.getLevel().equals(level);
-      }
-    }).forEach(errorMessage -> errors.add(errorMessage));
-    return errors;
-  }
+    /**
+     * 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());
+    }
 
-  public class MessageBuilder {
+    public class MessageBuilder {
 
-    String message;
-    ErrorLevel level;
+        String message;
+        ErrorLevel level;
 
-    MessageBuilder setMessage(String message) {
-      this.message = message;
-      return this;
-    }
+        MessageBuilder setMessage(String message) {
+            this.message = message;
+            return this;
+        }
 
-    MessageBuilder setLevel(ErrorLevel level) {
-      this.level = level;
-      return this;
-    }
+        MessageBuilder setLevel(ErrorLevel level) {
+            this.level = level;
+            return this;
+        }
 
-    void create() {
-      ErrorMessage errorMessage = new ErrorMessage(level, message);
-      if (!errorMessageList.contains(errorMessage)) {
-        errorMessageList.add(errorMessage);
-      }
+        void create() {
+            ErrorMessage errorMessage = new ErrorMessage(level, message);
+            if (!errorMessageList.contains(errorMessage)) {
+                errorMessageList.add(errorMessage);
+            }
+        }
     }
-  }
 }