1 files changed, 64 insertions, 88 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ForbiddenResourceGuideLineValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ForbiddenResourceGuideLineValidator.java
index 5ce9aa7aa5..9c8c10a7fe 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ForbiddenResourceGuideLineValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ForbiddenResourceGuideLineValidator.java
@@ -12,10 +12,13 @@
  * 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.
-*/
-
+ */
 package org.openecomp.sdc.validation.impl.validators;
 
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import org.apache.commons.collections4.MapUtils;
 import org.openecomp.core.validation.ErrorMessageCode;
 import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
@@ -32,103 +35,76 @@ import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.validation.Validator;
 import org.openecomp.sdc.validation.util.ValidationUtil;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
 public class ForbiddenResourceGuideLineValidator implements Validator {
-  private static Set<String> forbiddenResources = new HashSet<>();
-  private static final ErrorMessageCode ERROR_CODE_FRG_1 = new ErrorMessageCode("FRG1");
-  private static final ErrorMessageCode ERROR_CODE_FRG_2 = new ErrorMessageCode("FRG2");
-  private static final ErrorMessageCode ERROR_CODE_FRG_3 = new ErrorMessageCode("FRG3");
-
-  private static final Logger LOGGER =  LoggerFactory
-          .getLogger(ForbiddenResourceGuideLineValidator.class);
-
-  @Override
-  public void init(Map<String, Object> properties) {
-    Map<String, Map<String, Object>> forbiddenResourcesMap =
-        (Map<String, Map<String, Object>>) properties.get("forbiddenResourceTypes");
-
-    forbiddenResourcesMap.entrySet().stream()
-        .filter(entry -> isResourceEnabled(entry.getValue().get("enable")))
-        .forEach(entry -> forbiddenResources.add(entry.getKey()));
-  }
 
-  private boolean isResourceEnabled(Object enableValue) {
-    if (Objects.isNull(enableValue)) {
-      return true;
+    private static final ErrorMessageCode ERROR_CODE_FRG_1 = new ErrorMessageCode("FRG1");
+    private static final ErrorMessageCode ERROR_CODE_FRG_2 = new ErrorMessageCode("FRG2");
+    private static final ErrorMessageCode ERROR_CODE_FRG_3 = new ErrorMessageCode("FRG3");
+    private static final Logger LOGGER = LoggerFactory.getLogger(ForbiddenResourceGuideLineValidator.class);
+    private static Set<String> forbiddenResources = new HashSet<>();
+
+    @Override
+    public void init(Map<String, Object> properties) {
+        Map<String, Map<String, Object>> forbiddenResourcesMap = (Map<String, Map<String, Object>>) properties.get("forbiddenResourceTypes");
+        forbiddenResourcesMap.entrySet().stream().filter(entry -> isResourceEnabled(entry.getValue().get("enable")))
+            .forEach(entry -> forbiddenResources.add(entry.getKey()));
     }
 
-    if (enableValue instanceof Boolean) {
-      return (Boolean)enableValue;
-    }
-
-    return Boolean.valueOf((String) enableValue);
-  }
-
-
-  @Override
-  public void validate(GlobalValidationContext globalContext) {
-    ManifestContent manifestContent;
-    try {
-      manifestContent = ValidationUtil.validateManifest(globalContext);
-    } catch (Exception exception) {
-      LOGGER.error("Failed to validate manifest file", exception);
-      return;
+    private boolean isResourceEnabled(Object enableValue) {
+        if (Objects.isNull(enableValue)) {
+            return true;
+        }
+        if (enableValue instanceof Boolean) {
+            return (Boolean) enableValue;
+        }
+        return Boolean.valueOf((String) enableValue);
     }
 
-    Map<String, FileData.Type> fileTypeMap = ManifestUtil.getFileTypeMap(manifestContent);
-
-    globalContext.getFiles().stream()
-        .filter(fileName -> FileData
-            .isHeatFile(fileTypeMap.get(fileName)))
-        .forEach(fileName -> validate(fileName, globalContext));
-  }
-
-  private void validate(String fileName, GlobalValidationContext globalContext) {
-    globalContext.setMessageCode(ERROR_CODE_FRG_3);
-    HeatOrchestrationTemplate
-        heatOrchestrationTemplate = ValidationUtil.checkHeatOrchestrationPreCondition(
-        fileName, globalContext);
-    if (heatOrchestrationTemplate == null) {
-      return;
+    @Override
+    public void validate(GlobalValidationContext globalContext) {
+        ManifestContent manifestContent;
+        try {
+            manifestContent = ValidationUtil.validateManifest(globalContext);
+        } catch (Exception exception) {
+            LOGGER.error("Failed to validate manifest file", exception);
+            return;
+        }
+        Map<String, FileData.Type> fileTypeMap = ManifestUtil.getFileTypeMap(manifestContent);
+        globalContext.getFiles().stream().filter(fileName -> FileData.isHeatFile(fileTypeMap.get(fileName)))
+            .forEach(fileName -> validate(fileName, globalContext));
     }
 
-    validateResourceTypeIsForbidden(fileName, heatOrchestrationTemplate, globalContext);
-  }
-
-  private void validateResourceTypeIsForbidden(String fileName,
-                                               HeatOrchestrationTemplate heatOrchestrationTemplate,
-                                               GlobalValidationContext globalContext) {
-    Map<String, Resource> resourcesMap = heatOrchestrationTemplate.getResources();
-    if (MapUtils.isEmpty(resourcesMap)) {
-      return;
+    private void validate(String fileName, GlobalValidationContext globalContext) {
+        globalContext.setMessageCode(ERROR_CODE_FRG_3);
+        HeatOrchestrationTemplate heatOrchestrationTemplate = ValidationUtil.checkHeatOrchestrationPreCondition(fileName, globalContext);
+        if (heatOrchestrationTemplate == null) {
+            return;
+        }
+        validateResourceTypeIsForbidden(fileName, heatOrchestrationTemplate, globalContext);
     }
 
-    for (Map.Entry<String, Resource> resourceEntry : resourcesMap.entrySet()) {
-      String resourceType = resourceEntry.getValue().getType();
-      if (Objects.isNull(resourceType)) {
-        globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
-                .getErrorWithParameters(ERROR_CODE_FRG_1,
-                        Messages.INVALID_RESOURCE_TYPE.getErrorMessage(),"null",
-                    resourceEntry.getKey()));
-      } else {
-        if (isResourceForbidden(resourceType)) {
-           globalContext.addMessage(
-              fileName,
-              ErrorLevel.WARNING,
-              ErrorMessagesFormatBuilder
-                  .getErrorWithParameters(ERROR_CODE_FRG_2, Messages.FORBIDDEN_RESOURCE_IN_USE
-                          .getErrorMessage(),
-                      resourceType, resourceEntry.getKey()));
+    private void validateResourceTypeIsForbidden(String fileName, HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                                 GlobalValidationContext globalContext) {
+        Map<String, Resource> resourcesMap = heatOrchestrationTemplate.getResources();
+        if (MapUtils.isEmpty(resourcesMap)) {
+            return;
+        }
+        for (Map.Entry<String, Resource> resourceEntry : resourcesMap.entrySet()) {
+            String resourceType = resourceEntry.getValue().getType();
+            if (Objects.isNull(resourceType)) {
+                globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+                    .getErrorWithParameters(ERROR_CODE_FRG_1, Messages.INVALID_RESOURCE_TYPE.getErrorMessage(), "null", resourceEntry.getKey()));
+            } else {
+                if (isResourceForbidden(resourceType)) {
+                    globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+                        .getErrorWithParameters(ERROR_CODE_FRG_2, Messages.FORBIDDEN_RESOURCE_IN_USE.getErrorMessage(), resourceType,
+                            resourceEntry.getKey()));
+                }
+            }
         }
-      }
     }
-  }
 
-  private boolean isResourceForbidden(String resourceType) {
-    return forbiddenResources.contains(resourceType);
-  }
+    private boolean isResourceForbidden(String resourceType) {
+        return forbiddenResources.contains(resourceType);
+    }
 }