LogService: stop using deprecated constants

ctrueden · ctrueden · commit 2407a38fdec8 · 2017-09-20T10:09:46.000+02:00
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -115,102 +115,102 @@ protected void log(final int level, final Object msg) {
 
 	@Override
 	public void debug(final Object msg) {
-		log(DEBUG, msg, null);
+		log(LogLevel.DEBUG, msg, null);
 	}
 
 	@Override
 	public void debug(final Throwable t) {
-		log(DEBUG, null, t);
+		log(LogLevel.DEBUG, null, t);
 	}
 
 	@Override
 	public void debug(final Object msg, final Throwable t) {
-		log(DEBUG, msg, t);
+		log(LogLevel.DEBUG, msg, t);
 	}
 
 	@Override
 	public void error(final Object msg) {
-		log(ERROR, msg, null);
+		log(LogLevel.ERROR, msg, null);
 	}
 
 	@Override
 	public void error(final Throwable t) {
-		log(ERROR, null, t);
+		log(LogLevel.ERROR, null, t);
 	}
 
 	@Override
 	public void error(final Object msg, final Throwable t) {
-		log(ERROR, msg, t);
+		log(LogLevel.ERROR, msg, t);
 	}
 
 	@Override
 	public void info(final Object msg) {
-		log(INFO, msg, null);
+		log(LogLevel.INFO, msg, null);
 	}
 
 	@Override
 	public void info(final Throwable t) {
-		log(INFO, null, t);
+		log(LogLevel.INFO, null, t);
 	}
 
 	@Override
 	public void info(final Object msg, final Throwable t) {
-		log(INFO, msg, t);
+		log(LogLevel.INFO, msg, t);
 	}
 
 	@Override
 	public void trace(final Object msg) {
-		log(TRACE, msg, null);
+		log(LogLevel.TRACE, msg, null);
 	}
 
 	@Override
 	public void trace(final Throwable t) {
-		log(TRACE, null, t);
+		log(LogLevel.TRACE, null, t);
 	}
 
 	@Override
 	public void trace(final Object msg, final Throwable t) {
-		log(TRACE, msg, t);
+		log(LogLevel.TRACE, msg, t);
 	}
 
 	@Override
 	public void warn(final Object msg) {
-		log(WARN, msg, null);
+		log(LogLevel.WARN, msg, null);
 	}
 
 	@Override
 	public void warn(final Throwable t) {
-		log(WARN, null, t);
+		log(LogLevel.WARN, null, t);
 	}
 
 	@Override
 	public void warn(final Object msg, final Throwable t) {
-		log(WARN, msg, t);
+		log(LogLevel.WARN, msg, t);
 	}
 
 	@Override
 	public boolean isDebug() {
-		return getLevel() >= DEBUG;
+		return getLevel() >= LogLevel.DEBUG;
 	}
 
 	@Override
 	public boolean isError() {
-		return getLevel() >= ERROR;
+		return getLevel() >= LogLevel.ERROR;
 	}
 
 	@Override
 	public boolean isInfo() {
-		return getLevel() >= INFO;
+		return getLevel() >= LogLevel.INFO;
 	}
 
 	@Override
 	public boolean isTrace() {
-		return getLevel() >= TRACE;
+		return getLevel() >= LogLevel.TRACE;
 	}
 
 	@Override
 	public boolean isWarn() {
-		return getLevel() >= WARN;
+		return getLevel() >= LogLevel.WARN;
 	}
 
 	@Override
@@ -266,7 +266,7 @@ private String parentPackage(final String classOrPackageName) {
 
 	private int levelFromEnvironment() {
 		// use the default, which is INFO unless the DEBUG env. variable is set
-		return System.getenv("DEBUG") == null ? INFO : DEBUG;
+		return System.getenv("DEBUG") == null ? LogLevel.INFO : LogLevel.DEBUG;
 	}
 
 }
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
@@ -55,7 +55,7 @@ protected void log(final int level, final Object msg) {
 		final String prefix = LogLevel.prefix(level);
 		final String message = (prefix == null ? "" : prefix + " ") + msg;
 		// NB: Emit severe messages to stderr, and less severe ones to stdout.
-		if (level <= WARN) System.err.println(message);
+		if (level <= LogLevel.WARN) System.err.println(message);
 		else System.out.println(message);
 	}
 
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -17,8 +17,8 @@ public class LogServiceTest {
 	@Test
 	public void testGetPrefix() {
 		TestableLogService logService = new TestableLogService();
-		assertEquals("[ERROR]", logService.getPrefix(LogService.ERROR));
-		assertEquals("[TRACE]", logService.getPrefix(LogService.TRACE));
+		assertEquals("[ERROR]", logService.getPrefix(LogLevel.ERROR));
+		assertEquals("[TRACE]", logService.getPrefix(LogLevel.TRACE));
 	}
 
 	@Test
@@ -64,7 +64,7 @@ private void testExceptionLogMethod(String prefix, BiConsumer<LogService, Throwa
 	private void testLogMethod(String prefix, LogMethodCall logMethodCall, boolean testMessage, boolean testException) {
 		// setup
 		TestableLogService logService = new TestableLogService();
-		logService.setLevel(LogService.TRACE);
+		logService.setLevel(LogLevel.TRACE);
 		String text = "Message";
 		NullPointerException exception = new NullPointerException();
 		// process
@@ -81,38 +81,38 @@ private void testLogMethod(String prefix, LogMethodCall logMethodCall, boolean t
 	@Test
 	public void testSetLevel() {
 		TestableLogService logService = new TestableLogService();
-		logService.setLevel(LogService.TRACE);
-		assertEquals(LogService.TRACE, logService.getLevel());
-		logService.setLevel(LogService.ERROR);
-		assertEquals(LogService.ERROR, logService.getLevel());
+		logService.setLevel(LogLevel.TRACE);
+		assertEquals(LogLevel.TRACE, logService.getLevel());
+		logService.setLevel(LogLevel.ERROR);
+		assertEquals(LogLevel.ERROR, logService.getLevel());
 	}
 
 	@Test
 	public void testSetClassSpecificLevel() {
 		TestableLogService logService = new TestableLogService();
 		MyTestClass testClass = new MyTestClass(logService);
-		logService.setLevel(LogService.ERROR);
-		logService.setLevel(MyTestClass.class.getName(), LogService.TRACE);
-		assertEquals(LogService.ERROR, logService.getLevel());
-		assertEquals(LogService.TRACE, testClass.getLevel());
+		logService.setLevel(LogLevel.ERROR);
+		logService.setLevel(MyTestClass.class.getName(), LogLevel.TRACE);
+		assertEquals(LogLevel.ERROR, logService.getLevel());
+		assertEquals(LogLevel.TRACE, testClass.getLevel());
 	}
 
 	@Test
 	public void testIsWarn() {
-		testIsLevel(LogService.ERROR, LogService::isError);
-		testIsLevel(LogService.WARN, LogService::isWarn);
-		testIsLevel(LogService.INFO, LogService::isInfo);
-		testIsLevel(LogService.DEBUG, LogService::isDebug);
-		testIsLevel(LogService.TRACE, LogService::isTrace);
+		testIsLevel(LogLevel.ERROR, LogService::isError);
+		testIsLevel(LogLevel.WARN, LogService::isWarn);
+		testIsLevel(LogLevel.INFO, LogService::isInfo);
+		testIsLevel(LogLevel.DEBUG, LogService::isDebug);
+		testIsLevel(LogLevel.TRACE, LogService::isTrace);
 	}
 
 	private void testIsLevel(int level, Function<LogService, Boolean> isLevel) {
 		TestableLogService logService = new TestableLogService();
-		logService.setLevel(LogService.NONE);
+		logService.setLevel(LogLevel.NONE);
 		assertFalse(isLevel.apply(logService));
 		logService.setLevel(level);
 		assertTrue(isLevel.apply(logService));
-		logService.setLevel(LogService.TRACE);
+		logService.setLevel(LogLevel.TRACE);
 		assertTrue(isLevel.apply(logService));
 	}
 
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -33,7 +33,7 @@
 package org.scijava.log;
 
 import static org.junit.Assert.assertTrue;
-import static org.scijava.log.LogService.WARN;
+import static org.scijava.log.LogLevel.WARN;
 
 import org.junit.Test;
 
@@ -47,6 +47,7 @@ public class StderrLogServiceTest {
 	public void testDefaultLevel() {
 		final LogService log = new StderrLogService();
 		int level = log.getLevel();
-		assertTrue("default level (" + level + ") is at least INFO(" + WARN + ")", level >= WARN);
+		assertTrue("default level (" + level + //
+			") is at least INFO(" + WARN + ")", level >= WARN);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -115,102 +115,102 @@ protected void log(final int level, final Object msg) {`
`115`	`115`
`116`	`116`	`@Override`
`117`	`117`	`public void debug(final Object msg) {`
`118`		`- log(DEBUG, msg, null);`
	`118`	`+ log(LogLevel.DEBUG, msg, null);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`@Override`
`122`	`122`	`public void debug(final Throwable t) {`
`123`		`- log(DEBUG, null, t);`
	`123`	`+ log(LogLevel.DEBUG, null, t);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`@Override`
`127`	`127`	`public void debug(final Object msg, final Throwable t) {`
`128`		`- log(DEBUG, msg, t);`
	`128`	`+ log(LogLevel.DEBUG, msg, t);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`@Override`
`132`	`132`	`public void error(final Object msg) {`
`133`		`- log(ERROR, msg, null);`
	`133`	`+ log(LogLevel.ERROR, msg, null);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`@Override`
`137`	`137`	`public void error(final Throwable t) {`
`138`		`- log(ERROR, null, t);`
	`138`	`+ log(LogLevel.ERROR, null, t);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`@Override`
`142`	`142`	`public void error(final Object msg, final Throwable t) {`
`143`		`- log(ERROR, msg, t);`
	`143`	`+ log(LogLevel.ERROR, msg, t);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`@Override`
`147`	`147`	`public void info(final Object msg) {`
`148`		`- log(INFO, msg, null);`
	`148`	`+ log(LogLevel.INFO, msg, null);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`@Override`
`152`	`152`	`public void info(final Throwable t) {`
`153`		`- log(INFO, null, t);`
	`153`	`+ log(LogLevel.INFO, null, t);`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`@Override`
`157`	`157`	`public void info(final Object msg, final Throwable t) {`
`158`		`- log(INFO, msg, t);`
	`158`	`+ log(LogLevel.INFO, msg, t);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`@Override`
`162`	`162`	`public void trace(final Object msg) {`
`163`		`- log(TRACE, msg, null);`
	`163`	`+ log(LogLevel.TRACE, msg, null);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`@Override`
`167`	`167`	`public void trace(final Throwable t) {`
`168`		`- log(TRACE, null, t);`
	`168`	`+ log(LogLevel.TRACE, null, t);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`@Override`
`172`	`172`	`public void trace(final Object msg, final Throwable t) {`
`173`		`- log(TRACE, msg, t);`
	`173`	`+ log(LogLevel.TRACE, msg, t);`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`@Override`
`177`	`177`	`public void warn(final Object msg) {`
`178`		`- log(WARN, msg, null);`
	`178`	`+ log(LogLevel.WARN, msg, null);`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`@Override`
`182`	`182`	`public void warn(final Throwable t) {`
`183`		`- log(WARN, null, t);`
	`183`	`+ log(LogLevel.WARN, null, t);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`@Override`
`187`	`187`	`public void warn(final Object msg, final Throwable t) {`
`188`		`- log(WARN, msg, t);`
	`188`	`+ log(LogLevel.WARN, msg, t);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`@Override`
`192`	`192`	`public boolean isDebug() {`
`193`		`- return getLevel() >= DEBUG;`
	`193`	`+ return getLevel() >= LogLevel.DEBUG;`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`@Override`
`197`	`197`	`public boolean isError() {`
`198`		`- return getLevel() >= ERROR;`
	`198`	`+ return getLevel() >= LogLevel.ERROR;`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`@Override`
`202`	`202`	`public boolean isInfo() {`
`203`		`- return getLevel() >= INFO;`
	`203`	`+ return getLevel() >= LogLevel.INFO;`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`@Override`
`207`	`207`	`public boolean isTrace() {`
`208`		`- return getLevel() >= TRACE;`
	`208`	`+ return getLevel() >= LogLevel.TRACE;`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`@Override`
`212`	`212`	`public boolean isWarn() {`
`213`		`- return getLevel() >= WARN;`
	`213`	`+ return getLevel() >= LogLevel.WARN;`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`@Override`
`@@ -266,7 +266,7 @@ private String parentPackage(final String classOrPackageName) {`
`266`	`266`
`267`	`267`	`private int levelFromEnvironment() {`
`268`	`268`	`// use the default, which is INFO unless the DEBUG env. variable is set`
`269`		`- return System.getenv("DEBUG") == null ? INFO : DEBUG;`
	`269`	`+ return System.getenv("DEBUG") == null ? LogLevel.INFO : LogLevel.DEBUG;`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ protected void log(final int level, final Object msg) {`
`55`	`55`	`final String prefix = LogLevel.prefix(level);`
`56`	`56`	`final String message = (prefix == null ? "" : prefix + " ") + msg;`
`57`	`57`	`// NB: Emit severe messages to stderr, and less severe ones to stdout.`
`58`		`- if (level <= WARN) System.err.println(message);`
	`58`	`+ if (level <= LogLevel.WARN) System.err.println(message);`
`59`	`59`	`else System.out.println(message);`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`package org.scijava.log;`
`34`	`34`
`35`	`35`	`import static org.junit.Assert.assertTrue;`
`36`		`-import static org.scijava.log.LogService.WARN;`
	`36`	`+import static org.scijava.log.LogLevel.WARN;`
`37`	`37`
`38`	`38`	`import org.junit.Test;`
`39`	`39`
`@@ -47,6 +47,7 @@ public class StderrLogServiceTest {`
`47`	`47`	`public void testDefaultLevel() {`
`48`	`48`	`final LogService log = new StderrLogService();`
`49`	`49`	`int level = log.getLevel();`
`50`		`- assertTrue("default level (" + level + ") is at least INFO(" + WARN + ")", level >= WARN);`
	`50`	`+ assertTrue("default level (" + level + //`
	`51`	`+ ") is at least INFO(" + WARN + ")", level >= WARN);`
`51`	`52`	`}`
`52`	`53`	`}`