http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java index a9b5844..931dc1b 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java @@ -240,7 +240,7 @@ public class ParameterizedMessageInliningBenchmark { * Returns the sum of the lengths of all Strings in the specified array. */ // 27 bytes - private static int sumStringLengths(String[] arguments) { + private static int sumStringLengths(final String[] arguments) { int result = 0; for (int i = 0; i < arguments.length; i++) { result += arguments[i].length(); @@ -249,13 +249,13 @@ public class ParameterizedMessageInliningBenchmark { } // 22 bytes - private static boolean isDelimPair(final String messagePattern, int i, final char curChar) { + private static boolean isDelimPair(final String messagePattern, final int i, final char curChar) { return curChar == DELIM_START && messagePattern.charAt(i + 1) == DELIM_STOP; } // 28 bytes private static int format0_handleMaybeLastChar(final String messagePattern, final int len, final char[] result, - int pos, int escapeCounter, int i) { + int pos, final int escapeCounter, final int i) { if (i == len - 1) { final char curChar = messagePattern.charAt(i); pos = format0_handleLastChar(result, pos, escapeCounter, curChar); @@ -264,7 +264,7 @@ public class ParameterizedMessageInliningBenchmark { } // 28 bytes - private static int format0_handleLastChar(final char[] result, int pos, int escapeCounter, final char curChar) { + private static int format0_handleLastChar(final char[] result, int pos, final int escapeCounter, final char curChar) { if (curChar == ESCAPE_CHAR) { pos = format0_writeUnescapedEscapeChars(escapeCounter + 1, result, pos); } else { @@ -274,7 +274,7 @@ public class ParameterizedMessageInliningBenchmark { } // 16 bytes - private static int format0_handleLiteralChar(final char[] result, int pos, int escapeCounter, final char curChar) { + private static int format0_handleLiteralChar(final char[] result, int pos, final int escapeCounter, final char curChar) { // any other char beside ESCAPE or DELIM_START/STOP-combo // write unescaped escape chars pos = format0_writeUnescapedEscapeChars(escapeCounter, result, pos); @@ -293,18 +293,18 @@ public class ParameterizedMessageInliningBenchmark { * Returns {@code true} if the specified parameter is odd. */ // 11 bytes - private static boolean isOdd(int number) { + private static boolean isOdd(final int number) { return (number & 1) == 1; } // 11 bytes - private static int format0_writeEscapedEscapeChars(int escapeCounter, char[] result, int pos) { + private static int format0_writeEscapedEscapeChars(final int escapeCounter, final char[] result, final int pos) { final int escapedEscapes = escapeCounter >> 1; // divide by two return format0_writeUnescapedEscapeChars(escapedEscapes, result, pos); } // 20 bytes - private static int format0_writeUnescapedEscapeChars(int escapeCounter, char[] result, int pos) { + private static int format0_writeUnescapedEscapeChars(int escapeCounter, final char[] result, int pos) { while (escapeCounter > 0) { result[pos++] = ESCAPE_CHAR; escapeCounter--; @@ -313,7 +313,7 @@ public class ParameterizedMessageInliningBenchmark { } // 25 bytes - private static int format0_appendArg(final String[] arguments, int currentArgument, final char[] result, int pos) { + private static int format0_appendArg(final String[] arguments, final int currentArgument, final char[] result, int pos) { if (currentArgument < arguments.length) { pos = format0_appendArg0(arguments, currentArgument, result, pos); } else { @@ -323,7 +323,7 @@ public class ParameterizedMessageInliningBenchmark { } // 27 bytes - private static int format0_appendArg0(final String[] arguments, int currentArgument, final char[] result, int pos) { + private static int format0_appendArg0(final String[] arguments, final int currentArgument, final char[] result, final int pos) { final String arg = arguments[currentArgument]; final int argLen = arg.length(); arg.getChars(0, argLen, result, pos);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java index 0919835..0bcf3da 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java @@ -106,7 +106,7 @@ public class PatternLayoutComparisonBenchmark { patternLayoutEncoder.init(baos); } - ILoggingEvent makeLoggingEvent(String message) { + ILoggingEvent makeLoggingEvent(final String message) { return new LoggingEvent(PatternLayoutComparisonBenchmark.class.getName(), logger, ch.qos.logback.classic.Level.DEBUG, message, null, null); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java index 7e9459c..c18413a 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/StringEncodingBenchmark.java @@ -127,7 +127,7 @@ public class StringEncodingBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public byte[] shiftJisEncoder() throws CharacterCodingException { - ByteBuffer buf = ENCODER_SHIFT_JIS.encode(CharBuffer.wrap(LOGMSG)); + final ByteBuffer buf = ENCODER_SHIFT_JIS.encode(CharBuffer.wrap(LOGMSG)); return buf.array(); } @@ -135,7 +135,7 @@ public class StringEncodingBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public byte[] iso8859_1Encoder() throws CharacterCodingException { - ByteBuffer buf = ENCODER_ISO8859_1.encode(CharBuffer.wrap(LOGMSG)); + final ByteBuffer buf = ENCODER_ISO8859_1.encode(CharBuffer.wrap(LOGMSG)); return buf.array(); } @@ -171,8 +171,8 @@ public class StringEncodingBenchmark { return result; } - private int nonIsoChar(String logmsg, int i) { - char c = logmsg.charAt(i++); + private int nonIsoChar(final String logmsg, int i) { + final char c = logmsg.charAt(i++); if ((Character.isHighSurrogate(c)) && (i < logmsg.length()) && (Character.isLowSurrogate(logmsg.charAt(i)))) { i++; } @@ -189,10 +189,10 @@ public class StringEncodingBenchmark { return result; } - private static int encodeISOArray(String charArray, int charIndex, byte[] byteArray, int byteIndex, int length) { + private static int encodeISOArray(final String charArray, int charIndex, final byte[] byteArray, int byteIndex, final int length) { int i = 0; for (; i < length; i++) { - char c = charArray.charAt(charIndex++); + final char c = charArray.charAt(charIndex++); if (c > 255) { break; } @@ -201,16 +201,16 @@ public class StringEncodingBenchmark { return i; } - private int encode(String charArray, int charOffset, int charLength, byte[] byteArray) { + private int encode(final String charArray, int charOffset, int charLength, final byte[] byteArray) { int offset = 0; int length = Math.min(charLength, byteArray.length); int charDoneIndex = charOffset + length; while (charOffset < charDoneIndex) { - int m = encodeISOArray(charArray, charOffset, byteArray, offset, length); + final int m = encodeISOArray(charArray, charOffset, byteArray, offset, length); charOffset += m; offset += m; if (m != length) { - char c = charArray.charAt(charOffset++); + final char c = charArray.charAt(charOffset++); if ((Character.isHighSurrogate(c)) && (charOffset < charDoneIndex) && (Character.isLowSurrogate(charArray.charAt(charOffset)))) { if (charLength > byteArray.length) { @@ -230,17 +230,17 @@ public class StringEncodingBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public byte[] iso8859_1CustomPortedJDK8CopyArray() throws CharacterCodingException { - char[] charArray = LOGMSG.toCharArray(); + final char[] charArray = LOGMSG.toCharArray(); final int length = charArray.length; final byte[] result = new byte[length]; encode0(charArray, 0, length, result); return result; } - private static int encodeISOArray0(char[] charArray, int charIndex, byte[] byteArray, int byteIndex, int length) { + private static int encodeISOArray0(final char[] charArray, int charIndex, final byte[] byteArray, int byteIndex, final int length) { int i = 0; for (; i < length; i++) { - char c = charArray[(charIndex++)]; + final char c = charArray[(charIndex++)]; if (c > 255) { break; } @@ -249,16 +249,16 @@ public class StringEncodingBenchmark { return i; } - private int encode0(char[] charArray, int charOffset, int charLength, byte[] byteArray) { + private int encode0(final char[] charArray, int charOffset, int charLength, final byte[] byteArray) { int offset = 0; int length = Math.min(charLength, byteArray.length); int charDoneIndex = charOffset + length; while (charOffset < charDoneIndex) { - int m = encodeISOArray0(charArray, charOffset, byteArray, offset, length); + final int m = encodeISOArray0(charArray, charOffset, byteArray, offset, length); charOffset += m; offset += m; if (m != length) { - char c = charArray[(charOffset++)]; + final char c = charArray[(charOffset++)]; if ((Character.isHighSurrogate(c)) && (charOffset < charDoneIndex) && (Character.isLowSurrogate(charArray[(charOffset)]))) { if (charLength > byteArray.length) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java index 7fd83fd..bf67c9d 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java @@ -74,7 +74,7 @@ public class TextEncoderHelperBenchmark { } @Override - public ByteBuffer drain(ByteBuffer buf) { + public ByteBuffer drain(final ByteBuffer buf) { buf.flip(); count += buf.limit(); buf.clear(); @@ -119,7 +119,7 @@ public class TextEncoderHelperBenchmark { //private static final ThreadLocal<StringBuilderEncoder> textEncoderHelper = new ThreadLocal<>(); private final StringBuilderEncoder textEncoderHelper = new StringBuilderEncoder(CHARSET_DEFAULT); private StringBuilderEncoder getEncoder() { - StringBuilderEncoder result = textEncoderHelper; + final StringBuilderEncoder result = textEncoderHelper; return result; } @@ -191,7 +191,7 @@ public class TextEncoderHelperBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public long byteArrayMCD() { - byte[] data = PATTERN_M_C_D.toByteArray(EVENT); + final byte[] data = PATTERN_M_C_D.toByteArray(EVENT); ByteBuffer buff = destination.getByteBuffer(); if (buff.remaining() < data.length) { buff = destination.drain(buff); @@ -204,8 +204,8 @@ public class TextEncoderHelperBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public long serializableMCD() { - String str = PATTERN_M_C_D.toSerializable(EVENT); - byte[] data = str.getBytes(CHARSET_DEFAULT); + final String str = PATTERN_M_C_D.toSerializable(EVENT); + final byte[] data = str.getBytes(CHARSET_DEFAULT); ByteBuffer buff = destination.getByteBuffer(); if (buff.remaining() < data.length) { buff = destination.drain(buff); @@ -226,7 +226,7 @@ public class TextEncoderHelperBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public String toStringMCD() { - String str = PATTERN_M_C_D.toSerializable(EVENT); + final String str = PATTERN_M_C_D.toSerializable(EVENT); return str; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java index 7d1ccc9..9755f5a 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java @@ -48,21 +48,21 @@ public class ThreadLocalVsConcurrentHashMapBenchmark { @Benchmark public String newInstance() { - StringBuilder sb = getNew(); + final StringBuilder sb = getNew(); sb.append(VALUE); return sb.toString(); } @Benchmark public String threadLocal() { - StringBuilder sb = getThreadLocal(); + final StringBuilder sb = getThreadLocal(); sb.append(VALUE); return sb.toString(); } @Benchmark public String concurrentHashMap() { - StringBuilder sb = getConcurrentMap(); + final StringBuilder sb = getConcurrentMap(); sb.append(VALUE); return sb.toString(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java index 113e56a..57baee5 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java @@ -78,9 +78,9 @@ public class ThreadLocalVsPoolBenchmark { /** */ private static PatternFormatter[] createFormatters() { - Configuration config = new DefaultConfiguration(); - PatternParser parser = new PatternParser(config, "Converter", LogEventPatternConverter.class); - List<PatternFormatter> result = parser.parse(LOG4JPATTERN, false, true); + final Configuration config = new DefaultConfiguration(); + final PatternParser parser = new PatternParser(config, "Converter", LogEventPatternConverter.class); + final List<PatternFormatter> result = parser.parse(LOG4JPATTERN, false, true); return (PatternFormatter[]) result.toArray(new PatternFormatter[result.size()]); } @@ -183,11 +183,11 @@ abstract class ObjectPool<T> { private final Deque<T> pool = new ConcurrentLinkedDeque<>(); public T borrowObject() { - T object = pool.poll(); + final T object = pool.poll(); return object == null ? createObject() : object; } - public void returnObject(T object) { + public void returnObject(final T object) { pool.add(object); } @@ -200,12 +200,12 @@ abstract class ObjectPool<T> { class StringBuilderPool extends ObjectPool<StringBuilder> { private final int initialSize; - public StringBuilderPool(int stringBuilderSize) { + public StringBuilderPool(final int stringBuilderSize) { this.initialSize = stringBuilderSize; } @Override - public void returnObject(StringBuilder stringBuilder) { + public void returnObject(final StringBuilder stringBuilder) { stringBuilder.setLength(0); super.returnObject(stringBuilder); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java index c62ea68..d1a6240 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java @@ -124,8 +124,8 @@ public class ThreadsafeDateFormatBenchmark { public String format(final long timestamp) { if (timestamp != this.timestamp) { this.timestamp = timestamp; - char[] buffer = reusableBuffer.get(); - int len = customFormat.format(timestamp, buffer, 0); + final char[] buffer = reusableBuffer.get(); + final int len = customFormat.format(timestamp, buffer, 0); formatted = new String(buffer, 0, len); } return formatted; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java index 60d6abf..b5c4634 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/VarargsBenchmark.java @@ -68,13 +68,13 @@ public class VarargsBenchmark { "six", "seven", "eight", "nine", "ten"); } - private long varargMethod(String string, String... p) { + private long varargMethod(final String string, final String... p) { return string.length() + p[0].length() + p[1].length() + p[2].length() + p[3].length() + p[4].length() + p[5].length() + p[6].length() + p[7].length() + p[8].length() + p[9].length(); } - private long individualArgMethod(String string, String p1, String p2, String p3, String p4, String p5, String p6, - String p7, String p8, String p9, String p10) { + private long individualArgMethod(final String string, final String p1, final String p2, final String p3, final String p4, final String p5, final String p6, + final String p7, final String p8, final String p9, final String p10) { return string.length() + p1.length() + p2.length() + p3.length() + p4.length() + p5.length() + p6.length() + p7.length() + p8.length() + p9.length() + p10.length(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java index 10f053e..af527b8 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java @@ -30,15 +30,15 @@ public abstract class AbstractLogger { protected abstract Layout<?> createLayout(); - protected void log(Message message) { + protected void log(final Message message) { callAppenders(createLogEvent(message)); } - private void callAppenders(LogEvent logEvent) { + private void callAppenders(final LogEvent logEvent) { appender.append(logEvent); } - private LogEvent createLogEvent(Message message) { + private LogEvent createLogEvent(final Message message) { reusedLogEvent.setMessage(message); return reusedLogEvent; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java index 49481f7..97fd24e 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java @@ -32,7 +32,7 @@ public class ClassicLogger extends AbstractLogger { return PatternLayout.newBuilder().withCharset(StandardCharsets.UTF_8).withPattern("%m").build(); } - public void log(String message, Object... params) { + public void log(final String message, final Object... params) { log(new ParameterizedMessage(message, params)); //log(new NoGcMessage(16).set(message, params[0], params[1], params[2], params[3])); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java index 2f3851d..df9ade0 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java @@ -31,23 +31,23 @@ public class DemoAppender extends AbstractAppender implements ByteBufferDestinat public long checksum; - public DemoAppender(Layout<?> layout) { + public DemoAppender(final Layout<?> layout) { super("demo", null, layout); } @Override - public void append(LogEvent event) { - Layout<?> layout = getLayout(); + public void append(final LogEvent event) { + final Layout<?> layout = getLayout(); if (layout instanceof NoGcLayout) { layout.encode(event, this); drain(byteBuffer); } else { - byte[] binary = getLayout().toByteArray(event); + final byte[] binary = getLayout().toByteArray(event); consume(binary, 0, binary.length); } } - private void consume(byte[] data, int offset, int length) { + private void consume(final byte[] data, final int offset, final int length) { // need to do something with the result or the JVM may optimize everything away long sum = 0; for (int i = offset; i < length; i++) { @@ -62,7 +62,7 @@ public class DemoAppender extends AbstractAppender implements ByteBufferDestinat } @Override - public ByteBuffer drain(ByteBuffer buf) { + public ByteBuffer drain(final ByteBuffer buf) { buf.flip(); consume(buf.array(), buf.position(), buf.limit()); buf.clear(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java index 5f84975..81fa861 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java @@ -41,15 +41,15 @@ public class NoGcLayout implements Layout<Serializable>, Encoder<LogEvent> { private final PatternSerializer2 serializer = new PatternSerializer2(); private final StringBuilderEncoder cachedHelper; - public NoGcLayout(Charset charset) { + public NoGcLayout(final Charset charset) { cachedHelper = new StringBuilderEncoder(charset); } @Override - public void encode(LogEvent event, ByteBufferDestination destination) { - StringBuilder text = toText(event, getCachedStringBuilder()); + public void encode(final LogEvent event, final ByteBufferDestination destination) { + final StringBuilder text = toText(event, getCachedStringBuilder()); - Encoder<StringBuilder> helper = getCachedHelper(); + final Encoder<StringBuilder> helper = getCachedHelper(); helper.encode(text, destination); } @@ -60,7 +60,7 @@ public class NoGcLayout implements Layout<Serializable>, Encoder<LogEvent> { * Implementations are free to return a new StringBuilder if they can * detect in advance that the specified StringBuilder is too small. */ - StringBuilder toText(LogEvent e, StringBuilder destination) { + StringBuilder toText(final LogEvent e, final StringBuilder destination) { return serializer.toSerializable(e, destination); } @@ -88,7 +88,7 @@ public class NoGcLayout implements Layout<Serializable>, Encoder<LogEvent> { this.formatters = formatters; } - public StringBuilder toSerializable(final LogEvent event, StringBuilder buf) { + public StringBuilder toSerializable(final LogEvent event, final StringBuilder buf) { //final StringBuilder buf = getStringBuilder(); final int len = formatters.length; for (int i = 0; i < len; i++) { @@ -113,12 +113,12 @@ public class NoGcLayout implements Layout<Serializable>, Encoder<LogEvent> { } @Override - public byte[] toByteArray(LogEvent event) { + public byte[] toByteArray(final LogEvent event) { return null; } @Override - public Serializable toSerializable(LogEvent event) { + public Serializable toSerializable(final LogEvent event) { return null; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java index 687b718..07a43fc 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java @@ -31,7 +31,7 @@ public class NoGcLogger extends AbstractLogger { return new NoGcLayout(StandardCharsets.UTF_8); } - public void log(String message, Object p1, Object p2, Object p3, Object p4) { + public void log(final String message, final Object p1, final Object p2, final Object p3, final Object p4) { reusedMessage.set(message, p1, p2, p3, p4); log(reusedMessage); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java index fdb84d9..8ee995e 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java @@ -52,8 +52,8 @@ public class NoGcMessage implements Message { return getState().buffer; } - public void set(String message, Object p1, Object p2, Object p3, Object p4) { - InternalState state = getState(); + public void set(final String message, final Object p1, final Object p2, final Object p3, final Object p4) { + final InternalState state = getState(); state.params[0] = p1; state.params[1] = p2; state.params[2] = p3; @@ -62,7 +62,7 @@ public class NoGcMessage implements Message { int current = 0; state.buffer.setLength(0); for (int i = 0; i < message.length() - 1; i++) { - char c = message.charAt(i); + final char c = message.charAt(i); if (c == '{' && message.charAt(i + 1) == '}') { append(state.params[current++], state.buffer); i++; @@ -70,13 +70,13 @@ public class NoGcMessage implements Message { state.buffer.append(c); } } - char c = message.charAt(message.length() - 1); + final char c = message.charAt(message.length() - 1); if (c != '}') { state.buffer.append(c); } } - private void append(Object param, StringBuilder buffer) { + private void append(final Object param, final StringBuilder buffer) { if (param instanceof StringBuilder) { buffer.append((StringBuilder) param); } else { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java index be45a60..8dae290 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java @@ -354,7 +354,7 @@ public class ParameterizedMessage implements Message { // Profiling showed this method is important to log4j performance. Modify with care! // 28 bytes (allows immediate JVM inlining: < 35 bytes) LOG4J2-1096 private static int handleRemainingCharIfAny(final String messagePattern, final int len, final char[] result, - int pos, int escapeCounter, int i) { + int pos, final int escapeCounter, final int i) { if (i == len - 1) { final char curChar = messagePattern.charAt(i); pos = handleLastChar(result, pos, escapeCounter, curChar); @@ -427,7 +427,7 @@ public class ParameterizedMessage implements Message { */ // Profiling showed this method is important to log4j performance. Modify with care! // 20 bytes (allows immediate JVM inlining: < 35 bytes) LOG4J2-1096 - private static int writeUnescapedEscapeChars(int escapeCounter, char[] result, int pos) { + private static int writeUnescapedEscapeChars(int escapeCounter, final char[] result, int pos) { while (escapeCounter > 0) { result[pos++] = ESCAPE_CHAR; escapeCounter--; @@ -460,7 +460,7 @@ public class ParameterizedMessage implements Message { private static int writeArgAt0(final String[] arguments, final int currentArgument, final char[] result, final int pos) { final String arg = String.valueOf(arguments[currentArgument]); - int argLen = arg.length(); + final int argLen = arg.length(); arg.getChars(0, argLen, result, pos); return pos + argLen; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java index f7b4169..f932e20 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java @@ -38,12 +38,12 @@ public class Test { static long[] duration = new long[COUNT]; static long[] checksums = new long[COUNT]; - public static void main(String[] args) throws Exception { + public static void main(final String[] args) throws Exception { if ("Classic".equalsIgnoreCase(args[0])) { - ClassicLogger logger = new ClassicLogger(); + final ClassicLogger logger = new ClassicLogger(); runTestSuite(logger); } else if ("NoGC".equalsIgnoreCase(args[0])) { - NoGcLogger logger = new NoGcLogger(); + final NoGcLogger logger = new NoGcLogger(); runTestSuite(logger); } else { throw new IllegalArgumentException("Specify either Classic or NoGC"); @@ -54,23 +54,23 @@ public class Test { reportResults(args[0]); } - private static void runTestSuite(ClassicLogger logger) throws Exception { + private static void runTestSuite(final ClassicLogger logger) throws Exception { for (int i = 0; i < 10; i++) { doTestRun(logger, REPETITIONS, i); Thread.sleep(100); } } - private static void runTestSuite(NoGcLogger logger) throws Exception { + private static void runTestSuite(final NoGcLogger logger) throws Exception { for (int i = 0; i < 10; i++) { doTestRun(logger, REPETITIONS, i); Thread.sleep(100); } } - private static void doTestRun(NoGcLogger logger, int repetitions, int n) { + private static void doTestRun(final NoGcLogger logger, final int repetitions, final int n) { startTime[n] = System.currentTimeMillis(); - long start = System.nanoTime(); + final long start = System.nanoTime(); for (int i = 0; i < repetitions; i++) { logger.log("Test message str={}, double={}, int={}, obj={}", "abc", box(i / 2.5), box(i), "XYX"); //logger.log("Test message str={}, double={}, int={}, obj={}", "abc", (i / 2.5), (i), logger); @@ -80,9 +80,9 @@ public class Test { logger.appender.checksum = 0; } - private static void doTestRun(ClassicLogger logger, int repetitions, int n) { + private static void doTestRun(final ClassicLogger logger, final int repetitions, final int n) { startTime[n] = System.currentTimeMillis(); - long start = System.nanoTime(); + final long start = System.nanoTime(); for (int i = 0; i < repetitions; i++) { logger.log("Test message str={}, double={}, int={}, obj={}", "abc", i / 2.5, i, "XYX"); } @@ -91,9 +91,9 @@ public class Test { logger.appender.checksum = 0; } - private static void doTestRunBoth(ClassicLogger classic, NoGcLogger nogc, int repetitions, int n) { + private static void doTestRunBoth(final ClassicLogger classic, final NoGcLogger nogc, final int repetitions, final int n) { startTime[n] = System.currentTimeMillis(); - long start = System.nanoTime(); + final long start = System.nanoTime(); for (int i = 0; i < repetitions; i++) { classic.log("Test message str={}, double={}, int={}, obj={}", "abc", i / 2.5, i, "XYX"); nogc.log("Test message str={}, double={}, int={}, obj={}", "abc", box(i / 2.5), box(i), "XYX"); @@ -105,7 +105,7 @@ public class Test { duration[n] = System.nanoTime() - start; } - private static void reportResults(String type) { + private static void reportResults(final String type) { for (int i = 0; i < COUNT; i++) { System.out.printf("%s[%d] (%3$tF %3$tT.%3$tL) took %4$,d ns. CHECK=%5$s%n", type, i, new Date(startTime[i]), duration[i], Long.toHexString(checksums[i])); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java index 35171c2..30fa0d6 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java @@ -32,17 +32,17 @@ public class DemoAppender extends AbstractAppender implements ByteBufferDestinat public long checksum; - public DemoAppender(Layout<?> layout) { + public DemoAppender(final Layout<?> layout) { super("demo", null, layout); } @Override - public void append(LogEvent event) { + public void append(final LogEvent event) { if (Constants.ENABLE_DIRECT_ENCODERS) { getLayout().encode(event, this); drain(byteBuffer); } else { - byte[] binary = getLayout().toByteArray(event); + final byte[] binary = getLayout().toByteArray(event); consume(binary, 0, binary.length); } } @@ -53,14 +53,14 @@ public class DemoAppender extends AbstractAppender implements ByteBufferDestinat } @Override - public ByteBuffer drain(ByteBuffer buf) { + public ByteBuffer drain(final ByteBuffer buf) { buf.flip(); consume(buf.array(), buf.position(), buf.limit()); buf.clear(); return buf; } - private void consume(byte[] data, int offset, int length) { + private void consume(final byte[] data, final int offset, final int length) { // need to do something with the result or the JVM may optimize everything away long sum = 0; for (int i = offset; i < length; i++) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java index 0dd4345..bd34b52 100644 --- a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java +++ b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java @@ -57,7 +57,7 @@ public class CustomConfiguration extends AbstractConfiguration { /** * Constructor to create the default configuration. */ - public CustomConfiguration(ConfigurationSource source) { + public CustomConfiguration(final ConfigurationSource source) { super(source); setName(CONFIG_NAME); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java ---------------------------------------------------------------------- diff --git a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java index fcd2c5c..8bd3415 100644 --- a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java +++ b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java @@ -51,14 +51,14 @@ public class CustomLookup extends AbstractLookup { @Override public String lookup(final LogEvent event, final String key) { try { - Map<String, String> properties = loggerProperties.get(event.getLoggerName()); + final Map<String, String> properties = loggerProperties.get(event.getLoggerName()); if (properties == null) { return ""; } if (key == null || key.length() == 0 || key.equals("*")) { - StringBuilder sb = new StringBuilder("{"); + final StringBuilder sb = new StringBuilder("{"); boolean first = true; - for (Map.Entry<String, String> entry : properties.entrySet()) { + for (final Map.Entry<String, String> entry : properties.entrySet()) { if (!first) { sb.append(", "); } @@ -75,7 +75,7 @@ public class CustomLookup extends AbstractLookup { } } - public static void setLoggerProperties(String loggerName, Map<String, String> properties) { + public static void setLoggerProperties(final String loggerName, final Map<String, String> properties) { loggerProperties.put(loggerName, properties); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java ---------------------------------------------------------------------- diff --git a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java index 5480a8e..1bf6529 100644 --- a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java +++ b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java @@ -28,7 +28,7 @@ public class CustomMapMessage extends MapMessage { private static final long serialVersionUID = 1L; private final String message; - public CustomMapMessage(String msg, Map<String, String> map) { + public CustomMapMessage(final String msg, final Map<String, String> map) { super(map); this.message = msg; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java ---------------------------------------------------------------------- diff --git a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java index 7a1faaa..0bcd0dd 100644 --- a/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java +++ b/log4j-samples/loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java @@ -51,17 +51,17 @@ public class MapMessageLookup extends AbstractLookup { */ @Override public String lookup(final LogEvent event, final String key) { - Message msg = event.getMessage(); + final Message msg = event.getMessage(); if (msg instanceof MapMessage) { try { - Map<String, String> properties = ((MapMessage) msg).getData(); + final Map<String, String> properties = ((MapMessage) msg).getData(); if (properties == null) { return ""; } if (key == null || key.length() == 0 || key.equals("*")) { - StringBuilder sb = new StringBuilder("{"); + final StringBuilder sb = new StringBuilder("{"); boolean first = true; - for (Map.Entry<String, String> entry : properties.entrySet()) { + for (final Map.Entry<String, String> entry : properties.entrySet()) { if (!first) { sb.append(", "); } @@ -80,7 +80,7 @@ public class MapMessageLookup extends AbstractLookup { return null; } - public static void setLoggerProperties(String loggerName, Map<String, String> properties) { + public static void setLoggerProperties(final String loggerName, final Map<String, String> properties) { loggerProperties.put(loggerName, properties); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-samples/loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java ---------------------------------------------------------------------- diff --git a/log4j-samples/loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java b/log4j-samples/loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java index 3612dde..5c5321b 100644 --- a/log4j-samples/loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java +++ b/log4j-samples/loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java @@ -30,8 +30,8 @@ public class CustomPropertiesTest { @Test public void testProperties() throws Exception { - Logger logger = LogManager.getLogger("TestProperties"); - Map<String, String> loggerProperties = new ConcurrentHashMap<>(); + final Logger logger = LogManager.getLogger("TestProperties"); + final Map<String, String> loggerProperties = new ConcurrentHashMap<>(); CustomLookup.setLoggerProperties("TestProperties", loggerProperties); loggerProperties.put("key1", "CustomPropertiesTest"); loggerProperties.put("key2", "TestValue"); @@ -40,8 +40,8 @@ public class CustomPropertiesTest { @Test public void mapMessageProperties() throws Exception { - Logger logger = LogManager.getLogger("MapProperties"); - Map<String, String> loggerProperties = new ConcurrentHashMap<>(); + final Logger logger = LogManager.getLogger("MapProperties"); + final Map<String, String> loggerProperties = new ConcurrentHashMap<>(); loggerProperties.put("key1", "CustomPropertiesTest"); loggerProperties.put("key2", "TestValue"); logger.debug(new CustomMapMessage("This is a test", loggerProperties)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java ---------------------------------------------------------------------- diff --git a/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java b/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java index fb95d97..7e193dd 100644 --- a/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java +++ b/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/Log4jTaglibLoggerContext.java @@ -87,12 +87,12 @@ final class Log4jTaglibLoggerContext implements LoggerContext { } @Override - public boolean hasLogger(String name, MessageFactory messageFactory) { + public boolean hasLogger(final String name, final MessageFactory messageFactory) { return loggerRegistry.hasLogger(name, messageFactory); } @Override - public boolean hasLogger(String name, Class<? extends MessageFactory> messageFactoryClass) { + public boolean hasLogger(final String name, final Class<? extends MessageFactory> messageFactoryClass) { return loggerRegistry.hasLogger(name, messageFactoryClass); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java ---------------------------------------------------------------------- diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java index 7923b2b..4c0120b 100644 --- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java +++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContext.java @@ -62,12 +62,12 @@ public class SLF4JLoggerContext implements LoggerContext { } @Override - public boolean hasLogger(String name, MessageFactory messageFactory) { + public boolean hasLogger(final String name, final MessageFactory messageFactory) { return loggerRegistry.hasLogger(name, messageFactory); } @Override - public boolean hasLogger(String name, Class<? extends MessageFactory> messageFactoryClass) { + public boolean hasLogger(final String name, final Class<? extends MessageFactory> messageFactoryClass) { return loggerRegistry.hasLogger(name, messageFactoryClass); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce4492f6/log4j-web/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java index c8e5221..d7820b2 100644 --- a/log4j-web/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java +++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java @@ -25,21 +25,21 @@ import org.apache.logging.log4j.ThreadContext; public class ServletRequestThreadContext { - public static void put(String key, ServletRequest servletRequest) { + public static void put(final String key, final ServletRequest servletRequest) { put(key, "RemoteAddr", servletRequest.getRemoteAddr()); put(key, "RemoteHost", servletRequest.getRemoteHost()); put(key, "RemotePort", servletRequest.getRemotePort()); } - public static void put(String key, String field, Object value) { + public static void put(final String key, final String field, final Object value) { put(key + "." + field, Objects.toString(value)); } - public static void put(String key, String value) { + public static void put(final String key, final String value) { ThreadContext.put(key, value); } - public static void put(String key, HttpServletRequest servletRequest) { + public static void put(final String key, final HttpServletRequest servletRequest) { put(key, (ServletRequest) servletRequest); } }
