Repository: logging-log4j2 Updated Branches: refs/heads/master d7db912b0 -> ab12dfb96
[LOG4J2-2493] Remove deprecated code. Still a bit more to do. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ab12dfb9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ab12dfb9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ab12dfb9 Branch: refs/heads/master Commit: ab12dfb968db5ace70b43a692dd20e708cacdbcf Parents: d7db912 Author: Gary Gregory <[email protected]> Authored: Mon Oct 29 17:30:54 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Mon Oct 29 17:30:54 2018 -0600 ---------------------------------------------------------------------- .../log4j/core/appender/FileAppender.java | 55 ------- .../core/config/plugins/util/PluginManager.java | 17 -- .../log4j/core/filter/CompositeFilter.java | 11 -- .../logging/log4j/core/filter/MapFilter.java | 13 -- .../core/layout/MarkerPatternSelector.java | 36 ----- .../log4j/core/layout/PatternLayout.java | 78 ---------- .../core/layout/ScriptPatternSelector.java | 36 +---- .../logging/log4j/core/lookup/MapLookup.java | 31 ---- .../log4j/core/config/JiraLog4j2_2134Test.java | 13 +- .../core/filter/AbstractFilterableTest.java | 18 +-- .../log4j/core/filter/MapFilterTest.java | 14 +- .../core/filter/StructuredDataFilterTest.java | 18 ++- .../log4j/core/layout/PatternLayoutTest.java | 10 +- .../log4j/core/layout/PatternSelectorTest.java | 10 +- .../log4j/core/lookup/MapLookupTest.java | 2 +- .../log4j/jackson/yaml/layout/YamlLayout.java | 29 ---- .../jackson/yaml/layout/YamlLayoutTest.java | 6 +- .../log4j/perf/jmh/PatternLayoutBenchmark.java | 156 +++++++++++++++++-- .../jmh/PatternLayoutComparisonBenchmark.java | 14 +- .../perf/jmh/TextEncoderHelperBenchmark.java | 14 +- 20 files changed, 234 insertions(+), 347 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java index dd86a2c..8847290 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java @@ -187,61 +187,6 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager private static final int DEFAULT_BUFFER_SIZE = 8192; - /** - * Create a File Appender. - * @param fileName The name and path of the file. - * @param append "True" if the file should be appended to, "false" if it should be overwritten. - * The default is "true". - * @param locking "True" if the file should be locked. The default is "false". - * @param name The name of the Appender. - * @param immediateFlush "true" if the contents should be flushed on every write, "false" otherwise. The default - * is "true". - * @param ignoreExceptions If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise - * they are propagated to the caller. - * @param bufferedIo "true" if I/O should be buffered, "false" otherwise. The default is "true". - * @param bufferSizeStr buffer size for buffered IO (default is 8192). - * @param layout The layout to use to format the event. If no layout is provided the default PatternLayout - * will be used. - * @param filter The filter, if any, to use. - * @param advertise "true" if the appender configuration should be advertised, "false" otherwise. - * @param advertiseUri The advertised URI which can be used to retrieve the file contents. - * @param config The Configuration - * @return The FileAppender. - * @deprecated Use {@link #newBuilder()} - */ - @Deprecated - public static <B extends Builder<B>> FileAppender createAppender( - // @formatter:off - final String fileName, - final String append, - final String locking, - final String name, - final String immediateFlush, - final String ignoreExceptions, - final String bufferedIo, - final String bufferSizeStr, - final Layout<? extends Serializable> layout, - final Filter filter, - final String advertise, - final String advertiseUri, - final Configuration config) { - return FileAppender.<B>newBuilder() - .setAdvertise(Boolean.parseBoolean(advertise)) - .setAdvertiseUri(advertiseUri) - .setAppend(Booleans.parseBoolean(append, true)) - .setBufferedIo(Booleans.parseBoolean(bufferedIo, true)) - .setBufferSize(Integers.parseInt(bufferSizeStr, DEFAULT_BUFFER_SIZE)) - .setConfiguration(config) - .setFileName(fileName).setFilter(filter) - .setIgnoreExceptions(Booleans.parseBoolean(ignoreExceptions, true)) - .setImmediateFlush(Booleans.parseBoolean(immediateFlush, true)) - .setLayout(layout) - .setLocking(Boolean.parseBoolean(locking)) - .setName(name) - .build(); - // @formatter:on - } - @PluginBuilderFactory public static <B extends Builder<B>> B newBuilder() { return new Builder<B>().asBuilder(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java index 704ffd1..6f38d0e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java @@ -51,23 +51,6 @@ public class PluginManager { } /** - * Process annotated plugins. - * - * @deprecated Use {@link org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor} instead. To do so, - * simply include {@code log4j-core} in your dependencies and make sure annotation processing is not - * disabled. By default, supported Java compilers will automatically use that plugin processor provided - * {@code log4j-core} is on the classpath. - */ - @Deprecated - // use PluginProcessor instead - public static void main(final String[] args) { - System.err.println("ERROR: this tool is superseded by the annotation processor included in log4j-core."); - System.err.println("If the annotation processor does not work for you, please see the manual page:"); - System.err.println("http://logging.apache.org/log4j/2.x/manual/configuration.html#ConfigurationSyntax";); - System.exit(-1); - } - - /** * Adds a package name to be scanned for plugins. Must be invoked prior to plugins being collected. * * @param p The package name. Ignored if {@code null} or empty. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java index 5394bfb..496741a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java @@ -98,17 +98,6 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable return new ObjectArrayIterator<>(filters); } - /** - * Gets a new list over the internal filter array. - * - * @return a new list over the internal filter array - * @deprecated Use {@link #getFiltersArray()} - */ - @Deprecated - public List<Filter> getFilters() { - return Arrays.asList(filters); - } - public Filter[] getFiltersArray() { return filters; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java index 39f3f14..f53cd84 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java @@ -212,19 +212,6 @@ public class MapFilter extends AbstractFilter { return isAnd; } - /** @deprecated use {@link #getStringMap()} instead */ - @Deprecated - protected Map<String, List<String>> getMap() { - final Map<String, List<String>> result = new HashMap<>(map.size()); - map.forEach(new BiConsumer<String, List<String>>() { - @Override - public void accept(final String key, final List<String> value) { - result.put(key, value); - } - }); - return result; - } - /** * Returns the IndexedStringMap with {@code List<String>} values that this MapFilter was constructed with. * @return the IndexedStringMap with {@code List<String>} values to match against http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java index 719af9d..d319940 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java @@ -119,16 +119,6 @@ public class MarkerPatternSelector implements PatternSelector { private static Logger LOGGER = StatusLogger.getLogger(); - /** - * @deprecated Use {@link #newBuilder()} instead. This will be private in a future version. - */ - @Deprecated - public MarkerPatternSelector(final PatternMatch[] properties, final String defaultPattern, - final boolean alwaysWriteExceptions, final boolean noConsoleNoAnsi, - final Configuration config) { - this(properties, defaultPattern, alwaysWriteExceptions, false, noConsoleNoAnsi, config); - } - private MarkerPatternSelector(final PatternMatch[] properties, final String defaultPattern, final boolean alwaysWriteExceptions, final boolean disableAnsi, final boolean noConsoleNoAnsi, final Configuration config) { @@ -177,32 +167,6 @@ public class MarkerPatternSelector implements PatternSelector { return new Builder(); } - /** - * Deprecated, use {@link #newBuilder()} instead. - * @param properties - * @param defaultPattern - * @param alwaysWriteExceptions - * @param noConsoleNoAnsi - * @param configuration - * @return a new MarkerPatternSelector. - * @deprecated Use {@link #newBuilder()} instead. - */ - @Deprecated - public static MarkerPatternSelector createSelector( - final PatternMatch[] properties, - final String defaultPattern, - final boolean alwaysWriteExceptions, - final boolean noConsoleNoAnsi, - final Configuration configuration) { - final Builder builder = newBuilder(); - builder.setProperties(properties); - builder.setDefaultPattern(defaultPattern); - builder.setAlwaysWriteExceptions(alwaysWriteExceptions); - builder.setNoConsoleNoAnsi(noConsoleNoAnsi); - builder.setConfiguration(configuration); - return builder.build(); - } - @Override public String toString() { final StringBuilder sb = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java index dfa4966..5a259d6 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java @@ -143,34 +143,6 @@ public final class PatternLayout extends AbstractStringLayout { } /** - * Deprecated, use {@link #newSerializerBuilder()} instead. - * - * @param configuration - * @param replace - * @param pattern - * @param defaultPattern - * @param patternSelector - * @param alwaysWriteExceptions - * @param noConsoleNoAnsi - * @return a new Serializer. - * @deprecated Use {@link #newSerializerBuilder()} instead. - */ - @Deprecated - public static Serializer createSerializer(final Configuration configuration, final RegexReplacement replace, - final String pattern, final String defaultPattern, final PatternSelector patternSelector, - final boolean alwaysWriteExceptions, final boolean noConsoleNoAnsi) { - final SerializerBuilder builder = newSerializerBuilder(); - builder.setAlwaysWriteExceptions(alwaysWriteExceptions); - builder.setConfiguration(configuration); - builder.setDefaultPattern(defaultPattern); - builder.setNoConsoleNoAnsi(noConsoleNoAnsi); - builder.setPattern(pattern); - builder.setPatternSelector(patternSelector); - builder.setReplace(replace); - return builder.build(); - } - - /** * Gets the conversion pattern. * * @return the conversion pattern. @@ -256,56 +228,6 @@ public final class PatternLayout extends AbstractStringLayout { return patternSelector == null ? conversionPattern : patternSelector.toString(); } - /** - * Creates a pattern layout. - * - * @param pattern - * The pattern. If not specified, defaults to DEFAULT_CONVERSION_PATTERN. - * @param patternSelector - * Allows different patterns to be used based on some selection criteria. - * @param config - * The Configuration. Some Converters require access to the Interpolator. - * @param replace - * A Regex replacement String. - * @param charset - * The character set. The platform default is used if not specified. - * @param alwaysWriteExceptions - * If {@code "true"} (default) exceptions are always written even if the pattern contains no exception tokens. - * @param noConsoleNoAnsi - * If {@code "true"} (default is false) and {@link System#console()} is null, do not output ANSI escape codes - * @param headerPattern - * The footer to place at the top of the document, once. - * @param footerPattern - * The footer to place at the bottom of the document, once. - * @return The PatternLayout. - * @deprecated Use {@link #newBuilder()} instead. This will be private in a future version. - */ - @PluginFactory - @Deprecated - public static PatternLayout createLayout( - @PluginAttribute(value = "pattern", defaultString = DEFAULT_CONVERSION_PATTERN) final String pattern, - @PluginElement("PatternSelector") final PatternSelector patternSelector, - @PluginConfiguration final Configuration config, - @PluginElement("Replace") final RegexReplacement replace, - // LOG4J2-783 use platform default by default, so do not specify defaultString for charset - @PluginAttribute(value = "charset") final Charset charset, - @PluginAttribute(value = "alwaysWriteExceptions", defaultBoolean = true) final boolean alwaysWriteExceptions, - @PluginAttribute(value = "noConsoleNoAnsi") final boolean noConsoleNoAnsi, - @PluginAttribute("header") final String headerPattern, - @PluginAttribute("footer") final String footerPattern) { - return newBuilder() - .setPattern(pattern) - .setPatternSelector(patternSelector) - .setConfiguration(config) - .setRegexReplacement(replace) - .setCharset(charset) - .setAlwaysWriteExceptions(alwaysWriteExceptions) - .setNoConsoleNoAnsi(noConsoleNoAnsi) - .setHeader(headerPattern) - .setFooter(footerPattern) - .build(); - } - private static class PatternSerializer implements Serializer, Serializer2 { private final PatternFormatter[] formatters; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java index 35c6f4b..0b48bd3 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java @@ -145,11 +145,7 @@ public class ScriptPatternSelector implements PatternSelector { private final Configuration configuration; - /** - * @deprecated Use {@link #newBuilder()} instead. This will be private in a future version. - */ - @Deprecated - public ScriptPatternSelector(final AbstractScript script, final PatternMatch[] properties, final String defaultPattern, + private ScriptPatternSelector(final AbstractScript script, final PatternMatch[] properties, final String defaultPattern, final boolean alwaysWriteExceptions, final boolean disableAnsi, final boolean noConsoleNoAnsi, final Configuration config) { this.script = script; @@ -202,36 +198,6 @@ public class ScriptPatternSelector implements PatternSelector { return new Builder(); } - /** - * Deprecated, use {@link #newBuilder()} instead. - * - * @param script - * @param properties - * @param defaultPattern - * @param alwaysWriteExceptions - * @param noConsoleNoAnsi - * @param configuration - * @return a new ScriptPatternSelector - * @deprecated Use {@link #newBuilder()} instead. - */ - @Deprecated - public static ScriptPatternSelector createSelector( - final AbstractScript script, - final PatternMatch[] properties, - final String defaultPattern, - final boolean alwaysWriteExceptions, - final boolean noConsoleNoAnsi, - final Configuration configuration) { - final Builder builder = newBuilder(); - builder.setScript(script); - builder.setProperties(properties); - builder.setDefaultPattern(defaultPattern); - builder.setAlwaysWriteExceptions(alwaysWriteExceptions); - builder.setNoConsoleNoAnsi(noConsoleNoAnsi); - builder.setConfiguration(configuration); - return builder.build(); - } - @Override public String toString() { final StringBuilder sb = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java index 466decb..644c8f4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java @@ -66,37 +66,6 @@ public class MapLookup implements StrLookup { return new HashMap<>(initialCapacity); } - /** - * An application's {@code public static main(String[])} method calls this method to make its main arguments - * available for lookup with the prefix {@code main}. - * <p> - * The map provides two kinds of access: First by index, starting at {@code "0"}, {@code "1"} and so on. For - * example, the command line {@code --file path/file.txt -x 2} can be accessed from a configuration file with: - * </p> - * <ul> - * <li>{@code "main:0"} = {@code "--file"}</li> - * <li>{@code "main:1"} = {@code "path/file.txt"}</li> - * <li>{@code "main:2"} = {@code "-x"}</li> - * <li>{@code "main:3"} = {@code "2"}</li> - * </ul> - * <p> - * Second using the argument at position n as the key to access the value at n+1. - * </p> - * <ul> - * <li>{@code "main:--file"} = {@code "path/file.txt"}</li> - * <li>{@code "main:-x"} = {@code "2"}</li> - * </ul> - * - * @param args - * An application's {@code public static main(String[])} arguments. - * @since 2.1 - * @deprecated As of 2.4, use {@link MainMapLookup#setMainArguments(String[])} - */ - @Deprecated - public static void setMainArguments(final String... args) { - MainMapLookup.setMainArguments(args); - } - static Map<String, String> toMap(final List<String> args) { if (args == null) { return null; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java index a9fa588..9b2cef3 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java @@ -97,8 +97,17 @@ public class JiraLog4j2_2134Test { Logger log = LogManager.getLogger(this.getClass()); final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); final Configuration config = ctx.getConfiguration(); - PatternLayout layout = PatternLayout.createLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN, null, config, null, - null, false, false, null, null); + PatternLayout layout = PatternLayout.newBuilder() + .setPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) + .setPatternSelector(null) + .setConfiguration(config) + .setRegexReplacement(null) + .setCharset(null) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(false) + .setHeader(null) + .setFooter(null) + .build(); // @formatter:off Appender appender = FileAppender.newBuilder() .setFileName("target/test.log") http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java index 4e0830d..6b9f534 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java @@ -51,7 +51,7 @@ public class AbstractFilterableTest { // into a CompositeFilter.class filterable.addFilter(filter); assertTrue(filterable.getFilter() instanceof CompositeFilter); - assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFilters().size()); + assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length); } @Test @@ -64,7 +64,7 @@ public class AbstractFilterableTest { // into a CompositeFilter.class filterable.addFilter(filter); assertTrue(filterable.getFilter() instanceof CompositeFilter); - assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFilters().size()); + assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length); } @Test @@ -90,7 +90,7 @@ public class AbstractFilterableTest { // into a CompositeFilter.class filterable.addFilter(compositeFilter); assertTrue(filterable.getFilter() instanceof CompositeFilter); - assertEquals(6, ((CompositeFilter) filterable.getFilter()).getFilters().size()); + assertEquals(6, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length); } @Test @@ -106,7 +106,7 @@ public class AbstractFilterableTest { // into a CompositeFilter.class filterable.addFilter(compositeFilter); assertTrue(filterable.getFilter() instanceof CompositeFilter); - assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFilters().size()); + assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length); } @Test @@ -122,7 +122,7 @@ public class AbstractFilterableTest { // into a CompositeFilter.class filterable.addFilter(notInCompositeFilterFilter); assertTrue(filterable.getFilter() instanceof CompositeFilter); - assertEquals(3, ((CompositeFilter) filterable.getFilter()).getFilters().size()); + assertEquals(3, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length); } @Test @@ -167,7 +167,7 @@ public class AbstractFilterableTest { filterable.addFilter(filterCopy); filterable.removeFilter(filterCopy); assertTrue(filterable.getFilter() instanceof CompositeFilter); - assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFilters().size()); + assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length); filterable.removeFilter(filterCopy); assertEquals(filterOriginal, filterable.getFilter()); filterable.removeFilter(filterOriginal); @@ -223,7 +223,7 @@ public class AbstractFilterableTest { // should not remove internal filter of compositeFilter filterable.removeFilter(anotherFilter); assertTrue(filterable.getFilter() instanceof CompositeFilter); - assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFilters().size()); + assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length); } @Test @@ -246,9 +246,9 @@ public class AbstractFilterableTest { filterable.addFilter(compositeFilter); filterable.addFilter(anotherFilter); - assertEquals(3, ((CompositeFilter) filterable.getFilter()).getFilters().size()); + assertEquals(3, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length); filterable.removeFilter(filter1); - assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFilters().size()); + assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length); filterable.removeFilter(filter2); assertSame(anotherFilter, filterable.getFilter()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java index 7310d38..97b2185 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java @@ -16,6 +16,13 @@ */ package org.apache.logging.log4j.core.filter; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -29,11 +36,10 @@ import org.apache.logging.log4j.core.util.KeyValuePair; import org.apache.logging.log4j.junit.LoggerContextRule; import org.apache.logging.log4j.message.StringMapMessage; import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.util.IndexedReadOnlyStringMap; import org.junit.ClassRule; import org.junit.Test; -import static org.junit.Assert.*; - /** * */ @@ -76,12 +82,12 @@ public class MapFilterTest { assertTrue("Not a MapFilter", filter instanceof MapFilter); final MapFilter mapFilter = (MapFilter) filter; assertFalse("Should not be And filter", mapFilter.isAnd()); - final Map<String, List<String>> map = mapFilter.getMap(); + final IndexedReadOnlyStringMap map = mapFilter.getStringMap(); assertNotNull("No Map", map); assertFalse("No elements in Map", map.isEmpty()); assertEquals("Incorrect number of elements in Map", 1, map.size()); assertTrue("Map does not contain key eventId", map.containsKey("eventId")); - assertEquals("List does not contain 2 elements", 2, map.get("eventId").size()); + assertEquals("List does not contain 2 elements", 2, map.<Collection<?>>getValue("eventId").size()); final Logger logger = LogManager.getLogger(MapFilterTest.class); final Map<String, String> eventMap = new HashMap<>(); eventMap.put("eventId", "Login"); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java index d313e7c..7d49234 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java @@ -16,20 +16,24 @@ */ package org.apache.logging.log4j.core.filter; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.util.Collection; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.util.KeyValuePair; import org.apache.logging.log4j.junit.LoggerContextRule; import org.apache.logging.log4j.message.StructuredDataMessage; +import org.apache.logging.log4j.util.IndexedReadOnlyStringMap; import org.junit.ClassRule; import org.junit.Test; -import java.util.List; -import java.util.Map; - -import static org.junit.Assert.*; - /** * */ @@ -72,11 +76,11 @@ public class StructuredDataFilterTest { assertTrue("Not a StructuredDataFilter", filter instanceof StructuredDataFilter); final StructuredDataFilter sdFilter = (StructuredDataFilter) filter; assertFalse("Should not be And filter", sdFilter.isAnd()); - final Map<String, List<String>> map = sdFilter.getMap(); + final IndexedReadOnlyStringMap map = sdFilter.getStringMap(); assertNotNull("No Map", map); assertFalse("No elements in Map", map.isEmpty()); assertEquals("Incorrect number of elements in Map", 1, map.size()); assertTrue("Map does not contain key eventId", map.containsKey("eventId")); - assertEquals("List does not contain 2 elements", 2, map.get("eventId").size()); + assertEquals("List does not contain 2 elements", 2, map.<Collection<?>>getValue("eventId").size()); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java index 09098d9..d6f3a80 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java @@ -247,7 +247,15 @@ public class PatternLayoutTest { public void testPatternSelector() throws Exception { final PatternMatch[] patterns = new PatternMatch[1]; patterns[0] = new PatternMatch("FLOW", "%d %-5p [%t]: ====== %C{1}.%M:%L %m ======%n"); - final PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); + // @formatter:off + final PatternSelector selector = MarkerPatternSelector.newBuilder() + .setProperties(patterns) + .setDefaultPattern("%d %-5p [%t]: %m%n") + .setAlwaysWriteExceptions(true) + .setNoConsoleNoAnsi(true) + .setConfiguration(ctx.getConfiguration()) + .build(); + // @formatter:on final PatternLayout layout = PatternLayout.newBuilder().setPatternSelector(selector) .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() // http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java index f9e59a0..2455ac8 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java @@ -41,7 +41,15 @@ public class PatternSelectorTest { public void testPatternSelector() throws Exception { final PatternMatch[] patterns = new PatternMatch[1]; patterns[0] = new PatternMatch("FLOW", "%d %-5p [%t]: ====== %C{1}.%M:%L %m ======%n"); - final PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); + // @formatter:off + final PatternSelector selector = MarkerPatternSelector.newBuilder() + .setProperties(patterns) + .setDefaultPattern("%d %-5p [%t]: %m%n") + .setAlwaysWriteExceptions(true) + .setNoConsoleNoAnsi(true) + .setConfiguration(ctx.getConfiguration()) + .build(); + // @formatter:on final PatternLayout layout = PatternLayout.newBuilder().setPatternSelector(selector) .setConfiguration(ctx.getConfiguration()).build(); final LogEvent event1 = Log4jLogEvent.newBuilder() // http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java index 61d81ec..74fc002 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java @@ -55,7 +55,7 @@ public class MapLookupTest { @Test public void testMainMap() { - MapLookup.setMainArguments(new String[] { + MainMapLookup.setMainArguments(new String[] { "--file", "foo.txt" }); final MapLookup lookup = MainMapLookup.MAIN_SINGLETON; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java ---------------------------------------------------------------------- diff --git a/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java b/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java index 1faccdb..288fd37 100644 --- a/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java +++ b/log4j-layout-jackson-yaml/src/main/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayout.java @@ -111,35 +111,6 @@ public final class YamlLayout extends AbstractJacksonLayout { DEFAULT_FOOTER, StandardCharsets.UTF_8, true, false, false, null); } - /** - * Creates a YAML Layout. - * - * @param config - * The plugin configuration. - * @param locationInfo - * If "true", includes the location information in the generated YAML. - * @param properties - * If "true", includes the thread context map in the generated YAML. - * @param headerPattern - * The header pattern, defaults to {@code ""} if null. - * @param footerPattern - * The header pattern, defaults to {@code ""} if null. - * @param charset - * The character set to use, if {@code null}, uses "UTF-8". - * @param includeStacktrace - * If "true", includes the stacktrace of any Throwable in the generated YAML, defaults to "true". - * @return A YAML Layout. - * - * @deprecated Use {@link #newBuilder()} instead - */ - @Deprecated - public static AbstractJacksonLayout createLayout(final Configuration config, final boolean locationInfo, - final boolean properties, final String headerPattern, final String footerPattern, final Charset charset, - final boolean includeStacktrace) { - return new YamlLayout(config, locationInfo, properties, false, false, true, headerPattern, footerPattern, - charset, includeStacktrace, false, false, null); - } - @PluginBuilderFactory public static <B extends Builder<B>> B newBuilder() { return new Builder<B>().asBuilder(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-layout-jackson-yaml/src/test/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-layout-jackson-yaml/src/test/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayoutTest.java b/log4j-layout-jackson-yaml/src/test/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayoutTest.java index b8e3ee6..8248b9f 100644 --- a/log4j-layout-jackson-yaml/src/test/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayoutTest.java +++ b/log4j-layout-jackson-yaml/src/test/java/org/apache/logging/log4j/jackson/yaml/layout/YamlLayoutTest.java @@ -123,7 +123,7 @@ public class YamlLayoutTest { .setIncludeStacktrace(true) .setStacktraceAsString(stacktraceAsString) .build(); - // @formatter:off + // @formatter:on return layout.toSerializable(expected); } @@ -296,7 +296,9 @@ public class YamlLayoutTest { final Configuration configuration = rootLogger.getContext().getConfiguration(); // set up appender // Use [[ and ]] to test header and footer (instead of [ and ]) - final AbstractJacksonLayout layout = YamlLayout.createLayout(configuration, true, true, "[[", "]]", null, true); + final AbstractJacksonLayout layout = YamlLayout.newBuilder().setConfiguration(configuration).setLocationInfo(true).setProperties(true) + .setHeader("[[".getBytes(StandardCharsets.UTF_8)).setFooter("]]".getBytes(StandardCharsets.UTF_8)) + .setIncludeStacktrace(true).build(); final ListAppender appender = new ListAppender("List", null, layout, true, false); appender.start(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java index 85e3956..35ded03 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutBenchmark.java @@ -60,18 +60,150 @@ public class PatternLayoutBenchmark { private static final String DEFAULT_ENCODING = CHARSET_DEFAULT.name(); private static final String STRING_SHIFT_JIS = "SHIFT_JIS"; private static final Charset CHARSET_SHIFT_JIS = Charset.forName(STRING_SHIFT_JIS); - private final PatternLayout PATTERN_M = PatternLayout.createLayout("%m%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_SPACE = PatternLayout.createLayout(" ", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_M_C = PatternLayout.createLayout("%c %m%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_M_C_D = PatternLayout.createLayout("%d %c %m%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_M_D = PatternLayout.createLayout("%d %m%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_C = PatternLayout.createLayout("%c%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_D = PatternLayout.createLayout("%d%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_M_D_NOSPACE = PatternLayout.createLayout("%d%m%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_M_C_NOSPACE = PatternLayout.createLayout("%c%m%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_M_EX = PatternLayout.createLayout("%m %ex%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_M_D_EX = PatternLayout.createLayout("%d %m%ex%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); - private final PatternLayout PATTERN_M_C_D_EX = PatternLayout.createLayout("%d %c %m%ex%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); + + private final PatternLayout PATTERN_M = PatternLayout.newBuilder() + .setPattern((String) "%m%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_SPACE = PatternLayout.newBuilder() + .setPattern((String) " ") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_M_C = PatternLayout.newBuilder() + .setPattern((String) "%c %m%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_M_C_D = PatternLayout.newBuilder() + .setPattern((String) "%d %c %m%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_M_D = PatternLayout.newBuilder() + .setPattern((String) "%d %m%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_C = PatternLayout.newBuilder() + .setPattern((String) "%c%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_D = PatternLayout.newBuilder() + .setPattern((String) "%d%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_M_D_NOSPACE = PatternLayout.newBuilder() + .setPattern((String) "%d%m%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_M_C_NOSPACE = PatternLayout.newBuilder() + .setPattern((String) "%c%m%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_M_EX = PatternLayout.newBuilder() + .setPattern((String) "%m %ex%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_M_D_EX = PatternLayout.newBuilder() + .setPattern((String) "%d %m%ex%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + + private final PatternLayout PATTERN_M_C_D_EX = PatternLayout.newBuilder() + .setPattern((String) "%d %c %m%ex%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); private static LogEvent createLogEvent() { final Marker marker = null; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java index 6402a6c..e863aa3 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/PatternLayoutComparisonBenchmark.java @@ -59,8 +59,18 @@ public class PatternLayoutComparisonBenchmark { final static LogEvent LOG4J2EVENT = createLog4j2Event(); private static final Charset CHARSET_DEFAULT = Charset.defaultCharset(); private static final String LOG4JPATTERN = "%d %5p [%t] %c{1} %X{transactionId} - %m%n"; - private final PatternLayout LOG4J2_PATTERN_LAYOUT = PatternLayout.createLayout(LOG4JPATTERN, null, - null, null, CHARSET_DEFAULT, false, true, null, null); + + private final PatternLayout LOG4J2_PATTERN_LAYOUT = PatternLayout.newBuilder() + .setPattern((String) LOG4JPATTERN) + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); private static LogEvent createLog4j2Event() { final Marker marker = null; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ab12dfb9/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java ---------------------------------------------------------------------- diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java index 25854ec..ec4a26c 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java @@ -62,7 +62,19 @@ public class TextEncoderHelperBenchmark { final static LogEvent EVENT = createLogEvent(); private static final Charset CHARSET_DEFAULT = Charset.defaultCharset(); - private final PatternLayout PATTERN_M_C_D = PatternLayout.createLayout("%d %c %m%n", null, null, null, CHARSET_DEFAULT, false, true, null, null); + + private final PatternLayout PATTERN_M_C_D = PatternLayout.newBuilder() + .setPattern((String) "%d %c %m%n") + .setPatternSelector(null) + .setConfiguration(null) + .setRegexReplacement(null) + .setCharset((Charset) CHARSET_DEFAULT) + .setAlwaysWriteExceptions(false) + .setNoConsoleNoAnsi(true) + .setHeader(null) + .setFooter(null) + .build(); + private final Destination destination = new Destination(); class Destination implements ByteBufferDestination {
