Update license to not be javadoc

Issue-ID: OPTFRA-466
Change-Id: Ic3b665edccd81efeaacdb9b032d3bd5fc7a8154c
Signed-off-by: Jerry Flood <jflood@att.com>

3 files changed, 11 insertions, 11 deletions

diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml
index 5811df7..3f0815f 100644
--- a/cmso-sonar/pom.xml
+++ b/cmso-sonar/pom.xml
@@ -27,7 +27,7 @@
 		<version>1.0.1-SNAPSHOT</version>

 	</parent>

 

-	<groupId>org.onap.optf.cmso</groupId>

+	<groupId>org.onap.optf.cmso.sonar</groupId>

 	<artifactId>cmso-sonar</artifactId>

 

 	<name>cmso-sonar</name>

@@ -91,6 +91,7 @@
 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-failsafe-plugin</artifactId>

 				<configuration>

+					<testSourceDirectory>${project.basedir}/src/it/java</testSourceDirectory>

 					<skipITs>${skipIntegrationTests}</skipITs>

 				</configuration>

 			</plugin>

diff --git a/cmso-sonar/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java b/cmso-sonar/src/it/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
index 063a9b4..d6eccb3 100644
--- a/cmso-sonar/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java
+++ b/cmso-sonar/src/it/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
@@ -24,18 +24,17 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 
-public class IT_FullIntegrationTest {
+public class ItFullIntegrationTest {
 
     private Properties env = new Properties();
 
     @Test
     public void runTest() throws IOException {
-        InputStream is = new FileInputStream(new File("src/test/resources/integration.properties"));
+        InputStream is = new FileInputStream(new File("src/it/resources/integration.properties"));
         env.load(is);
         Process process = null;
         try {
@@ -121,13 +120,14 @@ public class IT_FullIntegrationTest {
         try {
             Files.walk(src).forEach(s -> {
                 try {
-                    Path d = dest.resolve(src.relativize(s));
+                    Path dpath = dest.resolve(src.relativize(s));
                     if (Files.isDirectory(s)) {
-                        if (!Files.exists(d))
-                            Files.createDirectory(d);
+                        if (!Files.exists(dpath)) {
+                            Files.createDirectory(dpath);
+                        }
                         return;
                     }
-                    Files.copy(s, d);
+                    Files.copy(s, dpath);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -138,14 +138,13 @@ public class IT_FullIntegrationTest {
     }
 
     private ProcessBuilder buildCommand() {
-        ProcessBuilder processBuilder = new ProcessBuilder();
         List<String> command = new ArrayList<>();
         String basepath = env.getProperty("base.path", "./");
-        File workdir = new File(env.getProperty("workdir", "./docker/integration"));
         command.add("/bin/bash");
         command.add("-x");
         command.add(basepath + "ete_test.sh");
-        Map<String, String> environment = processBuilder.environment();
+        File workdir = new File(env.getProperty("workdir", "./docker/integration"));
+        ProcessBuilder processBuilder = new ProcessBuilder();
         processBuilder.directory(workdir);
         processBuilder.command(command);
         return processBuilder;
diff --git a/cmso-sonar/src/test/resources/integration.properties b/cmso-sonar/src/it/resources/integration.properties
index 48957a0..48957a0 100644
--- a/cmso-sonar/src/test/resources/integration.properties
+++ b/cmso-sonar/src/it/resources/integration.properties