1 files changed, 17 insertions, 26 deletions

diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/PnfdQueryExecutor.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/PnfdQueryExecutor.java
index 890dedb2a7..375dd2aa1a 100644
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/PnfdQueryExecutor.java
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/PnfdQueryExecutor.java
@@ -16,7 +16,6 @@
  *  SPDX-License-Identifier: Apache-2.0
  *  ============LICENSE_END=========================================================
  */
-
 package org.openecomp.core.converter.impl.pnfd;
 
 import java.util.List;
@@ -33,36 +32,32 @@ import org.openecomp.core.converter.pnfd.model.ConversionQuery;
 public class PnfdQueryExecutor {
 
     private PnfdQueryExecutor() {
-
     }
 
     /**
      * Finds if a YAML object contains the provided YAML query.
-     * @param conversionQuery   The query
-     * @param yamlObject        The YAML object to be searched
-     * @return
-     * {@code true} if the YAML query structure was found in the YAML object, {@code false} otherwise.
+     *
+     * @param conversionQuery The query
+     * @param yamlObject      The YAML object to be searched
+     * @return {@code true} if the YAML query structure was found in the YAML object, {@code false} otherwise.
      */
     public static boolean find(final ConversionQuery conversionQuery, final Object yamlObject) {
         return find(conversionQuery.getQuery(), yamlObject);
     }
 
     /**
-     * Recursive structure combined with {@link #findMap(Map, Map)} to find if a YAML object contains the provided YAML query.
-     * Compares the objects if it's a scalar value, otherwise go further in the YAML hierarchical structure
-     * calling the {@link #findMap(Map, Map)}.
-     * @param query        The current query
-     * @param yamlObject   The current YAML object to be searched
-     * @return
-     * {@code true} if the YAML query structure was found in the YAML object, {@code false} otherwise.
+     * Recursive structure combined with {@link #findMap(Map, Map)} to find if a YAML object contains the provided YAML query. Compares the objects if
+     * it's a scalar value, otherwise go further in the YAML hierarchical structure calling the {@link #findMap(Map, Map)}.
+     *
+     * @param query      The current query
+     * @param yamlObject The current YAML object to be searched
+     * @return {@code true} if the YAML query structure was found in the YAML object, {@code false} otherwise.
      */
     private static boolean find(final Object query, final Object yamlObject) {
         if (query == null) {
             return true;
         }
-
         checkSupportedQueryType(query);
-
         if (query instanceof String) {
             return query.equals(yamlObject);
         }
@@ -74,20 +69,18 @@ public class PnfdQueryExecutor {
 
     /**
      * Recursive structure combined with {@link #find(Object, Object)} to find if a YAML object contains the provided YAML query.     *
-     * @param query        The query current object
-     * @param yamlObject   The YAML object to be searched
-     * @return
-     * {@code true} if the YAML query structure was found in the YAML object, {@code false} otherwise.
+     *
+     * @param query      The query current object
+     * @param yamlObject The YAML object to be searched
+     * @return {@code true} if the YAML query structure was found in the YAML object, {@code false} otherwise.
      */
     private static boolean findMap(final Map query, final Map yamlObject) {
         if (MapUtils.isEmpty(query) || MapUtils.isEmpty(yamlObject)) {
             return false;
         }
-
         if (!yamlObject.keySet().containsAll(query.keySet())) {
             return false;
         }
-
         return query.entrySet().parallelStream().allMatch(queryEntryObj -> {
             final Entry queryEntry = (Entry) queryEntryObj;
             return find(queryEntry.getValue(), yamlObject.get(queryEntry.getKey()));
@@ -96,7 +89,8 @@ public class PnfdQueryExecutor {
 
     /**
      * Checks the supported types for a query.
-     * @param query    the query to check
+     *
+     * @param query the query to check
      */
     private static void checkSupportedQueryType(final Object query) {
         if (query instanceof String || query instanceof Map) {
@@ -105,9 +99,6 @@ public class PnfdQueryExecutor {
         if (query instanceof List || query instanceof Set) {
             throw new QueryOperationNotSupportedException("Yaml list query is not supported yet");
         }
-        throw new QueryOperationNotSupportedException(
-            String.format("Yaml query operation for '%s' is not supported yet", query.getClass())
-        );
+        throw new QueryOperationNotSupportedException(String.format("Yaml query operation for '%s' is not supported yet", query.getClass()));
     }
-
 }