Post Init Service Starter

minor fixes

Remove JU generated garbage files

Issue-ID: AAF-835
Change-Id: I476291f1f1140f0640ed49452f8a5dabb28d9c30
Signed-off-by: Instrumental <jonathan.gathman@att.com>

7 files changed, 81 insertions, 70 deletions

diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/TimeTaken.java b/misc/env/src/main/java/org/onap/aaf/misc/env/TimeTaken.java
index a1a81b9d..58c588f6 100644
--- a/misc/env/src/main/java/org/onap/aaf/misc/env/TimeTaken.java
+++ b/misc/env/src/main/java/org/onap/aaf/misc/env/TimeTaken.java
@@ -77,8 +77,8 @@ public abstract class TimeTaken {
         end = System.nanoTime();

     }

     

-    

-    /**

+

+	/**

      * For sizable contents, set the size.  Implementations can simply write a no-op if they don't wish to 

      * store the size. 

      * 

diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java
index 83a049c1..5ba74369 100644
--- a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java
+++ b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java
@@ -112,7 +112,6 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore {
     public final void checkpoint(String name, int additionalFlag) {

         TimeTaken tt = newTimeTaken(name,CHECKPOINT|additionalFlag);

         trail.add(tt);

-        tt.done();

     }

 

     @Override

@@ -130,8 +129,13 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore {
             // If first entry is sub, then it's actually the last "end" as well

             // otherwise, check end

             //long end = (first.flag&SUB)==SUB?first.end():trail.get(last).end();

-            long end = trail.get(last).end();

+            long end = 0L;

+            for(int i=last;end==0L && i>=0;--i) {

+            	end= trail.get(i).end();

+            }

             metric.total = (end - first.start) / 1000000f;

+        } else {

+        	metric.total=0L;

         }

         

         if (sb==null) {

@@ -165,6 +169,18 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore {
                 for (int i=0;i<indent;++i) {

                     sb.append("  ");

                 }

+                if((tt.flag & CHECKPOINT)==CHECKPOINT) {

+                	// Checkpoint

+                	sb.append("  ");

+                } else {

+                	float ms=tt.millis();

+                    // Add time values to Metric

+                    for (int i=0;i<flags.length;++i) {

+                        if ((tt.flag & flags[i]) == flags[i]) {

+                        	metric.buckets[i]+=ms;

+                        }

+                    }

+                }

                 tt.output(sb);

                 sb.append('\n');

                 if ((tt.flag&SUB)==SUB) {

@@ -172,11 +188,6 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore {
                     ++indent;

                 }

                 

-                // Add time values to Metric

-                float ms = tt.millis();

-                for (int i=0;i<flags.length;++i) {

-                    if (tt.flag == flags[i]) metric.buckets[i]+=ms;

-                }

             }

         }

         return metric;

diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java
index 35d0034d..e65f4e85 100644
--- a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java
+++ b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java
@@ -164,7 +164,7 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
                     case Env.REMOTE: sb.append("REMOTE "); break;

                 }

                 sb.append(String.format(name, values));

-                if (flag != Env.CHECKPOINT) {

+                if ((flag & Env.CHECKPOINT) != Env.CHECKPOINT) {

                     sb.append(' ');

                     sb.append((end-start)/1000000f);

                     sb.append("ms");

diff --git a/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java b/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java
index 2067e2ab..6900d9ed 100644
--- a/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java
+++ b/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java
@@ -44,7 +44,7 @@ public class JU_Log4JLogTargetTest {
     public void setup() {

     	initMocks(this);

     }

-

+    

     @Test

     public void testLoggable() {

     	Log4JLogTarget logObj = null;

diff --git a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java
index e118baaa..9a615fb8 100644
--- a/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java
+++ b/misc/log4j/src/main/java/org/onap/aaf/misc/env/log4j/LogFileNamer.java
@@ -23,12 +23,9 @@ package org.onap.aaf.misc.env.log4j;
 import java.io.File;

 import java.io.IOException;

 import java.net.URL;

-import java.text.SimpleDateFormat;

-import java.util.Date;

 

 public class LogFileNamer {

     private final String root;

-    private final String ending;

     private final String dir;

 

     public LogFileNamer(final String dir, final String root) {

@@ -38,14 +35,14 @@ public class LogFileNamer {
         } else {

             this.root = root + "-";

         }

-        ending = new SimpleDateFormat("YYYYMMdd").format(new Date());

     }

 

     public LogFileNamer noPID() {

         return this;

     }

 

-    private static final String FILE_FORMAT_STR = "%s/%s%s%s_%d.log";

+    private static final String FIRST_FILE_FORMAT_STR = "%s/%s%s.log";

+    private static final String FILE_FORMAT_STR = "%s/%s%s.%d.log";

 

     /**

      * Accepts a String. If Separated by "|" then first part is the Appender name,

@@ -59,13 +56,19 @@ public class LogFileNamer {
      * @throws IOException

      */

     public String setAppender(String appender) throws IOException {

-        int i = 0;

-        File f;

-        while ((f = new File(String.format(FILE_FORMAT_STR, dir, root, appender, ending, i))).exists()) {

-            ++i;

-        }

+    	File f = new File(String.format(FIRST_FILE_FORMAT_STR, dir, root, appender));

+    	if(f.exists()) {

+	        int i = 0;

+	        while ((f = new File(String.format(FILE_FORMAT_STR, dir, root, appender, i))).exists()) {

+	            ++i;

+	        }

+    	}

         

-        f.createNewFile();

+        try {

+        	f.createNewFile();

+        } catch (IOException e) {

+        	throw new IOException("Cannot create file '" + f.getCanonicalPath() + '\'', e);

+        }

         System.setProperty("LOG4J_FILENAME_" + appender, f.getCanonicalPath());

         return appender;

     }

diff --git a/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java b/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java
index 75ad44ad..8657e1d6 100644
--- a/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java
+++ b/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java
@@ -24,71 +24,69 @@ package org.onap.aaf.misc.env.log4j;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 public class JU_LogFileNamerTest {
     private File dir = new File(".");
 
-    private String ending = new SimpleDateFormat("YYYYMMdd").format(new Date());
-
     @Before
     public void setUp() throws Exception {
     }
 
-    @Test
-    public void test() throws IOException {
-        LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "log");
-        assertEquals(logFileNamer, logFileNamer.noPID());
+    private void cleanup(String name) {
+//    	System.out.println("XXXX" + dir.getAbsolutePath());
+    	for(File f : dir.listFiles(new FilenameFilter() {
+			@Override
+			public boolean accept(File dir, String name) {
+				return name.contains(name) && name.endsWith(".log");
+			}
+		})) {
+//    		System.out.println("Deleting " + f.getAbsolutePath());
+    		f.delete();
+    	};
+    }
 
-        logFileNamer.setAppender("Append");
-        assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-            dir.getCanonicalFile() + File.separator + "log-Append" + ending + "_0.log");
 
-        logFileNamer.setAppender("Append");
-        assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-            dir.getCanonicalFile() + File.separator + "log-Append" + ending + "_1.log");
+    @Test
+    public void test() throws IOException {
+    	String name = "Append";
+    	try {
+	        LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "log");
+	        assertEquals(logFileNamer, logFileNamer.noPID());
+	
+	        logFileNamer.setAppender(name);
+	        assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
+	            dir.getCanonicalFile() + File.separator + "log-" + name + ".log");
+	
+	        logFileNamer.setAppender(name);
+	        assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
+	            dir.getCanonicalFile() + File.separator + "log-" + name + ".0.log");
+    	} finally {
+    		cleanup("log-" + name);
+    	}
     }
 
     @Test
     public void testBlankRoot() throws IOException {
-        LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "");
-        assertEquals(logFileNamer, logFileNamer.noPID());
-
-        logFileNamer.setAppender("Append");
-        assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-            dir.getCanonicalPath() + File.separator + "Append" + ending + "_0.log");
-
-        logFileNamer.setAppender("Append");
-        assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-            dir.getCanonicalPath() + File.separator + "Append" + ending + "_1.log");
-    }
-
-    @After
-    public void tearDown() throws IOException {
-        File file = new File("./log-Append" + ending + "_0.log");
-        if (file.exists()) {
-            Files.delete(Paths.get(file.getAbsolutePath()));
-        }
-        file = new File("./log-Append" + ending + "_1.log");
-        if (file.exists()) {
-            Files.delete(Paths.get(file.getAbsolutePath()));
-        }
-        file = new File("./Append" + ending + "_0.log");
-        if (file.exists()) {
-            Files.delete(Paths.get(file.getAbsolutePath()));
-        }
-        file = new File("./Append" + ending + "_1.log");
-        if (file.exists()) {
-            Files.delete(Paths.get(file.getAbsolutePath()));
-        }
+    	String name = "Different";
+    	try {
+	        LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "");
+	        assertEquals(logFileNamer, logFileNamer.noPID());
+	
+	        logFileNamer.setAppender(name);
+	        assertEquals(System.getProperty("LOG4J_FILENAME_Different"),
+	            dir.getCanonicalPath() + File.separator + name + ".log");
+	
+	        logFileNamer.setAppender(name);
+	        assertEquals(System.getProperty("LOG4J_FILENAME_Different"),
+	            dir.getCanonicalPath() + File.separator + name + ".0.log");
+    	} finally {
+    		cleanup(name);
+    	}
     }
 
 }
diff --git a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/Imports.java b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/Imports.java
index 84e449b1..61c61648 100644
--- a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/Imports.java
+++ b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/Imports.java
@@ -31,7 +31,6 @@ public class Imports implements Thematic{
     private String theme;

     

     public Imports(int backdots) {

-        

         css = new ArrayList<>();

         js = new ArrayList<>();

         this.backdots = backdots;