Onboarding build optimization incl Qual Control

Sonar fixes, incremental build enhancements and Quality control mechanism integration.

Change-Id: I118d7fc0cc50c1eddb94137310c00afaaa3aaffb
Issue-ID: SDC-1189
Signed-off-by: GAUTAMS <gautams@amdocs.com>

4 files changed, 191 insertions, 24 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml
index 84696e4ae3..28842ce6b6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml
@@ -94,6 +94,7 @@
                     <parallel>classes</parallel>
                     <threadCount>1</threadCount>
                     <forkCount>${fork.count}</forkCount>
+                    <forkMode>${fork.mode}</forkMode>
                     <printSummary>false</printSummary>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <rerunFailingTestsCount>1</rerunFailingTestsCount>
@@ -104,6 +105,7 @@
                         <logback.configurationFile>src/test/resources/logback-test.xml</logback.configurationFile>
                     </systemPropertyVariables>
                     <useSystemClassLoader>${useSystemClassLoader}</useSystemClassLoader>
+                    <skip>${skipTestRun}</skip>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml
index 2eb7df7474..0b2cb5f2a8 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml
@@ -86,13 +86,6 @@
             <artifactId>openecomp-sdc-validation-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.openecomp.sdc</groupId>
-            <artifactId>openecomp-sdc-validation-sdk</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java
new file mode 100644
index 0000000000..41fbf45c64
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openecomp.sdc.validation.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.io.IOUtils;
+import org.openecomp.core.utilities.file.FileUtils;
+import org.openecomp.core.utilities.json.JsonUtil;
+import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
+import org.openecomp.core.validation.types.GlobalValidationContext;
+import org.openecomp.core.validation.types.MessageContainer;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
+import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
+import org.openecomp.sdc.heat.datatypes.model.Resource;
+import org.openecomp.sdc.heat.services.HeatStructureUtil;
+import org.openecomp.sdc.heat.services.manifest.ManifestUtil;
+import org.openecomp.sdc.validation.ResourceValidator;
+import org.openecomp.sdc.validation.ValidationContext;
+import org.openecomp.sdc.validation.Validator;
+import org.openecomp.sdc.validation.base.ResourceBaseValidator;
+import org.testng.Assert;
+
+/**
+ * @author TALIO
+ * @since 26 Feb 2017
+ */
+public class ValidationTestUtil {
+
+  private ValidationTestUtil(){}
+
+  public static GlobalValidationContext createGlobalContextFromPath(String path) {
+    GlobalValidationContext globalValidationContext = new GlobalValidationContext();
+    Map<String, byte[]> contentMap = getContentMapByPath(path);
+    if (contentMap == null) {
+      return null;
+    }
+    contentMap.forEach(globalValidationContext::addFileContext);
+
+    return globalValidationContext;
+  }
+
+  private static Map<String, byte[]> getContentMapByPath(String path) {
+    Map<String, byte[]> contentMap = new HashMap<>();
+    URL url = ValidationTestUtil.class.getResource(path);
+    File pathFile = new File(url.getFile());
+    File[] files;
+    if (pathFile.isDirectory()) {
+      files = pathFile.listFiles();
+    } else {
+      files = new File[]{pathFile};
+    }
+
+    if (files == null || files.length == 0) {
+      return null;
+    }
+
+    for (File file : files) {
+
+      try (FileInputStream fis = new FileInputStream(file)) {
+        contentMap.put(file.getName(), FileUtils.toByteArray(fis));
+      } catch (IOException e) {
+        throw new RuntimeException("Failed to read file: " + file, e);
+      }
+
+    }
+    return contentMap;
+  }
+
+  public static Map<String, MessageContainer> testValidator(Validator validator, String path) {
+
+    GlobalValidationContext globalValidationContext = createGlobalContextFromPath(path);
+    validator.validate(globalValidationContext);
+
+    assert globalValidationContext != null;
+    return globalValidationContext.getContextMessageContainers();
+
+
+  }
+
+  public static Map<String, MessageContainer> testValidator(ResourceBaseValidator baseValidator,
+          ResourceValidator resourceValidator,
+          String resourceTypeToValidate, String path) {
+
+    GlobalValidationContext globalContext = Objects.requireNonNull(
+            createGlobalContextFromPath(path), "Global validation context cannot be null");
+
+    ManifestContent manifestContent = ValidationUtil.validateManifest(globalContext);
+    Map<String, FileData.Type> fileTypeMap = ManifestUtil.getFileTypeMap(manifestContent);
+    Map<String, FileData> fileEnvMap = ManifestUtil.getFileAndItsEnv(manifestContent);
+
+    validateFiles(baseValidator, resourceValidator, globalContext, fileEnvMap, fileTypeMap,
+            resourceTypeToValidate);
+
+    return globalContext.getContextMessageContainers();
+  }
+
+  private static void validateFiles(ResourceBaseValidator baseValidator,
+          ResourceValidator resourceValidator,
+          GlobalValidationContext globalContext,
+          Map<String, FileData> fileEnvMap,
+          Map<String, FileData.Type> fileTypeMap,
+          String resourceTypeToValidate) {
+
+    Collection<String> files = globalContext.getFiles();
+    for(String fileName : files){
+      if(FileData.isHeatFile(fileTypeMap.get(fileName))) {
+        HeatOrchestrationTemplate heatOrchestrationTemplate =
+                ValidationUtil.checkHeatOrchestrationPreCondition(fileName, globalContext);
+
+        if (Objects.isNull(heatOrchestrationTemplate)) {
+          continue;
+        }
+
+        ValidationContext validationContext = baseValidator.createValidationContext(fileName,
+                fileEnvMap.get(fileName) == null ? null : fileEnvMap.get(fileName).getFile(),
+                heatOrchestrationTemplate, globalContext);
+
+        validateResources(fileName, resourceValidator, resourceTypeToValidate, validationContext,
+                globalContext);
+      }
+    }
+  }
+
+  private static void validateResources(String fileName, ResourceValidator resourceValidator,
+          String resourceTypeToValidate, ValidationContext validationContext,
+          GlobalValidationContext globalValidationContext){
+
+    HeatOrchestrationTemplate heatOrchestrationTemplate =
+            ValidationUtil.checkHeatOrchestrationPreCondition(fileName, globalValidationContext);
+
+    Map<String, Resource> resourcesMap =
+            Objects.requireNonNull(heatOrchestrationTemplate, "Orchestration template cannot be null").getResources();
+
+    if(MapUtils.isEmpty(resourcesMap)){
+      return;
+    }
+
+    resourcesMap.entrySet()
+                .stream()
+                .filter(resourceEntry -> isResourceNeedToBeTested(resourceEntry.getValue().getType(), resourceTypeToValidate))
+                .forEach(resourceEntry ->
+                                 resourceValidator.validate
+                                                           (fileName, resourceEntry, globalValidationContext, validationContext));
+  }
+
+  private static boolean isResourceNeedToBeTested(String currResource, String resourceToTest){
+    if(Objects.isNull(resourceToTest)){
+      return HeatStructureUtil.isNestedResource(currResource);
+    }
+
+    return currResource.equals(resourceToTest);
+  }
+
+  public static void validateErrorMessage(String actualMessage, String expected, String... params) {
+
+    Assert.assertEquals(actualMessage.replace("\n", "").replace("\r", ""),
+            ErrorMessagesFormatBuilder.getErrorWithParameters(expected, params).replace("\n", "")
+                                      .replace("\r", ""));
+  }
+
+  public static Map<String, Object> getResourceMap(String configFileName) throws IOException {
+    URL mockResource = ValidationTestUtil.class.getResource(configFileName);
+    String json = IOUtils.toString(mockResource.openStream(), "UTF-8");
+    return JsonUtil.json2Object(json, Map.class);
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml
index 180e3184fc..ad49dac2f6 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml
@@ -42,22 +42,5 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${mvn.jar.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 
 </project>