Repository: logging-log4j2 Updated Branches: refs/heads/master f82817362 -> 562e5162e
Use final. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/562e5162 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/562e5162 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/562e5162 Branch: refs/heads/master Commit: 562e5162e5b4d84ee30d2e84f3ed9b02f5b2a192 Parents: f828173 Author: ggregory <[email protected]> Authored: Thu Jul 9 00:14:29 2015 -0700 Committer: ggregory <[email protected]> Committed: Thu Jul 9 00:14:29 2015 -0700 ---------------------------------------------------------------------- .../core/appender/OutputStreamManager.java | 2 +- .../rolling/DefaultRolloverStrategy.java | 34 +-- .../rolling/action/CommonsCompressAction.java | 6 +- .../logging/log4j/core/impl/ThrowableProxy.java | 18 +- .../logging/log4j/core/layout/GelfLayout.java | 2 +- .../core/util/datetime/FastDateParser.java | 12 +- .../core/util/datetime/FastDatePrinter.java | 2 +- .../log4j/core/util/datetime/Format.java | 8 +- ...nsoleAppenderDefaultSuppressedThrowable.java | 6 +- .../ConsoleAppenderNoAnsiStyleLayoutMain.java | 4 +- .../core/appender/OutputStreamAppenderTest.java | 2 +- .../rolling/action/Bzip2CompressActionTest.java | 2 +- .../log4j/core/impl/ThrowableProxyTest.java | 22 +- .../log4j/core/selector/TestClassLoader.java | 2 +- .../log4j/flume/appender/FlumeAvroManager.java | 4 +- .../log4j/flume/appender/FlumeAppenderTest.java | 2 +- .../log4j/jul/DefaultLevelConverter.java | 14 +- ...efaultLevelConverterCustomJulLevelsTest.java | 4 +- .../nosql/appender/mongodb/MongoDbProvider.java | 2 +- .../perf/jmh/SimpleDateFormatBenchmark.java | 34 +-- .../org/apache/logging/slf4j/Log4jMarker.java | 264 +++++++++---------- .../apache/logging/slf4j/Log4jMarkerTest.java | 76 +++--- .../org/apache/logging/slf4j/MarkerTest.java | 28 +- 23 files changed, 275 insertions(+), 275 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/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 a9bdb0c..eea6d62 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 @@ -31,7 +31,7 @@ public class OutputStreamManager extends AbstractManager { protected final Layout<?> layout; protected OutputStreamManager(final OutputStream os, final String streamName, final Layout<?> layout, - boolean writeHeader) { + final boolean writeHeader) { super(streamName); this.os = os; this.layout = layout; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/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 7675326..5f2d606 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 @@ -82,42 +82,42 @@ public class DefaultRolloverStrategy implements RolloverStrategy { private enum FileExtensions { ZIP(".zip") { - Action createCompressAction(String renameTo, String compressedName, boolean deleteSource, - int compressionLevel) { + Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource, + final int compressionLevel) { return new ZipCompressAction(new File(baseName(renameTo)), new File(compressedName), deleteSource, compressionLevel); } }, GZIP(".gz") { - Action createCompressAction(String renameTo, String compressedName, boolean deleteSource, - int compressionLevel) { + Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource, + final int compressionLevel) { return new GzCompressAction(new File(baseName(renameTo)), new File(compressedName), deleteSource); } }, BZIP2(".bz2") { - Action createCompressAction(String renameTo, String compressedName, boolean deleteSource, - int compressionLevel) { + Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource, + final int compressionLevel) { // One of "gz", "bzip2", "xz", "pack200", or "deflate". return new CommonsCompressAction("bzip2", new File(baseName(renameTo)), new File(compressedName), deleteSource); } }, DEFALTE(".deflate") { - Action createCompressAction(String renameTo, String compressedName, boolean deleteSource, - int compressionLevel) { + Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource, + final int compressionLevel) { // One of "gz", "bzip2", "xz", "pack200", or "deflate". return new CommonsCompressAction("deflate", new File(baseName(renameTo)), new File(compressedName), deleteSource); } }, PACK200(".pack200") { - Action createCompressAction(String renameTo, String compressedName, boolean deleteSource, - int compressionLevel) { + Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource, + final int compressionLevel) { // One of "gz", "bzip2", "xz", "pack200", or "deflate". return new CommonsCompressAction("pack200", new File(baseName(renameTo)), new File(compressedName), deleteSource); } }, XY(".xy") { - Action createCompressAction(String renameTo, String compressedName, boolean deleteSource, - int compressionLevel) { + Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource, + final int compressionLevel) { // One of "gz", "bzip2", "xz", "pack200", or "deflate". return new CommonsCompressAction("xy", new File(baseName(renameTo)), new File(compressedName), deleteSource); } @@ -125,7 +125,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy { private final String extension; - private FileExtensions(String extension) { + private FileExtensions(final String extension) { Objects.requireNonNull(extension, "extension"); this.extension = extension; } @@ -134,7 +134,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy { return extension; } - boolean isExtensionFor(String s) { + boolean isExtensionFor(final String s) { return s.endsWith(this.extension); } @@ -142,7 +142,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy { return extension.length(); } - String baseName(String name) { + String baseName(final String name) { return name.substring(0, name.length() - length()); } @@ -442,7 +442,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy { return lowIndex; } - private int suffixLength(String lowFilename) { + private int suffixLength(final String lowFilename) { if (FileExtensions.GZIP.isExtensionFor(lowFilename)) { return FileExtensions.GZIP.length(); } else if (FileExtensions.ZIP.isExtensionFor(lowFilename)) { @@ -483,7 +483,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy { manager.getPatternProcessor().formatFileName(subst, buf, fileIndex); final String currentFileName = manager.getFileName(); - String renameTo = buf.toString(); + final String renameTo = buf.toString(); final String compressedName = renameTo; Action compressAction = null; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java index 75e5bad..f176464 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java @@ -62,7 +62,7 @@ public final class CommonsCompressAction extends AbstractAction { * @param deleteSource if true, attempt to delete file on completion. Failure to delete does not cause an exception * to be thrown or affect return value. */ - public CommonsCompressAction(String name, final File source, final File destination, final boolean deleteSource) { + public CommonsCompressAction(final String name, final File source, final File destination, final boolean deleteSource) { Objects.requireNonNull(source, "source"); Objects.requireNonNull(destination, "destination"); this.name = name; @@ -93,7 +93,7 @@ public final class CommonsCompressAction extends AbstractAction { * @return true if source file compressed. * @throws IOException on IO exception. */ - public static boolean execute(String name, final File source, final File destination, final boolean deleteSource) + public static boolean execute(final String name, final File source, final File destination, final boolean deleteSource) throws IOException { if (!source.exists()) { return false; @@ -102,7 +102,7 @@ public final class CommonsCompressAction extends AbstractAction { final BufferedOutputStream output = new BufferedOutputStream(new CompressorStreamFactory() .createCompressorOutputStream(name, new FileOutputStream(destination)))) { IOUtils.copy(input, output, BUF_SIZE); - } catch (CompressorException e) { + } catch (final CompressorException e) { throw new IOException(e); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java index bcd38dd..7f99366 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java @@ -125,7 +125,7 @@ public class ThrowableProxy implements Serializable { * @param visited * The set of visited suppressed exceptions. */ - private ThrowableProxy(final Throwable throwable, Set<Throwable> visited) { + private ThrowableProxy(final Throwable throwable, final Set<Throwable> visited) { this.throwable = throwable; this.name = throwable.getClass().getName(); this.message = throwable.getMessage(); @@ -154,7 +154,7 @@ public class ThrowableProxy implements Serializable { * @param causeVisited TODO */ private ThrowableProxy(final Throwable parent, final Stack<Class<?>> stack, final Map<String, CacheEntry> map, - final Throwable cause, Set<Throwable> suppressedVisited, Set<Throwable> causeVisited) { + final Throwable cause, final Set<Throwable> suppressedVisited, final Set<Throwable> causeVisited) { causeVisited.add(cause); this.throwable = cause; this.name = cause.getClass().getName(); @@ -205,11 +205,11 @@ public class ThrowableProxy implements Serializable { return true; } - private void formatCause(final StringBuilder sb, String prefix, final ThrowableProxy cause, final List<String> ignorePackages) { + private void formatCause(final StringBuilder sb, final String prefix, final ThrowableProxy cause, final List<String> ignorePackages) { formatThrowableProxy(sb, prefix, CAUSED_BY_LABEL, cause, ignorePackages); } - private void formatThrowableProxy(final StringBuilder sb, String prefix, final String causeLabel, + private void formatThrowableProxy(final StringBuilder sb, final String prefix, final String causeLabel, final ThrowableProxy throwableProxy, final List<String> ignorePackages) { if (throwableProxy == null) { return; @@ -221,18 +221,18 @@ public class ThrowableProxy implements Serializable { this.formatCause(sb, prefix, throwableProxy.causeProxy, ignorePackages); } - private void formatSuppressed(final StringBuilder sb, String prefix, final ThrowableProxy[] suppressedProxies, + private void formatSuppressed(final StringBuilder sb, final String prefix, final ThrowableProxy[] suppressedProxies, final List<String> ignorePackages) { if (suppressedProxies == null) { return; } - for (ThrowableProxy suppressedProxy : suppressedProxies) { + for (final ThrowableProxy suppressedProxy : suppressedProxies) { final ThrowableProxy cause = suppressedProxy; formatThrowableProxy(sb, prefix, SUPPRESSED_LABEL, cause, ignorePackages); } } - private void formatElements(final StringBuilder sb, String prefix, final int commonCount, + private void formatElements(final StringBuilder sb, final String prefix, final int commonCount, final StackTraceElement[] causedTrace, final ExtendedStackTraceElement[] extStackTrace, final List<String> ignorePackages) { if (ignorePackages == null || ignorePackages.isEmpty()) { @@ -261,7 +261,7 @@ public class ThrowableProxy implements Serializable { } } - private void appendSuppressedCount(final StringBuilder sb, String prefix, final int count) { + private void appendSuppressedCount(final StringBuilder sb, final String prefix, final int count) { sb.append(prefix); if (count == 1) { sb.append("\t....").append(EOL); @@ -270,7 +270,7 @@ public class ThrowableProxy implements Serializable { } } - private void formatEntry(final ExtendedStackTraceElement extStackTraceElement, final StringBuilder sb, String prefix) { + private void formatEntry(final ExtendedStackTraceElement extStackTraceElement, final StringBuilder sb, final String prefix) { sb.append(prefix); sb.append("\tat "); sb.append(extStackTraceElement); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/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 97414a8..076c5c1 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 @@ -223,7 +223,7 @@ public final class GelfLayout extends AbstractStringLayout { return builder.toString(); } - private String toNullSafeString(String s) { + private String toNullSafeString(final String s) { return s == null ? Strings.EMPTY : s; } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java index a30e6ae..931c8ba 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDateParser.java @@ -341,7 +341,7 @@ public class FastDateParser implements DateParser, Serializable { private static StringBuilder simpleQuote(final StringBuilder sb, final String value) { for(int i= 0; i<value.length(); ++i) { - char c= value.charAt(i); + final char c= value.charAt(i); switch(c) { case '\\': case '^': @@ -790,7 +790,7 @@ public class FastDateParser implements DateParser, Serializable { } final TimeZone tz = TimeZone.getTimeZone(tzId); for(int i= 1; i<zoneNames.length; ++i) { - String zoneName = zoneNames[i].toLowerCase(locale); + final String zoneName = zoneNames[i].toLowerCase(locale); if (!tzNames.containsKey(zoneName)){ tzNames.put(zoneName, tz); simpleQuote(sb.append('|'), zoneName); @@ -841,7 +841,7 @@ public class FastDateParser implements DateParser, Serializable { * Construct a Strategy that parses a TimeZone * @param pattern The Pattern */ - ISO8601TimeZoneStrategy(String pattern) { + ISO8601TimeZoneStrategy(final String pattern) { this.pattern = pattern; } @@ -849,7 +849,7 @@ public class FastDateParser implements DateParser, Serializable { * {@inheritDoc} */ @Override - boolean addRegex(FastDateParser parser, StringBuilder regex) { + boolean addRegex(final FastDateParser parser, final StringBuilder regex) { regex.append(pattern); return true; } @@ -858,7 +858,7 @@ public class FastDateParser implements DateParser, Serializable { * {@inheritDoc} */ @Override - void setCalendar(FastDateParser parser, Calendar cal, String value) { + void setCalendar(final FastDateParser parser, final Calendar cal, final String value) { if (value.equals("Z")) { cal.setTimeZone(TimeZone.getTimeZone("UTC")); } else { @@ -877,7 +877,7 @@ public class FastDateParser implements DateParser, Serializable { * @return a ISO8601TimeZoneStrategy that can format TimeZone String of length {@code tokenLen}. If no such * strategy exists, an IllegalArgumentException will be thrown. */ - static Strategy getStrategy(int tokenLen) { + static Strategy getStrategy(final int tokenLen) { switch(tokenLen) { case 1: return ISO_8601_1_STRATEGY; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java index bf3661a..5bec64d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FastDatePrinter.java @@ -1207,7 +1207,7 @@ public class FastDatePrinter implements DatePrinter, Serializable { * @return a Iso8601_Rule that can format TimeZone String of length {@code tokenLen}. If no such * rule exists, an IllegalArgumentException will be thrown. */ - static Iso8601_Rule getRule(int tokenLen) { + static Iso8601_Rule getRule(final int tokenLen) { switch(tokenLen) { case 1: return Iso8601_Rule.ISO8601_HOURS; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.java index a22dadd..f207bb2 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.java @@ -9,7 +9,7 @@ import java.text.ParsePosition; */ public abstract class Format { - public final String format (Object obj) { + public final String format (final Object obj) { return format(obj, new StringBuilder(), new FieldPosition(0)).toString(); } @@ -17,9 +17,9 @@ public abstract class Format { public abstract Object parseObject (String source, ParsePosition pos); - public Object parseObject(String source) throws ParseException { - ParsePosition pos = new ParsePosition(0); - Object result = parseObject(source, pos); + public Object parseObject(final String source) throws ParseException { + final ParsePosition pos = new ParsePosition(0); + final Object result = parseObject(source, pos); if (pos.getIndex() == 0) { throw new ParseException("Format.parseObject(String) failed", pos.getErrorIndex()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java index e3295c0..e16b5da 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderDefaultSuppressedThrowable.java @@ -50,12 +50,12 @@ public class ConsoleAppenderDefaultSuppressedThrowable { final LoggerContext ctx = Configurator.initialize(ConsoleAppenderDefaultSuppressedThrowable.class.getName(), config); try { - IOException ioEx = new IOException("test suppressed"); + final IOException ioEx = new IOException("test suppressed"); ioEx.addSuppressed(new IOException("test suppressed 1", new IOException("test 1"))); - IOException ioEx2 = new IOException("test 2"); + final IOException ioEx2 = new IOException("test 2"); ioEx2.addSuppressed(new IOException("test 3")); ioEx.addSuppressed(new IOException("test suppressed 2", ioEx2)); - IOException e = new IOException("test", ioEx); + final IOException e = new IOException("test", ioEx); LOG.error("Error message {}, suppressed?", "Hi", e); System.out.println("printStackTrace"); e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java index 8f14531..b7a48b7 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java @@ -60,9 +60,9 @@ public class ConsoleAppenderNoAnsiStyleLayoutMain { LOG.trace("Trace message."); logThrowableFromMethod(); // This will log the stack trace as well: - IOException ioException = new IOException("test"); + final IOException ioException = new IOException("test"); LOG.error("Error message {}", "Hi", ioException); - Throwable t = new IOException("test suppressed"); + final Throwable t = new IOException("test suppressed"); t.addSuppressed(new IOException("test suppressed 2", ioException)); LOG.error("Error message {}, suppressed?", "Hi", t); LOG.error("Error message {}, suppressed?", "Hi", new IOException("test", t)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java index b91be76..b8163a4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java @@ -60,7 +60,7 @@ public class OutputStreamAppenderTest { assertMessage("Test", app, expectedHeader); } - private void assertMessage(String string, InMemoryAppender app, String header) { + private void assertMessage(final String string, final InMemoryAppender app, final String header) { final LogEvent event = new Log4jLogEvent("TestLogger", null, OutputStreamAppenderTest.class.getName(), Level.INFO, new SimpleMessage("Test"), null); app.start(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressActionTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressActionTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressActionTest.java index 90ac04d..8178adc 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressActionTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressActionTest.java @@ -49,7 +49,7 @@ public class Bzip2CompressActionTest { while (source.exists()) { source = new File(source.getName() + Math.random()); } - boolean actual = CommonsCompressAction.execute("bzip2", source, new File("any2"), true); + final boolean actual = CommonsCompressAction.execute("bzip2", source, new File("any2"), true); assertEquals("Cannot compress non-existing file", false, actual); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java index ed5d3aa..ef3373c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java @@ -167,7 +167,7 @@ public class ThrowableProxyTest { testSerialization_getExtendedStackTraceAsStringWithNestedThrowable(throwable); } - private void testSerialization_getExtendedStackTraceAsStringWithNestedThrowable(Throwable throwable) throws Exception { + private void testSerialization_getExtendedStackTraceAsStringWithNestedThrowable(final Throwable throwable) throws Exception { final ThrowableProxy proxy = new ThrowableProxy(throwable); final byte[] binary = serialize(proxy); final ThrowableProxy proxy2 = deserialize(binary); @@ -234,8 +234,8 @@ public class ThrowableProxyTest { */ @Test public void testCircularSuppressedExceptions() { - Exception e1 = new Exception(); - Exception e2 = new Exception(); + final Exception e1 = new Exception(); + final Exception e2 = new Exception(); e2.addSuppressed(e1); e1.addSuppressed(e2); LogManager.getLogger().error("Error", e1); @@ -243,24 +243,24 @@ public class ThrowableProxyTest { @Test public void testSuppressedExceptions() { - Exception e = new Exception("Root exception"); + final Exception e = new Exception("Root exception"); e.addSuppressed(new IOException("Suppressed #1")); e.addSuppressed(new IOException("Suppressed #2")); LogManager.getLogger().error("Error", e); final ThrowableProxy proxy = new ThrowableProxy(e); - String extendedStackTraceAsString = proxy.getExtendedStackTraceAsString(); + final String extendedStackTraceAsString = proxy.getExtendedStackTraceAsString(); assertTrue(extendedStackTraceAsString.contains("\tSuppressed: java.io.IOException: Suppressed #1")); assertTrue(extendedStackTraceAsString.contains("\tSuppressed: java.io.IOException: Suppressed #1")); } @Test public void testCauseSuppressedExceptions() { - Exception cause = new Exception("Nested exception"); + final Exception cause = new Exception("Nested exception"); cause.addSuppressed(new IOException("Suppressed #1")); cause.addSuppressed(new IOException("Suppressed #2")); LogManager.getLogger().error("Error", new Exception(cause)); final ThrowableProxy proxy = new ThrowableProxy(new Exception("Root exception", cause)); - String extendedStackTraceAsString = proxy.getExtendedStackTraceAsString(); + final String extendedStackTraceAsString = proxy.getExtendedStackTraceAsString(); assertTrue(extendedStackTraceAsString.contains("\tSuppressed: java.io.IOException: Suppressed #1")); assertTrue(extendedStackTraceAsString.contains("\tSuppressed: java.io.IOException: Suppressed #1")); } @@ -270,8 +270,8 @@ public class ThrowableProxyTest { */ @Test public void testCircularSuppressedNestedException() { - Exception e1 = new Exception(); - Exception e2 = new Exception(e1); + final Exception e1 = new Exception(); + final Exception e2 = new Exception(e1); e2.addSuppressed(e1); e1.addSuppressed(e2); LogManager.getLogger().error("Error", e1); @@ -282,8 +282,8 @@ public class ThrowableProxyTest { */ @Test public void testCircularCauseExceptions() { - Exception e1 = new Exception(); - Exception e2 = new Exception(e1); + final Exception e1 = new Exception(); + final Exception e2 = new Exception(e1); e1.initCause(e2); LogManager.getLogger().error("Error", e1); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-core/src/test/java/org/apache/logging/log4j/core/selector/TestClassLoader.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/selector/TestClassLoader.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/selector/TestClassLoader.java index d0414b2..7a54182 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/selector/TestClassLoader.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/selector/TestClassLoader.java @@ -57,7 +57,7 @@ public class TestClassLoader extends ClassLoader { final URLConnection uc = resource.openConnection(); final int len = uc.getContentLength(); final InputStream in = new BufferedInputStream(uc.getInputStream()); - byte[] bytecode = new byte[len]; + final byte[] bytecode = new byte[len]; try { IOUtils.readFully(in, bytecode); } finally { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java index 4f5bd1a..dfd59bd 100644 --- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java +++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java @@ -88,7 +88,7 @@ public class FlumeAvroManager extends AbstractFlumeManager { * @param requestTimeoutMillis The request timeout in ms. * @return A FlumeAvroManager. */ - public static FlumeAvroManager getManager(final String name, final Agent[] agents, int batchSize, int delayMillis, + public static FlumeAvroManager getManager(final String name, final Agent[] agents, int batchSize, final int delayMillis, final int retries, final int connectTimeoutMillis, final int requestTimeoutMillis) { if (agents == null || agents.length == 0) { throw new IllegalArgumentException("At least one agent is required"); @@ -199,7 +199,7 @@ public class FlumeAvroManager extends AbstractFlumeManager { } } else { batchEvent.addEvent(event); - int count = batchEvent.getEvents().size(); + final int count = batchEvent.getEvents().size(); if (count == 1) { nextSend = System.nanoTime() + delayNanos; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java index 2715abe..8589e6c 100644 --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java @@ -242,7 +242,7 @@ public class FlumeAppenderTest { try { Thread.sleep(500); - } catch (InterruptedException ie) { + } catch (final InterruptedException ie) { } avroLogger.info("Test message 1"); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java ---------------------------------------------------------------------- diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java index c5d7b08..8648627 100644 --- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java +++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java @@ -40,7 +40,7 @@ public class DefaultLevelConverter implements LevelConverter { static final class JulLevelComparator implements Comparator<java.util.logging.Level> { @Override - public int compare(java.util.logging.Level level1, java.util.logging.Level level2) { + public int compare(final java.util.logging.Level level1, final java.util.logging.Level level2) { return Integer.compare(level1.intValue(), level2.intValue()); } } @@ -77,29 +77,29 @@ public class DefaultLevelConverter implements LevelConverter { } - private long distance(java.util.logging.Level javaLevel, java.util.logging.Level customJavaLevel) { + private long distance(final java.util.logging.Level javaLevel, final java.util.logging.Level customJavaLevel) { return Math.abs((long) customJavaLevel.intValue() - (long) javaLevel.intValue()); } /* * TODO consider making public for advanced configuration. */ - private void mapJulToLog4j(java.util.logging.Level julLevel, Level level) { + private void mapJulToLog4j(final java.util.logging.Level julLevel, final Level level) { julToLog4j.put(julLevel, level); } /* * TODO consider making public for advanced configuration. */ - private void mapLog4jToJul(Level level, java.util.logging.Level julLevel) { + private void mapLog4jToJul(final Level level, final java.util.logging.Level julLevel) { log4jToJul.put(level, julLevel); } - private Level nearestLevel(java.util.logging.Level customJavaLevel) { + private Level nearestLevel(final java.util.logging.Level customJavaLevel) { long prevDist = Long.MAX_VALUE; java.util.logging.Level prevLevel = null; - for (java.util.logging.Level mappedJavaLevel : sortedJulLevels) { - long distance = distance(customJavaLevel, mappedJavaLevel); + for (final java.util.logging.Level mappedJavaLevel : sortedJulLevels) { + final long distance = distance(customJavaLevel, mappedJavaLevel); if (distance > prevDist) { return julToLog4j.get(prevLevel); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java ---------------------------------------------------------------------- diff --git a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java index 6b8eef6..eb4bd2e 100644 --- a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java +++ b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java @@ -57,12 +57,12 @@ public class DefaultLevelConverterCustomJulLevelsTest { static CustomLevel OFF_M_1 = new CustomLevel("OFF_M_1", java.util.logging.Level.OFF.intValue() - 1); - protected CustomLevel(String name, int value) { + protected CustomLevel(final String name, final int value) { super(name, value); } } - private DefaultLevelConverter converter = new DefaultLevelConverter(); + private final DefaultLevelConverter converter = new DefaultLevelConverter(); @Test public void testCustomJulLevelNearAll() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java ---------------------------------------------------------------------- diff --git a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java index 2c68002..241bf5a 100644 --- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java +++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java @@ -183,7 +183,7 @@ public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> { } else { try { database.getCollectionNames(); // Check if the database actually requires authentication - } catch (Exception e) { + } catch (final Exception e) { LOGGER.error("The database is not already authenticated so you must supply a username and password for the MongoDB provider.", e); return null; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleDateFormatBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleDateFormatBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleDateFormatBenchmark.java index 5e0e324..f1e7fde 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleDateFormatBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleDateFormatBenchmark.java @@ -48,35 +48,35 @@ import org.openjdk.jmh.annotations.State; public class SimpleDateFormatBenchmark { private final Date date = new Date(); - private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss.SSS"); - private ThreadLocal<SimpleDateFormat> threadLocal = new ThreadLocal<SimpleDateFormat>() { + private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss.SSS"); + private final ThreadLocal<SimpleDateFormat> threadLocal = new ThreadLocal<SimpleDateFormat>() { @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat("HH:mm:ss.SSS"); } }; - private ThreadLocal<Formatter> localFormat = new ThreadLocal<Formatter>() { + private final ThreadLocal<Formatter> localFormat = new ThreadLocal<Formatter>() { @Override protected Formatter initialValue() { return new Formatter(); } }; - private FastDateFormat fastFormat = FastDateFormat.getInstance("HH:mm:ss.SSS"); + private final FastDateFormat fastFormat = FastDateFormat.getInstance("HH:mm:ss.SSS"); private class CurrentTime { - private long timestamp; - private String formatted; + private final long timestamp; + private final String formatted; - public CurrentTime(long timestamp) { + public CurrentTime(final long timestamp) { this.timestamp = timestamp; this.formatted = fastFormat.format(timestamp); } } private class Formatter { - private SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss.SSS"); + private final SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss.SSS"); private long timestamp; private String formatted; @@ -84,7 +84,7 @@ public class SimpleDateFormatBenchmark { this.timestamp = 0; } - public String format(long timestamp) { + public String format(final long timestamp) { if (timestamp != this.timestamp) { this.timestamp = timestamp; formatted = format.format(timestamp); @@ -94,10 +94,10 @@ public class SimpleDateFormatBenchmark { } - private long currentTimestamp = 0; + private final long currentTimestamp = 0; private String cachedTime = null; - private AtomicReference<CurrentTime> currentTime = new AtomicReference<>(new CurrentTime(System.currentTimeMillis())); + private final AtomicReference<CurrentTime> currentTime = new AtomicReference<>(new CurrentTime(System.currentTimeMillis())); public static void main(final String[] args) { } @@ -112,7 +112,7 @@ public class SimpleDateFormatBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public String synchronizedFormat() { - long timestamp = System.currentTimeMillis(); + final long timestamp = System.currentTimeMillis(); synchronized (simpleDateFormat) { if (timestamp != currentTimestamp) { cachedTime = simpleDateFormat.format(date); @@ -125,7 +125,7 @@ public class SimpleDateFormatBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public String threadLocalFormat() { - long timestamp = System.currentTimeMillis(); + final long timestamp = System.currentTimeMillis(); return threadLocal.get().format(timestamp); } @@ -134,7 +134,7 @@ public class SimpleDateFormatBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public String cachedFormat() { - long timestamp = System.currentTimeMillis(); + final long timestamp = System.currentTimeMillis(); return localFormat.get().format(timestamp); } @@ -149,10 +149,10 @@ public class SimpleDateFormatBenchmark { @BenchmarkMode(Mode.SampleTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) public String atomicFormat() { - long timestamp = System.currentTimeMillis(); - CurrentTime current = currentTime.get(); + final long timestamp = System.currentTimeMillis(); + final CurrentTime current = currentTime.get(); if (timestamp != current.timestamp) { - CurrentTime newTime = new CurrentTime(timestamp); + final CurrentTime newTime = new CurrentTime(timestamp); if (currentTime.compareAndSet(current, newTime)) { return newTime.formatted; } else { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java ---------------------------------------------------------------------- diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java index 69dbe5d..f0c5b6c 100644 --- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java +++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java @@ -1,132 +1,132 @@ -/* - * 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.slf4j; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.apache.logging.log4j.MarkerManager; -import org.slf4j.IMarkerFactory; -import org.slf4j.Marker; -import org.slf4j.impl.StaticMarkerBinder; - -/** - * Log4j/SLF4J {@link org.slf4j.Marker} type bridge. - */ -public class Log4jMarker implements Marker { - - public static final long serialVersionUID = 1590472L; - - private final IMarkerFactory factory = StaticMarkerBinder.SINGLETON.getMarkerFactory(); - - private final org.apache.logging.log4j.Marker marker; - - /** - * Constructs a Log4jMarker using an existing Log4j {@link org.apache.logging.log4j.Marker}. - * @param marker The Log4j Marker upon which to base this Marker. - */ - public Log4jMarker(final org.apache.logging.log4j.Marker marker) { - this.marker = marker; - } - - @Override - public void add(final Marker marker) { - if (marker == null) { - throw new IllegalArgumentException(); - } - final Marker m = factory.getMarker(marker.getName()); - this.marker.addParents(((Log4jMarker)m).getLog4jMarker()); - } - - @Override - public boolean contains(final org.slf4j.Marker marker) { - if (marker == null) { - throw new IllegalArgumentException(); - } - return this.marker.isInstanceOf(marker.getName()); - } - - @Override - public boolean contains(final String s) { - return s != null ? this.marker.isInstanceOf(s) : false; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!(obj instanceof Log4jMarker)) { - return false; - } - Log4jMarker other = (Log4jMarker) obj; - if (marker == null) { - if (other.marker != null) { - return false; - } - } else if (!marker.equals(other.marker)) { - return false; - } - return true; - } - - public org.apache.logging.log4j.Marker getLog4jMarker() { - return marker; - } - - @Override - public String getName() { - return marker.getName(); - } - - @Override - public boolean hasChildren() { - return marker.hasParents(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((marker == null) ? 0 : marker.hashCode()); - return result; - } - - @Override - public boolean hasReferences() { - return marker.hasParents(); - } - - @Override - public Iterator<Marker> iterator() { - org.apache.logging.log4j.Marker[] log4jParents = this.marker.getParents(); - final List<Marker> parents = new ArrayList<>(log4jParents.length); - for (final org.apache.logging.log4j.Marker m : log4jParents) { - parents.add(factory.getMarker(m.getName())); - } - return parents.iterator(); - } - - @Override - public boolean remove(final Marker marker) { - return marker != null ? this.marker.remove(MarkerManager.getMarker(marker.getName())) : false; - } -} +/* + * 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.slf4j; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.apache.logging.log4j.MarkerManager; +import org.slf4j.IMarkerFactory; +import org.slf4j.Marker; +import org.slf4j.impl.StaticMarkerBinder; + +/** + * Log4j/SLF4J {@link org.slf4j.Marker} type bridge. + */ +public class Log4jMarker implements Marker { + + public static final long serialVersionUID = 1590472L; + + private final IMarkerFactory factory = StaticMarkerBinder.SINGLETON.getMarkerFactory(); + + private final org.apache.logging.log4j.Marker marker; + + /** + * Constructs a Log4jMarker using an existing Log4j {@link org.apache.logging.log4j.Marker}. + * @param marker The Log4j Marker upon which to base this Marker. + */ + public Log4jMarker(final org.apache.logging.log4j.Marker marker) { + this.marker = marker; + } + + @Override + public void add(final Marker marker) { + if (marker == null) { + throw new IllegalArgumentException(); + } + final Marker m = factory.getMarker(marker.getName()); + this.marker.addParents(((Log4jMarker)m).getLog4jMarker()); + } + + @Override + public boolean contains(final org.slf4j.Marker marker) { + if (marker == null) { + throw new IllegalArgumentException(); + } + return this.marker.isInstanceOf(marker.getName()); + } + + @Override + public boolean contains(final String s) { + return s != null ? this.marker.isInstanceOf(s) : false; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (!(obj instanceof Log4jMarker)) { + return false; + } + final Log4jMarker other = (Log4jMarker) obj; + if (marker == null) { + if (other.marker != null) { + return false; + } + } else if (!marker.equals(other.marker)) { + return false; + } + return true; + } + + public org.apache.logging.log4j.Marker getLog4jMarker() { + return marker; + } + + @Override + public String getName() { + return marker.getName(); + } + + @Override + public boolean hasChildren() { + return marker.hasParents(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((marker == null) ? 0 : marker.hashCode()); + return result; + } + + @Override + public boolean hasReferences() { + return marker.hasParents(); + } + + @Override + public Iterator<Marker> iterator() { + final org.apache.logging.log4j.Marker[] log4jParents = this.marker.getParents(); + final List<Marker> parents = new ArrayList<>(log4jParents.length); + for (final org.apache.logging.log4j.Marker m : log4jParents) { + parents.add(factory.getMarker(m.getName())); + } + return parents.iterator(); + } + + @Override + public boolean remove(final Marker marker) { + return marker != null ? this.marker.remove(MarkerManager.getMarker(marker.getName())) : false; + } +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java ---------------------------------------------------------------------- diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java index 9d034ae..af7c394 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4jMarkerTest.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.slf4j; - -import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.MarkerManager; -import org.junit.Assert; -import org.junit.Test; - -public class Log4jMarkerTest { - - @Test - public void testEquals() { - Marker markerA = MarkerManager.getMarker(Log4jMarkerTest.class.getName() + "-A"); - Marker markerB = MarkerManager.getMarker(Log4jMarkerTest.class.getName() + "-B"); - Log4jMarker marker1 = new Log4jMarker(markerA); - Log4jMarker marker2 = new Log4jMarker(markerA); - Log4jMarker marker3 = new Log4jMarker(markerB); - Assert.assertEquals(marker1, marker2); - Assert.assertNotEquals(marker1, null); - Assert.assertNotEquals(null, marker1); - Assert.assertNotEquals(marker1, marker3); - } -} +/* + * 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.slf4j; + +import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.MarkerManager; +import org.junit.Assert; +import org.junit.Test; + +public class Log4jMarkerTest { + + @Test + public void testEquals() { + final Marker markerA = MarkerManager.getMarker(Log4jMarkerTest.class.getName() + "-A"); + final Marker markerB = MarkerManager.getMarker(Log4jMarkerTest.class.getName() + "-B"); + final Log4jMarker marker1 = new Log4jMarker(markerA); + final Log4jMarker marker2 = new Log4jMarker(markerA); + final Log4jMarker marker3 = new Log4jMarker(markerB); + Assert.assertEquals(marker1, marker2); + Assert.assertNotEquals(marker1, null); + Assert.assertNotEquals(null, marker1); + Assert.assertNotEquals(marker1, marker3); + } +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/562e5162/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java ---------------------------------------------------------------------- diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java index 50743a6..6ef3846 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/MarkerTest.java @@ -41,8 +41,8 @@ public class MarkerTest { @Test public void testAddMarker() { - String childMakerName = CHILD_MAKER_NAME + "-AM"; - String parentMarkerName = PARENT_MARKER_NAME + "-AM"; + final String childMakerName = CHILD_MAKER_NAME + "-AM"; + final String parentMarkerName = PARENT_MARKER_NAME + "-AM"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMakerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMarkerName); slf4jMarker.add(slf4jParent); @@ -58,8 +58,8 @@ public class MarkerTest { @Test public void testAddNullMarker() { - String childMarkerName = CHILD_MAKER_NAME + "-ANM"; - String parentMakerName = PARENT_MARKER_NAME + "-ANM"; + final String childMarkerName = CHILD_MAKER_NAME + "-ANM"; + final String parentMakerName = PARENT_MARKER_NAME + "-ANM"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMarkerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); slf4jMarker.add(slf4jParent); @@ -84,8 +84,8 @@ public class MarkerTest { @Test public void testAddSameMarker() { - String childMarkerName = CHILD_MAKER_NAME + "-ASM"; - String parentMakerName = PARENT_MARKER_NAME + "-ASM"; + final String childMarkerName = CHILD_MAKER_NAME + "-ASM"; + final String parentMakerName = PARENT_MARKER_NAME + "-ASM"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMarkerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); slf4jMarker.add(slf4jParent); @@ -100,8 +100,8 @@ public class MarkerTest { @Test public void testEquals() { - String childMarkerName = CHILD_MAKER_NAME + "-ASM"; - String parentMakerName = PARENT_MARKER_NAME + "-ASM"; + final String childMarkerName = CHILD_MAKER_NAME + "-ASM"; + final String parentMakerName = PARENT_MARKER_NAME + "-ASM"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMarkerName); final org.slf4j.Marker slf4jMarker2 = org.slf4j.MarkerFactory.getMarker(childMarkerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); @@ -119,8 +119,8 @@ public class MarkerTest { @Test public void testContainsNullMarker() { - String childMarkerName = CHILD_MAKER_NAME + "-CM"; - String parentMakerName = PARENT_MARKER_NAME + "-CM"; + final String childMarkerName = CHILD_MAKER_NAME + "-CM"; + final String parentMakerName = PARENT_MARKER_NAME + "-CM"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMarkerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); slf4jMarker.add(slf4jParent); @@ -145,8 +145,8 @@ public class MarkerTest { @Test public void testContainsNullString() { - String childMarkerName = CHILD_MAKER_NAME + "-CS"; - String parentMakerName = PARENT_MARKER_NAME + "-CS"; + final String childMarkerName = CHILD_MAKER_NAME + "-CS"; + final String parentMakerName = PARENT_MARKER_NAME + "-CS"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMarkerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); slf4jMarker.add(slf4jParent); @@ -161,8 +161,8 @@ public class MarkerTest { @Test public void testRemoveNullMarker() { - String childMakerName = CHILD_MAKER_NAME + "-CM"; - String parentMakerName = PARENT_MARKER_NAME + "-CM"; + final String childMakerName = CHILD_MAKER_NAME + "-CM"; + final String parentMakerName = PARENT_MARKER_NAME + "-CM"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMakerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); slf4jMarker.add(slf4jParent);
