You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/31 09:57:58 UTC
[14/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to CompositeFilter
LOG4J2-1278 added methods with unrolled varargs to CompositeFilter
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2dfd2c38
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2dfd2c38
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2dfd2c38
Branch: refs/heads/master
Commit: 2dfd2c38d9bc821c5881b434aa0af5cd8a97eff1
Parents: 65116fe
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:45:03 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:45:03 2016 +1100
----------------------------------------------------------------------
.../log4j/core/filter/CompositeFilter.java | 328 ++++++++++++++++++-
1 file changed, 326 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2dfd2c38/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 7a6efbc..9e5754a 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
@@ -65,7 +65,7 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
// null does nothing
return this;
}
- // This is not a great implementation but simpler than copying Apache Commons
+ // This is not a great implementation but simpler than copying Apache Commons
// Lang ArrayUtils.removeElement() and associated bits (MutableInt),
// which is OK since removing a filter should not be on the critical path.
final List<Filter> filterList = Arrays.asList(this.filters);
@@ -80,7 +80,7 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
/**
* Gets a new list over the internal filter array.
- *
+ *
* @return a new list over the internal filter array
* @deprecated Use {@link #getFiltersArray()}
*/
@@ -182,6 +182,330 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
* @param marker
* The Marker for the event or null.
* @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
+ * String text to filter on.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @param p9 the message parameters
+ * @return the Result.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ Result result = Result.NEUTRAL;
+ for (int i = 0; i < filters.length; i++) {
+ result = filters[i].filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+ if (result == Result.ACCEPT || result == Result.DENY) {
+ return result;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Filter an event.
+ *
+ * @param logger
+ * The Logger.
+ * @param level
+ * The event logging Level.
+ * @param marker
+ * The Marker for the event or null.
+ * @param msg
* Any Object.
* @param t
* A Throwable or null.