Add final modifier to method parameters. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7f555c8c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7f555c8c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7f555c8c
Branch: refs/heads/master Commit: 7f555c8c98ce51b8016fec8302fea7a13d786da7 Parents: 40208bc Author: Gary Gregory <[email protected]> Authored: Thu Jul 6 03:13:18 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu Jul 6 03:13:18 2017 -0700 ---------------------------------------------------------------------- .../log4j/message/LocalizedMessageFactory.java | 2 +- .../log4j/message/StructuredDataMessage.java | 18 +- .../org/apache/logging/log4j/spi/Provider.java | 10 +- .../log4j/util/SortedArrayStringMap.java | 4 +- .../java/org/apache/logging/log4j/Timer.java | 2 +- .../log4j/core/appender/HttpAppender.java | 6 +- .../core/appender/HttpURLConnectionManager.java | 6 +- .../core/appender/OutputStreamManager.java | 2 +- .../core/appender/mom/kafka/KafkaAppender.java | 8 +- .../core/appender/mom/kafka/KafkaManager.java | 2 +- .../rolling/AbstractRolloverStrategy.java | 4 +- .../rolling/DefaultRolloverStrategy.java | 16 +- .../rolling/DirectWriteRolloverStrategy.java | 12 +- .../rolling/TimeBasedTriggeringPolicy.java | 6 +- .../action/PosixViewAttributeAction.java | 20 +- .../impl/DefaultConfigurationBuilder.java | 4 +- .../config/plugins/convert/Base64Converter.java | 2 +- .../config/plugins/convert/HexConverter.java | 2 +- .../validators/ValidHostValidator.java | 4 +- .../log4j/core/config/xml/XmlConfiguration.java | 2 +- .../core/layout/AbstractJacksonLayout.java | 6 +- .../log4j/core/layout/AbstractStringLayout.java | 6 +- .../layout/ByteBufferDestinationHelper.java | 2 +- .../logging/log4j/core/layout/GelfLayout.java | 14 +- .../logging/log4j/core/layout/JsonLayout.java | 2 +- .../log4j/core/layout/MessageLayout.java | 6 +- .../log4j/core/layout/TextEncoderHelper.java | 2 +- .../log4j/core/net/ssl/LaxHostnameVerifier.java | 2 +- .../log4j/core/net/ssl/StoreConfiguration.java | 2 +- .../core/pattern/ProcessIdPatternConverter.java | 4 +- .../core/pattern/ThrowablePatternConverter.java | 2 +- .../log4j/core/tools/CustomLoggerGenerator.java | 2 +- .../core/tools/ExtendedLoggerGenerator.java | 2 +- .../logging/log4j/core/util/CronExpression.java | 6 +- .../logging/log4j/core/CronRolloverApp.java | 2 +- .../apache/logging/log4j/core/LogEventTest.java | 2 +- .../appender/FileAppenderPermissionsTest.java | 2 +- .../log4j/core/appender/HttpAppenderTest.java | 2 +- .../SyslogAppenderCustomLayoutTest.java | 76 +-- .../core/appender/SyslogAppenderTestBase.java | 8 +- .../appender/rolling/EligibleFilesTest.java | 4 +- .../core/config/CompositeConfigurationTest.java | 490 +++++++++---------- .../log4j/core/impl/ThrowableProxyTest.java | 4 +- .../nosql/appender/couchdb/CouchDbProvider.java | 2 +- .../nosql/appender/cassandra/CassandraRule.java | 2 +- ...ractStringLayoutStringEncodingBenchmark.java | 2 +- .../log4j/perf/jmh/Log4jLogEventBenchmark.java | 2 +- .../log4j/perf/jmh/ReflectionBenchmark.java | 4 +- .../logging/log4j/perf/nogc/DemoAppender.java | 2 +- .../logging/log4j/perf/util/DemoAppender.java | 2 +- 50 files changed, 398 insertions(+), 398 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java index 062a3e3..b7e9803 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/LocalizedMessageFactory.java @@ -67,7 +67,7 @@ public class LocalizedMessageFactory extends AbstractMessageFactory { * @since 2.8 */ @Override - public Message newMessage(String key) { + public Message newMessage(final String key) { if (resourceBundle == null) { return new LocalizedMessage(baseName, key); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java index d610cc4..f0a3a8b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java @@ -381,7 +381,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str } @Override - protected void validate(String key, boolean value) { + protected void validate(final String key, final boolean value) { validateKey(key); } @@ -389,7 +389,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str * @since 2.9 */ @Override - protected void validate(String key, byte value) { + protected void validate(final String key, final byte value) { validateKey(key); } @@ -397,7 +397,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str * @since 2.9 */ @Override - protected void validate(String key, char value) { + protected void validate(final String key, final char value) { validateKey(key); } @@ -405,7 +405,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str * @since 2.9 */ @Override - protected void validate(String key, double value) { + protected void validate(final String key, final double value) { validateKey(key); } @@ -413,7 +413,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str * @since 2.9 */ @Override - protected void validate(String key, float value) { + protected void validate(final String key, final float value) { validateKey(key); } @@ -421,7 +421,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str * @since 2.9 */ @Override - protected void validate(String key, int value) { + protected void validate(final String key, final int value) { validateKey(key); } @@ -429,7 +429,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str * @since 2.9 */ @Override - protected void validate(String key, long value) { + protected void validate(final String key, final long value) { validateKey(key); } @@ -437,7 +437,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str * @since 2.9 */ @Override - protected void validate(String key, Object value) { + protected void validate(final String key, final Object value) { validateKey(key); } @@ -445,7 +445,7 @@ public class StructuredDataMessage extends MapMessage<StructuredDataMessage, Str * @since 2.9 */ @Override - protected void validate(String key, short value) { + protected void validate(final String key, final short value) { validateKey(key); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java index a50c227..e610398 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java @@ -66,15 +66,15 @@ public class Provider { versions = null; } - public Provider(Integer priority, String versions, - Class<? extends LoggerContextFactory> loggerContextFactoryClass) { + public Provider(final Integer priority, final String versions, + final Class<? extends LoggerContextFactory> loggerContextFactoryClass) { this(priority, versions, loggerContextFactoryClass, null); } - public Provider(Integer priority, String versions, - Class<? extends LoggerContextFactory> loggerContextFactoryClass, - Class<? extends ThreadContextMap> threadContextMapClass) { + public Provider(final Integer priority, final String versions, + final Class<? extends LoggerContextFactory> loggerContextFactoryClass, + final Class<? extends ThreadContextMap> threadContextMapClass) { this.url = null; this.classLoader = null; this.priority = priority; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java index ac72f39..2a78b4e 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java @@ -497,7 +497,7 @@ public class SortedArrayStringMap implements IndexedStringMap { } } - private static byte[] marshall(Object obj) throws IOException { + private static byte[] marshall(final Object obj) throws IOException { if (obj == null) { return null; } @@ -509,7 +509,7 @@ public class SortedArrayStringMap implements IndexedStringMap { } } - private static Object unmarshall(byte[] data) throws IOException, ClassNotFoundException { + private static Object unmarshall(final byte[] data) throws IOException, ClassNotFoundException { ByteArrayInputStream bin = new ByteArrayInputStream(data); try (ObjectInputStream ois = new ObjectInputStream(bin)) { return ois.readObject(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java b/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java index 2a4780a..5dbe837 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java @@ -151,7 +151,7 @@ public class Timer implements Serializable, StringBuilderFormattable } @Override - public void formatTo(StringBuilder buffer) { + public void formatTo(final StringBuilder buffer) { buffer.append("Timer ").append(name); switch (status) { case "Start": http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpAppender.java index 5d2ff87..59f93c8 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpAppender.java @@ -115,12 +115,12 @@ public final class HttpAppender extends AbstractAppender { return asBuilder(); } - public B setConnectTimeoutMillis(int connectTimeoutMillis) { + public B setConnectTimeoutMillis(final int connectTimeoutMillis) { this.connectTimeoutMillis = connectTimeoutMillis; return asBuilder(); } - public B setReadTimeoutMillis(int readTimeoutMillis) { + public B setReadTimeoutMillis(final int readTimeoutMillis) { this.readTimeoutMillis = readTimeoutMillis; return asBuilder(); } @@ -135,7 +135,7 @@ public final class HttpAppender extends AbstractAppender { return asBuilder(); } - public B setVerifyHostname(boolean verifyHostname) { + public B setVerifyHostname(final boolean verifyHostname) { this.verifyHostname = verifyHostname; return asBuilder(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java index f948803..80aec97 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java @@ -50,12 +50,12 @@ public class HttpURLConnectionManager extends HttpManager { private final SslConfiguration sslConfiguration; private final boolean verifyHostname; - public HttpURLConnectionManager(final Configuration configuration, LoggerContext loggerContext, final String name, + public HttpURLConnectionManager(final Configuration configuration, final LoggerContext loggerContext, final String name, final URL url, final String method, final int connectTimeoutMillis, final int readTimeoutMillis, final Property[] headers, - SslConfiguration sslConfiguration, - boolean verifyHostname) { + final SslConfiguration sslConfiguration, + final boolean verifyHostname) { super(configuration, loggerContext, name); this.url = url; if (!(url.getProtocol().equalsIgnoreCase("http") || url.getProtocol().equalsIgnoreCase("https"))) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java index 55e51e4..51ef174 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java @@ -353,7 +353,7 @@ public class OutputStreamManager extends AbstractManager implements ByteBufferDe } @Override - public void writeBytes(ByteBuffer data) { + public void writeBytes(final ByteBuffer data) { if (data.remaining() == 0) { return; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java index 2c495ae..5fb1c7c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java @@ -82,17 +82,17 @@ public final class KafkaAppender extends AbstractAppender { return properties; } - public B setTopic(String topic) { + public B setTopic(final String topic) { this.topic = topic; return asBuilder(); } - public B setSyncSend(boolean syncSend) { + public B setSyncSend(final boolean syncSend) { this.syncSend = syncSend; return asBuilder(); } - public B setProperties(Property[] properties) { + public B setProperties(final Property[] properties) { this.properties = properties; return asBuilder(); } @@ -141,7 +141,7 @@ public final class KafkaAppender extends AbstractAppender { } } - private void tryAppend(LogEvent event) throws ExecutionException, InterruptedException, TimeoutException { + private void tryAppend(final LogEvent event) throws ExecutionException, InterruptedException, TimeoutException { final Layout<? extends Serializable> layout = getLayout(); byte[] data; if (layout != null) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java index 697b37a..fde5ae4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java @@ -103,7 +103,7 @@ public class KafkaManager extends AbstractManager { } else { producer.send(newRecord, new Callback() { @Override - public void onCompletion(RecordMetadata metadata, Exception e) { + public void onCompletion(final RecordMetadata metadata, final Exception e) { if (e != null) { LOGGER.error("Unable to write to Kafka in appender [" + getName() + "]", e); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java index 5603e7c..42c8509 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java @@ -92,11 +92,11 @@ public abstract class AbstractRolloverStrategy implements RolloverStrategy { return getEligibleFiles(buf.toString(), pattern, isAscending); } - protected SortedMap<Integer, Path> getEligibleFiles(String path, String pattern) { + protected SortedMap<Integer, Path> getEligibleFiles(final String path, final String pattern) { return getEligibleFiles(path, pattern, true); } - protected SortedMap<Integer, Path> getEligibleFiles(String path, String logfilePattern, boolean isAscending) { + protected SortedMap<Integer, Path> getEligibleFiles(final String path, final String logfilePattern, final boolean isAscending) { TreeMap<Integer, Path> eligibleFiles = new TreeMap<>(); File file = new File(path); File parent = file.getParentFile(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java index 972f348..a8f4a2e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java @@ -156,7 +156,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { * @param max The maximum number of files to keep. * @return This builder for chaining convenience */ - public Builder withMax(String max) { + public Builder withMax(final String max) { this.max = max; return this; } @@ -171,7 +171,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { * @param min The minimum number of files to keep. * @return This builder for chaining convenience */ - public Builder withMin(String min) { + public Builder withMin(final String min) { this.min = min; return this; } @@ -187,7 +187,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { * index. If set to "min", file renaming and the counter will follow the Fixed Window strategy. * @return This builder for chaining convenience */ - public Builder withFileIndex(String fileIndex) { + public Builder withFileIndex(final String fileIndex) { this.fileIndex = fileIndex; return this; } @@ -202,7 +202,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { * @param compressionLevelStr The compression level, 0 (less) through 9 (more); applies only to ZIP files. * @return This builder for chaining convenience */ - public Builder withCompressionLevelStr(String compressionLevelStr) { + public Builder withCompressionLevelStr(final String compressionLevelStr) { this.compressionLevelStr = compressionLevelStr; return this; } @@ -217,7 +217,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { * @param customActions custom actions to perform asynchronously after rollover * @return This builder for chaining convenience */ - public Builder withCustomActions(Action[] customActions) { + public Builder withCustomActions(final Action[] customActions) { this.customActions = customActions; return this; } @@ -232,7 +232,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { * @param stopCustomActionsOnError whether to stop executing asynchronous actions if an error occurs * @return This builder for chaining convenience */ - public Builder withStopCustomActionsOnError(boolean stopCustomActionsOnError) { + public Builder withStopCustomActionsOnError(final boolean stopCustomActionsOnError) { this.stopCustomActionsOnError = stopCustomActionsOnError; return this; } @@ -247,7 +247,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { * @param tempCompressedFilePattern File pattern of the working file pattern used during compression, if null no temporary file are used * @return This builder for chaining convenience */ - public Builder withTempCompressedFilePattern(String tempCompressedFilePattern) { + public Builder withTempCompressedFilePattern(final String tempCompressedFilePattern) { this.tempCompressedFilePattern = tempCompressedFilePattern; return this; } @@ -262,7 +262,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { * @param config The Configuration. * @return This builder for chaining convenience */ - public Builder withConfig(Configuration config) { + public Builder withConfig(final Configuration config) { this.config = config; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java index 94bb9cb..6209460 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java @@ -110,7 +110,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem * @param maxFiles The maximum number of files that match the date portion of the pattern to keep. * @return This builder for chaining convenience */ - public Builder withMaxFiles(String maxFiles) { + public Builder withMaxFiles(final String maxFiles) { this.maxFiles = maxFiles; return this; } @@ -125,7 +125,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem * @param compressionLevelStr The compression level, 0 (less) through 9 (more); applies only to ZIP files. * @return This builder for chaining convenience */ - public Builder withCompressionLevelStr(String compressionLevelStr) { + public Builder withCompressionLevelStr(final String compressionLevelStr) { this.compressionLevelStr = compressionLevelStr; return this; } @@ -140,7 +140,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem * @param customActions custom actions to perform asynchronously after rollover * @return This builder for chaining convenience */ - public Builder withCustomActions(Action[] customActions) { + public Builder withCustomActions(final Action[] customActions) { this.customActions = customActions; return this; } @@ -155,7 +155,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem * @param stopCustomActionsOnError whether to stop executing asynchronous actions if an error occurs * @return This builder for chaining convenience */ - public Builder withStopCustomActionsOnError(boolean stopCustomActionsOnError) { + public Builder withStopCustomActionsOnError(final boolean stopCustomActionsOnError) { this.stopCustomActionsOnError = stopCustomActionsOnError; return this; } @@ -170,7 +170,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem * @param tempCompressedFilePattern File pattern of the working file pattern used during compression, if null no temporary file are used * @return This builder for chaining convenience */ - public Builder withTempCompressedFilePattern(String tempCompressedFilePattern) { + public Builder withTempCompressedFilePattern(final String tempCompressedFilePattern) { this.tempCompressedFilePattern = tempCompressedFilePattern; return this; } @@ -185,7 +185,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem * @param config The Configuration. * @return This builder for chaining convenience */ - public Builder withConfig(Configuration config) { + public Builder withConfig(final Configuration config) { this.config = config; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java index 6d9d64d..2c1ab5f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java @@ -63,17 +63,17 @@ public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy { return maxRandomDelay; } - public Builder withInterval(int interval){ + public Builder withInterval(final int interval){ this.interval = interval; return this; } - public Builder withModulate(boolean modulate){ + public Builder withModulate(final boolean modulate){ this.modulate = modulate; return this; } - public Builder withMaxRandomDelay(int maxRandomDelay){ + public Builder withMaxRandomDelay(final int maxRandomDelay){ this.maxRandomDelay = maxRandomDelay; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java index 431de3f..bb5bc74 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java @@ -145,7 +145,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param configuration {@link AbstractPathAction#getStrSubstitutor()} * @return This builder */ - public Builder withConfiguration(Configuration configuration) { + public Builder withConfiguration(final Configuration configuration) { this.configuration = configuration; return this; } @@ -156,7 +156,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param subst {@link AbstractPathAction#getStrSubstitutor()} * @return This builder */ - public Builder withSubst(StrSubstitutor subst) { + public Builder withSubst(final StrSubstitutor subst) { this.subst = subst; return this; } @@ -166,7 +166,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param basePath {@link AbstractPathAction#getBasePath()} * @return This builder */ - public Builder withBasePath(String basePath) { + public Builder withBasePath(final String basePath) { this.basePath = basePath; return this; } @@ -176,7 +176,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param followLinks Follow synonyms links * @return This builder */ - public Builder withFollowLinks(boolean followLinks) { + public Builder withFollowLinks(final boolean followLinks) { this.followLinks = followLinks; return this; } @@ -186,7 +186,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param maxDepth Max search depth * @return This builder */ - public Builder withMaxDepth(int maxDepth) { + public Builder withMaxDepth(final int maxDepth) { this.maxDepth = maxDepth; return this; } @@ -197,7 +197,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param pathConditions {@link AbstractPathAction#getPathConditions()} * @return This builder */ - public Builder withPathConditions(PathCondition[] pathConditions) { + public Builder withPathConditions(final PathCondition[] pathConditions) { this.pathConditions = pathConditions; return this; } @@ -211,7 +211,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param filePermissionsString Permissions to apply * @return This builder */ - public Builder withFilePermissionsString(String filePermissionsString) { + public Builder withFilePermissionsString(final String filePermissionsString) { this.filePermissionsString = filePermissionsString; return this; } @@ -221,7 +221,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param filePermissions Permissions to apply * @return This builder */ - public Builder withFilePermissions(Set<PosixFilePermission> filePermissions) { + public Builder withFilePermissions(final Set<PosixFilePermission> filePermissions) { this.filePermissions = filePermissions; return this; } @@ -231,7 +231,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param fileOwner File owner * @return This builder */ - public Builder withFileOwner(String fileOwner) { + public Builder withFileOwner(final String fileOwner) { this.fileOwner = fileOwner; return this; } @@ -241,7 +241,7 @@ public class PosixViewAttributeAction extends AbstractPathAction { * @param fileGroup File group * @return This builder */ - public Builder withFileGroup(String fileGroup) { + public Builder withFileGroup(final String fileGroup) { this.fileGroup = fileGroup; return this; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java index 29acea4..472ac3d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java @@ -413,12 +413,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement } @Override - public PropertyComponentBuilder newProperty(String name, String value) { + public PropertyComponentBuilder newProperty(final String name, final String value) { return new DefaultPropertyComponentBuilder(this, name, value); } @Override - public KeyValuePairComponentBuilder newKeyValuePair(String key, String value) { + public KeyValuePairComponentBuilder newKeyValuePair(final String key, final String value) { return new DefaultKeyValuePairComponentBuilder(this, key, value); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java index e8ba020..f5aa603 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java @@ -46,7 +46,7 @@ public class Base64Converter { } } - public static byte[] parseBase64Binary(String encoded) { + public static byte[] parseBase64Binary(final String encoded) { if (method == null) { LOGGER.error("No base64 converter"); } else { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java index 3e977fa..210fcb4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java @@ -6,7 +6,7 @@ package org.apache.logging.log4j.core.config.plugins.convert; */ public class HexConverter { - public static byte[] parseHexBinary(String s) { + public static byte[] parseHexBinary(final String s) { int len = s.length(); byte[] data = new byte[len / 2]; for (int i = 0; i < len; i += 2) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidator.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidator.java index 3aa10a2..6c01753 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidator.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidHostValidator.java @@ -37,12 +37,12 @@ public class ValidHostValidator implements ConstraintValidator<ValidHost> { private ValidHost annotation; @Override - public void initialize(ValidHost annotation) { + public void initialize(final ValidHost annotation) { this.annotation = annotation; } @Override - public boolean isValid(String name, Object value) { + public boolean isValid(final String name, final Object value) { if (value == null) { LOGGER.error(annotation.message()); return false; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java index 6007461..81db0de 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java @@ -199,7 +199,7 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu return factory.newDocumentBuilder(); } - private static void disableDtdProcessing(DocumentBuilderFactory factory) throws ParserConfigurationException { + private static void disableDtdProcessing(final DocumentBuilderFactory factory) throws ParserConfigurationException { factory.setValidating(false); factory.setExpandEntityReferences(false); factory.setFeature("http://xml.org/sax/features/external-general-entities";, false); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java index 5d0252f..1588cd1 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java @@ -103,12 +103,12 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout { return asBuilder(); } - public B setLocationInfo(boolean locationInfo) { + public B setLocationInfo(final boolean locationInfo) { this.locationInfo = locationInfo; return asBuilder(); } - public B setProperties(boolean properties) { + public B setProperties(final boolean properties) { this.properties = properties; return asBuilder(); } @@ -118,7 +118,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout { * @param includeStacktrace If "true", includes the stacktrace of any Throwable in the generated JSON, defaults to "true". * @return this builder */ - public B setIncludeStacktrace(boolean includeStacktrace) { + public B setIncludeStacktrace(final boolean includeStacktrace) { this.includeStacktrace = includeStacktrace; return asBuilder(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java index 14b3d0d..a2a803c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java @@ -69,17 +69,17 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem return headerSerializer; } - public B setCharset(Charset charset) { + public B setCharset(final Charset charset) { this.charset = charset; return asBuilder(); } - public B setFooterSerializer(Serializer footerSerializer) { + public B setFooterSerializer(final Serializer footerSerializer) { this.footerSerializer = footerSerializer; return asBuilder(); } - public B setHeaderSerializer(Serializer headerSerializer) { + public B setHeaderSerializer(final Serializer headerSerializer) { this.headerSerializer = headerSerializer; return asBuilder(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java index e1fa40d..d91ecfd 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java @@ -35,7 +35,7 @@ public final class ByteBufferDestinationHelper { * @param source the data to write * @param destination the {@code ByteBufferDestination} to write to */ - public static void writeToUnsynchronized(ByteBuffer source, ByteBufferDestination destination) { + public static void writeToUnsynchronized(final ByteBuffer source, final ByteBufferDestination destination) { ByteBuffer destBuff = destination.getByteBuffer(); while (source.remaining() > destBuff.remaining()) { int originalLimit = source.limit(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java index 386781c..aeb523f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java @@ -165,7 +165,7 @@ public final class GelfLayout extends AbstractStringLayout { * * @return this builder */ - public B setHost(String host) { + public B setHost(final String host) { this.host = host; return asBuilder(); } @@ -175,7 +175,7 @@ public final class GelfLayout extends AbstractStringLayout { * * @return this builder */ - public B setCompressionType(CompressionType compressionType) { + public B setCompressionType(final CompressionType compressionType) { this.compressionType = compressionType; return asBuilder(); } @@ -185,7 +185,7 @@ public final class GelfLayout extends AbstractStringLayout { * * @return this builder */ - public B setCompressionThreshold(int compressionThreshold) { + public B setCompressionThreshold(final int compressionThreshold) { this.compressionThreshold = compressionThreshold; return asBuilder(); } @@ -196,7 +196,7 @@ public final class GelfLayout extends AbstractStringLayout { * * @return this builder */ - public B setIncludeStacktrace(boolean includeStacktrace) { + public B setIncludeStacktrace(final boolean includeStacktrace) { this.includeStacktrace = includeStacktrace; return asBuilder(); } @@ -206,7 +206,7 @@ public final class GelfLayout extends AbstractStringLayout { * * @return this builder */ - public B setIncludeThreadContext(boolean includeThreadContext) { + public B setIncludeThreadContext(final boolean includeThreadContext) { this.includeThreadContext = includeThreadContext; return asBuilder(); } @@ -217,7 +217,7 @@ public final class GelfLayout extends AbstractStringLayout { * * @return this builder */ - public B setIncludeNullDelimiter(boolean includeNullDelimiter) { + public B setIncludeNullDelimiter(final boolean includeNullDelimiter) { this.includeNullDelimiter = includeNullDelimiter; return asBuilder(); } @@ -227,7 +227,7 @@ public final class GelfLayout extends AbstractStringLayout { * * @return this builder */ - public B setAdditionalFields(KeyValuePair[] additionalFields) { + public B setAdditionalFields(final KeyValuePair[] additionalFields) { this.additionalFields = additionalFields; return asBuilder(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java index 3b968b4..b15ab5a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java @@ -92,7 +92,7 @@ public final class JsonLayout extends AbstractJacksonLayout { return propertiesAsList; } - public B setPropertiesAsList(boolean propertiesAsList) { + public B setPropertiesAsList(final boolean propertiesAsList) { this.propertiesAsList = propertiesAsList; return asBuilder(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MessageLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MessageLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MessageLayout.java index 58455ee..f446cb1 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MessageLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MessageLayout.java @@ -35,7 +35,7 @@ import org.apache.logging.log4j.message.Message; @Plugin(name = "MessageLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true) public class MessageLayout extends AbstractLayout<Message> { - public MessageLayout(Configuration configuration, byte[] header, byte[] footer) { + public MessageLayout(final Configuration configuration, final byte[] header, final byte[] footer) { super(configuration, header, footer); } @@ -44,12 +44,12 @@ public class MessageLayout extends AbstractLayout<Message> { } @Override - public byte[] toByteArray(LogEvent event) { + public byte[] toByteArray(final LogEvent event) { return null; } @Override - public Message toSerializable(LogEvent event) { + public Message toSerializable(final LogEvent event) { return event.getMessage(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java index 4c6763c..69cf8f2 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java @@ -244,7 +244,7 @@ public class TextEncoderHelper { * @param result the CoderResult from the CharsetEncoder * @return the ByteBuffer to encode into for the remainder of the text */ - private static ByteBuffer drainIfByteBufferFull(final ByteBufferDestination destination, ByteBuffer temp, + private static ByteBuffer drainIfByteBufferFull(final ByteBufferDestination destination, final ByteBuffer temp, final CoderResult result) { if (result.isOverflow()) { // byte buffer full // all callers already synchronize on destination but for safety ensure we are synchronized because http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java index 2431cde..72df910 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java @@ -32,7 +32,7 @@ public final class LaxHostnameVerifier implements HostnameVerifier { } @Override - public boolean verify(String s, SSLSession sslSession) { + public boolean verify(final String s, final SSLSession sslSession) { return true; } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java index 24d878e..bbdbe72 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java @@ -71,7 +71,7 @@ public class StoreConfiguration<T> { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java index 8aac2c3..dd9579b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java @@ -32,7 +32,7 @@ public final class ProcessIdPatternConverter extends LogEventPatternConverter { /** * Private constructor. */ - private ProcessIdPatternConverter(String... options) { + private ProcessIdPatternConverter(final String... options) { super("Process ID", "pid"); final String defaultValue = options.length > 0 ? options[0] : DEFAULT_DEFAULT_VALUE; String discoveredPid = null; @@ -54,7 +54,7 @@ public final class ProcessIdPatternConverter extends LogEventPatternConverter { return pid; } - public static void main(String[] args) { + public static void main(final String[] args) { System.out.println(new ProcessIdPatternConverter().pid); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java index da20713..8e6a562 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java @@ -211,7 +211,7 @@ public class ThrowablePatternConverter extends LogEventPatternConverter { return true; } - protected String getSuffix(LogEvent event) { + protected String getSuffix(final LogEvent event) { //noinspection ForLoopReplaceableByForEach StringBuilder toAppendTo = new StringBuilder(); for (int i = 0, size = formatters.size(); i < size; i++) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/CustomLoggerGenerator.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/CustomLoggerGenerator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/CustomLoggerGenerator.java index 430b7ef..3558804 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/CustomLoggerGenerator.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/CustomLoggerGenerator.java @@ -24,7 +24,7 @@ public class CustomLoggerGenerator { * Delegates to {@link Generate.CustomLogger#main(String[])} * @param args the command line arguments to pass on */ - public static void main(String[] args) { + public static void main(final String[] args) { Generate.CustomLogger.main(args); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/ExtendedLoggerGenerator.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/ExtendedLoggerGenerator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/ExtendedLoggerGenerator.java index 3d99964..f175ca7 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/ExtendedLoggerGenerator.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/ExtendedLoggerGenerator.java @@ -24,7 +24,7 @@ public class ExtendedLoggerGenerator { * Delegates to {@link Generate.ExtendedLogger#main(String[])} * @param args the command line arguments to pass on */ - public static void main(String[] args) { + public static void main(final String[] args) { Generate.ExtendedLogger.main(args); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java index 11e11dc..f6ab76e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java @@ -1569,7 +1569,7 @@ public final class CronExpression { } } - protected Date getTimeBefore(Date targetDate) { + protected Date getTimeBefore(final Date targetDate) { Calendar cl = Calendar.getInstance(getTimeZone()); // to match this @@ -1587,7 +1587,7 @@ public final class CronExpression { return prevFireTime; } - public Date getPrevFireTime(Date targetDate) { + public Date getPrevFireTime(final Date targetDate) { return getTimeBefore(targetDate); } @@ -1610,7 +1610,7 @@ public final class CronExpression { return 86400000; } - private int minInSet(TreeSet<Integer> set) { + private int minInSet(final TreeSet<Integer> set) { int previous = 0; int min = Integer.MAX_VALUE; boolean first = true; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java index 59919da..66f87bb 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java @@ -27,7 +27,7 @@ public class CronRolloverApp { private static Logger logger; - public static void main(String[] args) { + public static void main(final String[] args) { System.setProperty("log4j.configurationFile", "target/test-classes/log4j-cronRolloverApp.xml"); logger = LogManager.getLogger(CronRolloverApp.class); try { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java index 433bfe0..d2abfea 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java @@ -162,7 +162,7 @@ public class LogEventTest { private static class TestClass { private static final String FQCN = TestClass.class.getName(); - public StackTraceElement getEventSource(String loggerName) { + public StackTraceElement getEventSource(final String loggerName) { final LogEvent event = Log4jLogEvent.newBuilder().setLoggerName(loggerName) .setLoggerFqcn(FQCN).setLevel(Level.INFO).setMessage(MESSAGE).build(); event.setIncludeLocation(true); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java index ec12e00..9e84726 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java @@ -187,7 +187,7 @@ public class FileAppenderPermissionsTest { assertFalse("Appender did not stop", appender.isStarted()); } - public static String findAGroup(String user) throws IOException { + public static String findAGroup(final String user) throws IOException { String group = user; try (FileInputStream fis = new FileInputStream("/etc/group")) { List<String> groups = org.apache.commons.io.IOUtils.readLines(fis, Charset.defaultCharset()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java index ac544ea..c3e14ef 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java @@ -166,7 +166,7 @@ public class HttpAppenderTest { StatusLogger.getLogger().registerListener(new StatusListener() { @Override - public void log(StatusData data) { + public void log(final StatusData data) { error = data; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java index 1d1d642..716223e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderCustomLayoutTest.java @@ -1,38 +1,38 @@ -/* - * 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.core.appender; - -import org.apache.logging.log4j.core.appender.SyslogAppender.Builder; -import org.apache.logging.log4j.core.layout.SyslogLayout; -import org.apache.logging.log4j.core.net.Facility; - -public class SyslogAppenderCustomLayoutTest extends SyslogAppenderTest { - - @Override - protected Facility getExpectedFacility() { - return Facility.LOCAL3; - } - - @Override - protected Builder newSyslogAppenderBuilder(String protocol, String format, boolean newLine) { - final Builder builder = super.newSyslogAppenderBuilder(protocol, format, newLine); - builder.withLayout(SyslogLayout.newBuilder().setFacility(Facility.LOCAL3).setIncludeNewLine(true).build()); - return builder; - } - -} +/* + * 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.core.appender; + +import org.apache.logging.log4j.core.appender.SyslogAppender.Builder; +import org.apache.logging.log4j.core.layout.SyslogLayout; +import org.apache.logging.log4j.core.net.Facility; + +public class SyslogAppenderCustomLayoutTest extends SyslogAppenderTest { + + @Override + protected Facility getExpectedFacility() { + return Facility.LOCAL3; + } + + @Override + protected Builder newSyslogAppenderBuilder(final String protocol, final String format, final boolean newLine) { + final Builder builder = super.newSyslogAppenderBuilder(protocol, format, newLine); + builder.withLayout(SyslogLayout.newBuilder().setFacility(Facility.LOCAL3).setIncludeNewLine(true).build()); + return builder; + } + +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java index 17ffbe4..f9927b2 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java @@ -111,7 +111,7 @@ public abstract class SyslogAppenderTestBase { sentMessages.size(), getReceivedMessages(DEFAULT_TIMEOUT_IN_MS).size()); } - protected void checkTheEqualityOfSentAndReceivedMessages(Level expectedLevel) throws InterruptedException { + protected void checkTheEqualityOfSentAndReceivedMessages(final Level expectedLevel) throws InterruptedException { final List<String> receivedMessages = getReceivedMessages(DEFAULT_TIMEOUT_IN_MS); assertNotNull("No messages received", receivedMessages); @@ -153,7 +153,7 @@ public abstract class SyslogAppenderTestBase { return Facility.LOCAL0; } - protected void validate(SyslogAppender syslogAppender) { + protected void validate(final SyslogAppender syslogAppender) { final Layout<? extends Serializable> layout = syslogAppender.getLayout(); if (layout instanceof SyslogLayout) { validate((SyslogLayout) layout); @@ -164,11 +164,11 @@ public abstract class SyslogAppenderTestBase { } } - protected void validate(Rfc5424Layout layout) { + protected void validate(final Rfc5424Layout layout) { Assert.assertEquals(getExpectedFacility(), layout.getFacility()); } - protected void validate(SyslogLayout layout) { + protected void validate(final SyslogLayout layout) { Assert.assertEquals(getExpectedFacility(), layout.getFacility()); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f555c8c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java index ed1bfd3..b0b2cd1 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java @@ -45,11 +45,11 @@ public class EligibleFilesTest { } @Override - public RolloverDescription rollover(RollingFileManager manager) throws SecurityException { + public RolloverDescription rollover(final RollingFileManager manager) throws SecurityException { return null; } - public Map<Integer, Path> findFilesInPath(String path) { + public Map<Integer, Path> findFilesInPath(final String path) { return getEligibleFiles(path, "log4j.txt.%d{yyyyMMdd}-%i.gz"); } }
