andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup Log4J2Logger (#8245)

Browse Source 
Motivation:

Log4J2Logger had some code-duplication with AbstractInternalLogger

Modifications:

Reuse AbstractInternaLogger.EXCEPTION_MESSAGE in Log4J2Logger and so remove some code-duplication

Result:

Less duplicated code.
This commit is contained in:
Norman Maurer 2018-08-31 17:08:38 +02:00 committed by GitHub
parent e26666a7ea
commit 9d8846cfce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/io/netty/util/internal/logging/AbstractInternalLogger.java
View File

@ -29,7 +29,7 @@ public abstract class AbstractInternalLogger implements InternalLogger, Serializ
private static final long serialVersionUID = -6382972526573193470L;
private static final String EXCEPTION_MESSAGE = "Unexpected exception:";
static final String EXCEPTION_MESSAGE = "Unexpected exception:";
private final String name;

7
common/src/main/java/io/netty/util/internal/logging/Log4J2Logger.java
View File

@ -21,13 +21,12 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.spi.ExtendedLogger;
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
import static io.netty.util.internal.logging.AbstractInternalLogger.EXCEPTION_MESSAGE;
class Log4J2Logger extends ExtendedLoggerWrapper implements InternalLogger {
private static final long serialVersionUID = 5485418394879791397L;
/** {@linkplain AbstractInternalLogger#EXCEPTION_MESSAGE} */
private static final String EXCEPTION_MESSAGE = "Unexpected exception:";
Log4J2Logger(Logger logger) {
super((ExtendedLogger) logger, logger.getName(), logger.getMessageFactory());
}
@ -97,7 +96,7 @@ class Log4J2Logger extends ExtendedLoggerWrapper implements InternalLogger {
log(toLevel(level), EXCEPTION_MESSAGE, t);
}
protected Level toLevel(InternalLogLevel level) {
private static Level toLevel(InternalLogLevel level) {
switch (level) {
case INFO:
return Level.INFO;

21
common/src/test/java/io/netty/util/internal/logging/Log4J2LoggerTest.java
View File

@ -17,7 +17,6 @@ package io.netty.util.internal.logging;
import static org.junit.Assert.assertEquals;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Arrays;
@ -29,7 +28,6 @@ import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
import org.hamcrest.CoreMatchers;
import org.junit.Assume;
import org.junit.Test;
import io.netty.util.internal.ReflectionUtil;
@ -56,25 +54,6 @@ public class Log4J2LoggerTest extends AbstractInternalLoggerTest<Logger> {
};
}
@Test
public void testEXCEPTION_MESSAGE() {
assertEquals(getFieldValue(AbstractInternalLogger.class, "EXCEPTION_MESSAGE"),
getFieldValue(Log4J2Logger.class, "EXCEPTION_MESSAGE"));
}
@SuppressWarnings("unchecked")
private static <T> T getFieldValue(Class<?> clazz, String fieldName) {
try {
Field field = clazz.getDeclaredField(fieldName);
if (!field.isAccessible()) {
Assume.assumeThat(ReflectionUtil.trySetAccessible(field, true), CoreMatchers.nullValue());
}
return (T) field.get(AbstractInternalLogger.class);
} catch (ReflectiveOperationException e) {
throw new IllegalStateException(e);
}
}
@Override
protected void setLevelEnable(InternalLogLevel level, boolean enable) throws Exception {
Level targetLevel = Level.valueOf(level.name());