Repository: logging-log4j2 Updated Branches: refs/heads/master 43c20aa66 -> cb48e052c
Normalize spelling of method parameters and variables from "onMisMatch" to "onMismatch". This is an upshot from [LOG4J2-2202] MarkerFilter onMismatch invalid attribute in .properties. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cb48e052 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cb48e052 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cb48e052 Branch: refs/heads/master Commit: cb48e052c2f366168353580d063a006589246eda Parents: 43c20aa Author: Gary Gregory <[email protected]> Authored: Wed Jan 24 13:07:33 2018 -0700 Committer: Gary Gregory <[email protected]> Committed: Wed Jan 24 13:07:33 2018 -0700 ---------------------------------------------------------------------- .../log4j/core/config/builder/api/ConfigurationBuilder.java | 8 ++++---- .../builder/impl/DefaultCompositeFilterComponentBuilder.java | 4 ++-- .../config/builder/impl/DefaultConfigurationBuilder.java | 8 ++++---- .../config/builder/impl/DefaultFilterComponentBuilder.java | 4 ++-- .../config/properties/PropertiesConfigurationBuilder.java | 4 ++-- .../org/apache/logging/log4j/core/filter/ScriptFilter.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cb48e052/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java index e10f292..1cbf6cc 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java @@ -285,19 +285,19 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T * Returns a builder for creating Filters. * @param pluginName The Plugin type of the Filter. * @param onMatch "ACCEPT", "DENY", or "NEUTRAL" - * @param onMisMatch "ACCEPT", "DENY", or "NEUTRAL" + * @param onMismatch "ACCEPT", "DENY", or "NEUTRAL" * @return A new FilterComponentBuilder. */ - FilterComponentBuilder newFilter(String pluginName, Filter.Result onMatch, Filter.Result onMisMatch); + FilterComponentBuilder newFilter(String pluginName, Filter.Result onMatch, Filter.Result onMismatch); /** * Returns a builder for creating Filters. * @param pluginName The Plugin type of the Filter. * @param onMatch "ACCEPT", "DENY", or "NEUTRAL" - * @param onMisMatch "ACCEPT", "DENY", or "NEUTRAL" + * @param onMismatch "ACCEPT", "DENY", or "NEUTRAL" * @return A new FilterComponentBuilder. */ - FilterComponentBuilder newFilter(String pluginName, String onMatch, String onMisMatch); + FilterComponentBuilder newFilter(String pluginName, String onMatch, String onMismatch); /** * Returns a builder for creating Layouts. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cb48e052/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java index 4188017..6c7aedd 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCompositeFilterComponentBuilder.java @@ -28,10 +28,10 @@ class DefaultCompositeFilterComponentBuilder implements CompositeFilterComponentBuilder { public DefaultCompositeFilterComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, - final String onMatch, final String onMisMatch) { + final String onMatch, final String onMismatch) { super(builder, "Filters"); addAttribute("onMatch", onMatch); - addAttribute("onMisMatch", onMisMatch); + addAttribute("onMisMatch", onMismatch); } @Override http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cb48e052/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java index 1559b01..27d8710 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java @@ -449,13 +449,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement @Override public FilterComponentBuilder newFilter(final String type, final Filter.Result onMatch, - final Filter.Result onMisMatch) { - return new DefaultFilterComponentBuilder(this, type, onMatch.name(), onMisMatch.name()); + final Filter.Result onMismatch) { + return new DefaultFilterComponentBuilder(this, type, onMatch.name(), onMismatch.name()); } @Override - public FilterComponentBuilder newFilter(final String type, final String onMatch, final String onMisMatch) { - return new DefaultFilterComponentBuilder(this, type, onMatch, onMisMatch); + public FilterComponentBuilder newFilter(final String type, final String onMatch, final String onMismatch) { + return new DefaultFilterComponentBuilder(this, type, onMatch, onMismatch); } @Override http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cb48e052/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java index a5e38dc..9589672 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultFilterComponentBuilder.java @@ -26,9 +26,9 @@ class DefaultFilterComponentBuilder extends DefaultComponentAndConfigurationBuil implements FilterComponentBuilder { public DefaultFilterComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, final String type, - final String onMatch, final String onMisMatch) { + final String onMatch, final String onMismatch) { super(builder, type); addAttribute("onMatch", onMatch); - addAttribute("onMisMatch", onMisMatch); + addAttribute("onMisMatch", onMismatch); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cb48e052/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java index db44bed..9fab7a4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java @@ -231,8 +231,8 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory throw new ConfigurationException("No type attribute provided for Appender " + key); } final String onMatch = (String) properties.remove(MarkerFilter.ATTR_ON_MATCH); - final String onMisMatch = (String) properties.remove(MarkerFilter.ATTR_ON_MISMATCH); - final FilterComponentBuilder filterBuilder = builder.newFilter(type, onMatch, onMisMatch); + final String onMismatch = (String) properties.remove(MarkerFilter.ATTR_ON_MISMATCH); + final FilterComponentBuilder filterBuilder = builder.newFilter(type, onMatch, onMismatch); return processRemainingProperties(filterBuilder, properties); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cb48e052/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java index 12fb1ac..5443906 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java @@ -38,7 +38,7 @@ import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.status.StatusLogger; /** - * Returns the onMatch result if the script returns True and returns the onMisMatch value otherwise. + * Returns the onMatch result if the script returns True and returns the onMismatch value otherwise. */ @Plugin(name = "ScriptFilter", category = Node.CATEGORY, elementType = Filter.ELEMENT_TYPE, printObject = true) public final class ScriptFilter extends AbstractFilter {
