Mass removal of all Tabs (Style Warnings)

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

2 files changed, 97 insertions, 97 deletions

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 c6537deb..e118baaa 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
@@ -27,61 +27,61 @@ import java.text.SimpleDateFormat;
 import java.util.Date;

 

 public class LogFileNamer {

-	private final String root;

-	private final String ending;

-	private final String dir;

+    private final String root;

+    private final String ending;

+    private final String dir;

 

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

-		this.dir = dir;

-		if (root == null || "".equals(root) || root.endsWith("/")) {

-			this.root = root;

-		} else {

-			this.root = root + "-";

-		}

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

-	}

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

+        this.dir = dir;

+        if (root == null || "".equals(root) || root.endsWith("/")) {

+            this.root = root;

+        } else {

+            this.root = root + "-";

+        }

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

+    }

 

-	public LogFileNamer noPID() {

-		return this;

-	}

+    public LogFileNamer noPID() {

+        return this;

+    }

 

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

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

 

-	/**

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

-	 * and the second is used in the FileNaming (This is to allow for shortened

-	 * Logger names, and more verbose file names) ONAP: jna code has license issues.

-	 * Just do Date + Unique Number

-	 * 

-	 * @param appender

-	 * 

-	 *            returns the String Appender

-	 * @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;

-		}

-		

-		f.createNewFile();

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

-		return appender;

-	}

+    /**

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

+     * and the second is used in the FileNaming (This is to allow for shortened

+     * Logger names, and more verbose file names) ONAP: jna code has license issues.

+     * Just do Date + Unique Number

+     * 

+     * @param appender

+     * 

+     *            returns the String Appender

+     * @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;

+        }

+        

+        f.createNewFile();

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

+        return appender;

+    }

 

-	public void configure(final String path, final String fname, final String log_level) throws IOException {

-		final String fullPath = path + '/' + fname;

-		if (new File(fullPath).exists()) {

-			org.apache.log4j.PropertyConfigurator.configureAndWatch(fullPath, 60 * 1000L);

-		} else {

-			URL rsrc = ClassLoader.getSystemResource(fname);

-			if (rsrc == null) {

-				String msg = "Neither File: " + path + '/' + fname + " nor resource on Classpath " + fname + " exist";

-				throw new IOException(msg);

-			}

-			org.apache.log4j.PropertyConfigurator.configure(rsrc);

-		}

+    public void configure(final String path, final String fname, final String log_level) throws IOException {

+        final String fullPath = path + '/' + fname;

+        if (new File(fullPath).exists()) {

+            org.apache.log4j.PropertyConfigurator.configureAndWatch(fullPath, 60 * 1000L);

+        } else {

+            URL rsrc = ClassLoader.getSystemResource(fname);

+            if (rsrc == null) {

+                String msg = "Neither File: " + path + '/' + fname + " nor resource on Classpath " + fname + " exist";

+                throw new IOException(msg);

+            }

+            org.apache.log4j.PropertyConfigurator.configure(rsrc);

+        }

 

-	}

+    }

 }

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 8c47a409..720ed27f 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
@@ -34,60 +34,60 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class JU_LogFileNamerTest {
-	private File dir = new File(".");
+    private File dir = new File(".");
 
-	private String ending = new SimpleDateFormat("YYYYMMdd").format(new Date());
+    private String ending = new SimpleDateFormat("YYYYMMdd").format(new Date());
 
-	@Before
-	public void setUp() throws Exception {
-	}
+    @Before
+    public void setUp() throws Exception {
+    }
 
-	@Test
-	public void test() throws IOException {
-		LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "log");
-		assertEquals(logFileNamer, logFileNamer.noPID());
+    @Test
+    public void test() throws IOException {
+        LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "log");
+        assertEquals(logFileNamer, logFileNamer.noPID());
 
-		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 + "_0.log");
 
-		logFileNamer.setAppender("Append");
-		assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-			dir.getCanonicalFile() + File.separator + "log-Append" + ending + "_1.log");
-	}
+        logFileNamer.setAppender("Append");
+        assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
+            dir.getCanonicalFile() + File.separator + "log-Append" + ending + "_1.log");
+    }
 
-	@Test
-	public void testBlankRoot() throws IOException {
-		LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "");
-		assertEquals(logFileNamer, logFileNamer.noPID());
+    @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 + "_0.log");
 
-		logFileNamer.setAppender("Append");
-		assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-			dir.getCanonicalPath() + File.separator + "Append" + ending + "_1.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()));
-		}
-	}
+    @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()));
+        }
+    }
 
 }