You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/08/10 04:14:46 UTC
logging-log4j2 git commit: Use final.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 358c4e2cb -> 3eeb2f6c9
Use final.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3eeb2f6c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3eeb2f6c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3eeb2f6c
Branch: refs/heads/master
Commit: 3eeb2f6c98374975ca715cd45da9de26f472fd85
Parents: 358c4e2
Author: ggregory <gg...@apache.org>
Authored: Sun Aug 9 19:14:43 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Aug 9 19:14:43 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/spi/AbstractLogger.java | 4 +-
.../apache/logging/log4j/util/LambdaUtil.java | 6 +-
.../apache/logging/log4j/LambdaLoggerTest.java | 154 +++++------
.../logging/log4j/util/LambdaUtilTest.java | 274 +++++++++----------
4 files changed, 219 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3eeb2f6c/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index c4772a0..a5b5fdd 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -1001,13 +1001,13 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
protected void logMessage(final String fqcn, final Level level, final Marker marker,
final MessageSupplier msgSupplier, final Throwable t) {
- Message message = LambdaUtil.get(msgSupplier);
+ final Message message = LambdaUtil.get(msgSupplier);
logMessage(fqcn, level, marker, message, t);
}
protected void logMessage(final String fqcn, final Level level, final Marker marker, final Supplier<?> msgSupplier,
final Throwable t) {
- Object message = LambdaUtil.get(msgSupplier);
+ final Object message = LambdaUtil.get(msgSupplier);
logMessage(fqcn, level, marker, messageFactory.newMessage(message), t);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3eeb2f6c/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
index 24c157f..ceb4c56 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
@@ -37,7 +37,7 @@ public class LambdaUtil {
* @return an array containing the results of evaluating the lambda expressions (or {@code null} if the suppliers
* array was {@code null}
*/
- public static Object[] getAll(Supplier<?>... suppliers) {
+ public static Object[] getAll(final Supplier<?>... suppliers) {
if (suppliers == null) {
return null;
}
@@ -54,7 +54,7 @@ public class LambdaUtil {
* @return the results of evaluating the lambda expression (or {@code null} if the supplier
* was {@code null}
*/
- public static Object get(Supplier<?> supplier) {
+ public static Object get(final Supplier<?> supplier) {
if (supplier == null) {
return null;
}
@@ -67,7 +67,7 @@ public class LambdaUtil {
* @return the Message resulting from evaluating the lambda expression (or {@code null} if the supplier was
* {@code null}
*/
- public static Message get(MessageSupplier supplier) {
+ public static Message get(final MessageSupplier supplier) {
if (supplier == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3eeb2f6c/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
index bb1ed2a..78bf142 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java
@@ -43,7 +43,7 @@ public class LambdaLoggerTest {
final Message message;
final Throwable throwable;
- public LogEvent(String fqcn, Level level, Marker marker, Message message, Throwable t) {
+ public LogEvent(final String fqcn, final Level level, final Marker marker, final Message message, final Throwable t) {
this.fqcn = fqcn;
this.level = level;
this.marker = marker;
@@ -59,32 +59,32 @@ public class LambdaLoggerTest {
final List<LambdaLoggerTest.LogEvent> list = new ArrayList<LambdaLoggerTest.LogEvent>();
@Override
- public boolean isEnabled(Level level, Marker marker, Message message, Throwable t) {
+ public boolean isEnabled(final Level level, final Marker marker, final Message message, final Throwable t) {
return enabled;
}
@Override
- public boolean isEnabled(Level level, Marker marker, Object message, Throwable t) {
+ public boolean isEnabled(final Level level, final Marker marker, final Object message, final Throwable t) {
return enabled;
}
@Override
- public boolean isEnabled(Level level, Marker marker, String message, Throwable t) {
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Throwable t) {
return enabled;
}
@Override
- public boolean isEnabled(Level level, Marker marker, String message) {
+ public boolean isEnabled(final Level level, final Marker marker, final String message) {
return enabled;
}
@Override
- public boolean isEnabled(Level level, Marker marker, String message, Object... params) {
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object... params) {
return enabled;
}
@Override
- public void logMessage(String fqcn, Level level, Marker marker, Message message, Throwable t) {
+ public void logMessage(final String fqcn, final Level level, final Marker marker, final Message message, final Throwable t) {
list.add(new LogEvent(fqcn, level, marker, message, t));
}
@@ -151,7 +151,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertSame(message, event.message);
assertSame(marker, event.marker);
@@ -167,7 +167,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertSame(message, event.message);
}
@@ -182,7 +182,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertSame(marker, event.marker);
assertSame(message, event.message);
@@ -199,7 +199,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertSame(message, event.message);
assertSame(throwable, event.throwable);
@@ -215,7 +215,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(marker, event.marker);
@@ -231,7 +231,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
}
@@ -246,7 +246,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertSame(marker, event.marker);
assertSame(stringMessage, event.message.getFormattedMessage());
@@ -263,7 +263,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(throwable, event.throwable);
@@ -279,7 +279,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertEquals("abc Hi", event.message.getFormattedMessage());
}
@@ -294,7 +294,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.DEBUG, event.level);
assertSame(marker, event.marker);
assertEquals("abc Hi", event.message.getFormattedMessage());
@@ -310,7 +310,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertSame(message, event.message);
assertSame(marker, event.marker);
@@ -326,7 +326,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertSame(message, event.message);
}
@@ -341,7 +341,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertSame(marker, event.marker);
assertSame(message, event.message);
@@ -358,7 +358,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertSame(message, event.message);
assertSame(throwable, event.throwable);
@@ -374,7 +374,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(marker, event.marker);
@@ -390,7 +390,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
}
@@ -405,7 +405,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertSame(marker, event.marker);
assertSame(stringMessage, event.message.getFormattedMessage());
@@ -422,7 +422,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(throwable, event.throwable);
@@ -438,7 +438,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertEquals("abc Hi", event.message.getFormattedMessage());
}
@@ -453,7 +453,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.ERROR, event.level);
assertSame(marker, event.marker);
assertEquals("abc Hi", event.message.getFormattedMessage());
@@ -469,7 +469,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertSame(message, event.message);
assertSame(marker, event.marker);
@@ -485,7 +485,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertSame(message, event.message);
}
@@ -500,7 +500,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertSame(marker, event.marker);
assertSame(message, event.message);
@@ -517,7 +517,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertSame(message, event.message);
assertSame(throwable, event.throwable);
@@ -533,7 +533,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(marker, event.marker);
@@ -549,7 +549,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
}
@@ -564,7 +564,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertSame(marker, event.marker);
assertSame(stringMessage, event.message.getFormattedMessage());
@@ -581,7 +581,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(throwable, event.throwable);
@@ -597,7 +597,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertEquals("abc Hi", event.message.getFormattedMessage());
}
@@ -612,7 +612,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.FATAL, event.level);
assertSame(marker, event.marker);
assertEquals("abc Hi", event.message.getFormattedMessage());
@@ -628,7 +628,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertSame(message, event.message);
assertSame(marker, event.marker);
@@ -644,7 +644,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertSame(message, event.message);
}
@@ -659,7 +659,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertSame(marker, event.marker);
assertSame(message, event.message);
@@ -676,7 +676,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertSame(message, event.message);
assertSame(throwable, event.throwable);
@@ -692,7 +692,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(marker, event.marker);
@@ -708,7 +708,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
}
@@ -723,7 +723,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertSame(marker, event.marker);
assertSame(stringMessage, event.message.getFormattedMessage());
@@ -740,7 +740,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(throwable, event.throwable);
@@ -756,7 +756,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertEquals("abc Hi", event.message.getFormattedMessage());
}
@@ -771,7 +771,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.INFO, event.level);
assertSame(marker, event.marker);
assertEquals("abc Hi", event.message.getFormattedMessage());
@@ -787,7 +787,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertSame(message, event.message);
assertSame(marker, event.marker);
@@ -803,7 +803,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertSame(message, event.message);
}
@@ -818,7 +818,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertSame(marker, event.marker);
assertSame(message, event.message);
@@ -835,7 +835,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertSame(message, event.message);
assertSame(throwable, event.throwable);
@@ -851,7 +851,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(marker, event.marker);
@@ -867,7 +867,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
}
@@ -882,7 +882,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertSame(marker, event.marker);
assertSame(stringMessage, event.message.getFormattedMessage());
@@ -899,7 +899,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(throwable, event.throwable);
@@ -915,7 +915,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertEquals("abc Hi", event.message.getFormattedMessage());
}
@@ -930,7 +930,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.TRACE, event.level);
assertSame(marker, event.marker);
assertEquals("abc Hi", event.message.getFormattedMessage());
@@ -946,7 +946,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(message, event.message);
assertSame(marker, event.marker);
@@ -962,7 +962,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(message, event.message);
}
@@ -977,7 +977,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(marker, event.marker);
assertSame(message, event.message);
@@ -994,7 +994,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(message, event.message);
assertSame(throwable, event.throwable);
@@ -1010,7 +1010,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(marker, event.marker);
@@ -1026,7 +1026,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
}
@@ -1041,7 +1041,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(marker, event.marker);
assertSame(stringMessage, event.message.getFormattedMessage());
@@ -1058,7 +1058,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(throwable, event.throwable);
@@ -1074,7 +1074,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertEquals("abc Hi", event.message.getFormattedMessage());
}
@@ -1089,7 +1089,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(marker, event.marker);
assertEquals("abc Hi", event.message.getFormattedMessage());
@@ -1105,7 +1105,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(message, event.message);
assertSame(marker, event.marker);
@@ -1121,7 +1121,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(message, event.message);
}
@@ -1136,7 +1136,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(marker, event.marker);
assertSame(message, event.message);
@@ -1153,7 +1153,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(messageSupplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(message, event.message);
assertSame(throwable, event.throwable);
@@ -1169,7 +1169,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(marker, event.marker);
@@ -1185,7 +1185,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
}
@@ -1200,7 +1200,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(marker, event.marker);
assertSame(stringMessage, event.message.getFormattedMessage());
@@ -1217,7 +1217,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(stringMessage, event.message.getFormattedMessage());
assertSame(throwable, event.throwable);
@@ -1233,7 +1233,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertEquals("abc Hi", event.message.getFormattedMessage());
}
@@ -1248,7 +1248,7 @@ public class LambdaLoggerTest {
assertEquals(1, logger2.list.size());
assertTrue(supplier.invoked);
- LogEvent event = logger2.list.get(0);
+ final LogEvent event = logger2.list.get(0);
assertEquals(Level.WARN, event.level);
assertSame(marker, event.marker);
assertEquals("abc Hi", event.message.getFormattedMessage());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3eeb2f6c/log4j-api/src/test/java/org/apache/logging/log4j/util/LambdaUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/LambdaUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/LambdaUtilTest.java
index a97ca28..86723a4 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/LambdaUtilTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/LambdaUtilTest.java
@@ -1,137 +1,137 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-
-package org.apache.logging.log4j.util;
-
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.message.SimpleMessage;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Tests the LambdaUtil class.
- */
-public class LambdaUtilTest {
-
- @Test
- public void testGetSupplierResultOfSupplier() {
- final String expected = "result";
- final Object actual = LambdaUtil.get(new Supplier<String>() {
- public String get() {
- return expected;
- }
- });
- assertSame(expected, actual);
- }
-
- @Test
- public void testGetMessageSupplierResultOfSupplier() {
- final Message expected = new SimpleMessage("hi");
- final Message actual = LambdaUtil.get(new MessageSupplier() {
- public Message get() {
- return expected;
- }
- });
- assertSame(expected, actual);
- }
-
- @Test
- public void testGetSupplierReturnsNullIfSupplierNull() {
- final Object actual = LambdaUtil.get((Supplier<?>) null);
- assertNull(actual);
- }
-
- @Test
- public void testGetMessageSupplierReturnsNullIfSupplierNull() {
- final Object actual = LambdaUtil.get((MessageSupplier) null);
- assertNull(actual);
- }
-
- @Test(expected = RuntimeException.class)
- public void testGetSupplierExceptionIfSupplierThrowsException() {
- LambdaUtil.get(new Supplier<String>() {
- public String get() {
- throw new RuntimeException();
- }
- });
- }
-
- @Test(expected = RuntimeException.class)
- public void testGetMessageSupplierExceptionIfSupplierThrowsException() {
- LambdaUtil.get(new MessageSupplier() {
- public Message get() {
- throw new RuntimeException();
- }
- });
- }
-
- @Test
- public void testGetAllReturnsResultOfSuppliers() {
- final String expected1 = "result1";
- Supplier<String> function1 = new Supplier<String>() {
- public String get() {
- return expected1;
- }
- };
- final String expected2 = "result2";
- Supplier<String> function2 = new Supplier<String>() {
- public String get() {
- return expected2;
- }
- };
-
- Supplier<?>[] functions = { function1, function2 };
- final Object[] actual = LambdaUtil.getAll(functions);
- assertEquals(actual.length, functions.length);
- assertSame(expected1, actual[0]);
- assertSame(expected2, actual[1]);
- }
-
- @Test
- public void testGetAllReturnsNullArrayIfSupplierArrayNull() {
- final Object[] actual = LambdaUtil.getAll((Supplier<?>[]) null);
- assertNull(actual);
- }
-
- @Test
- public void testGetAllReturnsNullElementsIfSupplierArrayContainsNulls() {
- final Supplier<?>[] functions = new Supplier[3];
- final Object[] actual = LambdaUtil.getAll(functions);
- assertEquals(actual.length, functions.length);
- for (Object object : actual) {
- assertNull(object);
- }
- }
-
- @Test(expected = RuntimeException.class)
- public void testGetAllThrowsExceptionIfAnyOfTheSuppliersThrowsException() {
- Supplier<String> function1 = new Supplier<String>() {
- public String get() {
- return "abc";
- }
- };
- Supplier<String> function2 = new Supplier<String>() {
- public String get() {
- throw new RuntimeException();
- }
- };
-
- Supplier<?>[] functions = { function1, function2 };
- LambdaUtil.getAll(functions);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+
+package org.apache.logging.log4j.util;
+
+import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.message.SimpleMessage;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests the LambdaUtil class.
+ */
+public class LambdaUtilTest {
+
+ @Test
+ public void testGetSupplierResultOfSupplier() {
+ final String expected = "result";
+ final Object actual = LambdaUtil.get(new Supplier<String>() {
+ public String get() {
+ return expected;
+ }
+ });
+ assertSame(expected, actual);
+ }
+
+ @Test
+ public void testGetMessageSupplierResultOfSupplier() {
+ final Message expected = new SimpleMessage("hi");
+ final Message actual = LambdaUtil.get(new MessageSupplier() {
+ public Message get() {
+ return expected;
+ }
+ });
+ assertSame(expected, actual);
+ }
+
+ @Test
+ public void testGetSupplierReturnsNullIfSupplierNull() {
+ final Object actual = LambdaUtil.get((Supplier<?>) null);
+ assertNull(actual);
+ }
+
+ @Test
+ public void testGetMessageSupplierReturnsNullIfSupplierNull() {
+ final Object actual = LambdaUtil.get((MessageSupplier) null);
+ assertNull(actual);
+ }
+
+ @Test(expected = RuntimeException.class)
+ public void testGetSupplierExceptionIfSupplierThrowsException() {
+ LambdaUtil.get(new Supplier<String>() {
+ public String get() {
+ throw new RuntimeException();
+ }
+ });
+ }
+
+ @Test(expected = RuntimeException.class)
+ public void testGetMessageSupplierExceptionIfSupplierThrowsException() {
+ LambdaUtil.get(new MessageSupplier() {
+ public Message get() {
+ throw new RuntimeException();
+ }
+ });
+ }
+
+ @Test
+ public void testGetAllReturnsResultOfSuppliers() {
+ final String expected1 = "result1";
+ final Supplier<String> function1 = new Supplier<String>() {
+ public String get() {
+ return expected1;
+ }
+ };
+ final String expected2 = "result2";
+ final Supplier<String> function2 = new Supplier<String>() {
+ public String get() {
+ return expected2;
+ }
+ };
+
+ final Supplier<?>[] functions = { function1, function2 };
+ final Object[] actual = LambdaUtil.getAll(functions);
+ assertEquals(actual.length, functions.length);
+ assertSame(expected1, actual[0]);
+ assertSame(expected2, actual[1]);
+ }
+
+ @Test
+ public void testGetAllReturnsNullArrayIfSupplierArrayNull() {
+ final Object[] actual = LambdaUtil.getAll((Supplier<?>[]) null);
+ assertNull(actual);
+ }
+
+ @Test
+ public void testGetAllReturnsNullElementsIfSupplierArrayContainsNulls() {
+ final Supplier<?>[] functions = new Supplier[3];
+ final Object[] actual = LambdaUtil.getAll(functions);
+ assertEquals(actual.length, functions.length);
+ for (final Object object : actual) {
+ assertNull(object);
+ }
+ }
+
+ @Test(expected = RuntimeException.class)
+ public void testGetAllThrowsExceptionIfAnyOfTheSuppliersThrowsException() {
+ final Supplier<String> function1 = new Supplier<String>() {
+ public String get() {
+ return "abc";
+ }
+ };
+ final Supplier<String> function2 = new Supplier<String>() {
+ public String get() {
+ throw new RuntimeException();
+ }
+ };
+
+ final Supplier<?>[] functions = { function1, function2 };
+ LambdaUtil.getAll(functions);
+ }
+}