This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MNG-6065 in repository https://gitbox.apache.org/repos/asf/maven.git
commit ccc5cde0570d55fa8d6dc6ced326b13069a3375d Author: Martin Kanters <[email protected]> AuthorDate: Mon Dec 9 18:01:33 2019 +0100 Log fail-level option. Submitted by: Martin Kanters. Renamed isThresholdHit to metThreshold --- .../src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java | 8 ++++---- .../java/org/apache/maven/cli/event/ExecutionEventLogger.java | 2 +- .../java/org/apache/maven/logwrapper/LogLevelRecorder.java | 10 +++++----- .../java/org/apache/maven/logwrapper/LogLevelRecorderTest.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apache-maven/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java b/apache-maven/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java index 299fa67..352d627 100644 --- a/apache-maven/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java +++ b/apache-maven/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java @@ -68,16 +68,16 @@ public class MavenLoggerFactoryTest LogLevelRecorder logLevelRecorder = mavenLoggerFactory.getLogLevelRecorder().get(); MavenFailOnSeverityLogger logger = (MavenFailOnSeverityLogger) mavenLoggerFactory.getLogger( "Test" ); - assertFalse( logLevelRecorder.isThresholdHit() ); + assertFalse( logLevelRecorder.metThreshold() ); logger.warn( "This should not hit the fail threshold" ); - assertFalse( logLevelRecorder.isThresholdHit() ); + assertFalse( logLevelRecorder.metThreshold() ); logger.error( "This should hit the fail threshold" ); - assertTrue( logLevelRecorder.isThresholdHit() ); + assertTrue( logLevelRecorder.metThreshold() ); logger.warn( "This should not reset the fail threshold" ); - assertTrue( logLevelRecorder.isThresholdHit() ); + assertTrue( logLevelRecorder.metThreshold() ); } @Test( expected = IllegalStateException.class ) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java index ed90142..f64efeb 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java @@ -141,7 +141,7 @@ public class ExecutionEventLogger extends AbstractExecutionListener { MavenSlf4jWrapperFactory loggerFactory = (MavenSlf4jWrapperFactory) iLoggerFactory; loggerFactory.getLogLevelRecorder() - .filter( LogLevelRecorder::isThresholdHit ) + .filter( LogLevelRecorder::metThreshold ) .ifPresent(recorder -> event.getSession().getResult().addException( new Exception( "Build failed due to log statements with a higher severity than allowed. " diff --git a/maven-slf4j-wrapper/src/main/java/org/apache/maven/logwrapper/LogLevelRecorder.java b/maven-slf4j-wrapper/src/main/java/org/apache/maven/logwrapper/LogLevelRecorder.java index 3dac0a8..9fa4b51 100644 --- a/maven-slf4j-wrapper/src/main/java/org/apache/maven/logwrapper/LogLevelRecorder.java +++ b/maven-slf4j-wrapper/src/main/java/org/apache/maven/logwrapper/LogLevelRecorder.java @@ -27,7 +27,7 @@ import org.slf4j.event.Level; public class LogLevelRecorder { private final Level logThreshold; - private boolean thresholdHit = false; + private boolean metThreshold = false; public LogLevelRecorder( String threshold ) { @@ -42,14 +42,14 @@ public class LogLevelRecorder public void record( Level logLevel ) { - if ( !thresholdHit && logLevel.toInt() >= logThreshold.toInt() ) + if ( !metThreshold && logLevel.toInt() >= logThreshold.toInt() ) { - thresholdHit = true; + metThreshold = true; } } - public boolean isThresholdHit() + public boolean metThreshold() { - return thresholdHit; + return metThreshold; } } diff --git a/maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java b/maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java index db5337c..69b2853 100644 --- a/maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java +++ b/maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java @@ -32,7 +32,7 @@ public class LogLevelRecorderTest LogLevelRecorder logLevelRecorder = new LogLevelRecorder( "WARN" ); logLevelRecorder.record( Level.ERROR ); - assertTrue( logLevelRecorder.isThresholdHit() ); + assertTrue( logLevelRecorder.metThreshold() ); } @Test( expected = IllegalArgumentException.class )
