You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/03/05 01:06:55 UTC
logging-log4j2 git commit: Extract FilterableComponentBuilder
interface from five separate interfaces.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 963f9654e -> 15f77af87
Extract FilterableComponentBuilder interface from five separate interfaces.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/15f77af8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/15f77af8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/15f77af8
Branch: refs/heads/master
Commit: 15f77af87b2c5618318ad299cdc2b2c414e0e311
Parents: 963f965
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 4 18:06:47 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 4 18:06:47 2016 -0600
----------------------------------------------------------------------
.../builder/api/AppenderComponentBuilder.java | 9 +-----
.../api/AppenderRefComponentBuilder.java | 9 +-----
.../api/CompositeFilterComponentBuilder.java | 10 +-----
.../builder/api/FilterableComponentBuilder.java | 34 ++++++++++++++++++++
.../builder/api/LoggerComponentBuilder.java | 9 +-----
.../builder/api/RootLoggerComponentBuilder.java | 9 +-----
6 files changed, 39 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/15f77af8/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index 4d8f6bd..88d3c93 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core.config.builder.api;
* Builder for constructing Appender Components.
* @since 2.4
*/
-public interface AppenderComponentBuilder extends ComponentBuilder<AppenderComponentBuilder> {
+public interface AppenderComponentBuilder extends FilterableComponentBuilder<AppenderComponentBuilder> {
/**
* Adds a Layout to the Appender component.
@@ -30,13 +30,6 @@ public interface AppenderComponentBuilder extends ComponentBuilder<AppenderCompo
AppenderComponentBuilder add(LayoutComponentBuilder builder);
/**
- * Adds a Filter to the Appender component.
- * @param builder The FilterComponentBuilder with all of its attributes and sub components set.
- * @return this builder.
- */
- AppenderComponentBuilder add(FilterComponentBuilder builder);
-
- /**
* Returns the name of the Appender.
* @return the name of the Appender.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/15f77af8/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
index a98de90..74f2559 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderRefComponentBuilder.java
@@ -20,12 +20,5 @@ package org.apache.logging.log4j.core.config.builder.api;
* Assembler for constructing AppenderRef Components.
* @since 2.4
*/
-public interface AppenderRefComponentBuilder extends ComponentBuilder<AppenderRefComponentBuilder> {
-
- /**
- * Add a Filter to the Appender component.
- * @param assembler The FilterComponentBuilder with all of its attributes and sub components set.
- * @return this Assembler.
- */
- AppenderRefComponentBuilder add(FilterComponentBuilder assembler);
+public interface AppenderRefComponentBuilder extends FilterableComponentBuilder<AppenderRefComponentBuilder> {
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/15f77af8/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
index b0877d3..3450010 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/CompositeFilterComponentBuilder.java
@@ -19,13 +19,5 @@ package org.apache.logging.log4j.core.config.builder.api;
/**
* Wraps multiple Filter Comnponent builders.
*/
-public interface CompositeFilterComponentBuilder extends ComponentBuilder<CompositeFilterComponentBuilder> {
-
- /**
- * Add a FilterComponent.
- * @param assembler The FilterComponentBuilder with all of its attributes and sub-components set.
- * @return The CompositeFilterComponentBuilder.
- * @since 2.4
- */
- CompositeFilterComponentBuilder add(FilterComponentBuilder assembler);
+public interface CompositeFilterComponentBuilder extends FilterableComponentBuilder<CompositeFilterComponentBuilder> {
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/15f77af8/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterableComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterableComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterableComponentBuilder.java
new file mode 100644
index 0000000..51b520f
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterableComponentBuilder.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+
+package org.apache.logging.log4j.core.config.builder.api;
+
+/**
+ * Component builder that can add Filters. Similar in idea to the {@link org.apache.logging.log4j.core.filter.Filterable}.
+ *
+ * @since 2.6
+ */
+public interface FilterableComponentBuilder<T extends ComponentBuilder<T>> extends ComponentBuilder<T> {
+
+ /**
+ * Adds a Filter to the component.
+ *
+ * @param assembler The FilterComponentBuilder with all of its attributes and sub components set.
+ * @return this Assembler.
+ */
+ T add(FilterComponentBuilder assembler);
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/15f77af8/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
index fcca42b..f5b5cea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggerComponentBuilder.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core.config.builder.api;
* Assembler for constructing Logger Components.
* @since 2.4
*/
-public interface LoggerComponentBuilder extends ComponentBuilder<LoggerComponentBuilder> {
+public interface LoggerComponentBuilder extends FilterableComponentBuilder<LoggerComponentBuilder> {
/**
* Add an Appender reference to the Logger component.
@@ -28,11 +28,4 @@ public interface LoggerComponentBuilder extends ComponentBuilder<LoggerComponent
* @return this Assembler.
*/
LoggerComponentBuilder add(AppenderRefComponentBuilder assembler);
-
- /**
- * Add a Filter to the Logger component.
- * @param assembler The FilterComponentBuilder with all of its attributes and sub-components set.
- * @return this Assembler.
- */
- LoggerComponentBuilder add(FilterComponentBuilder assembler);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/15f77af8/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
index 324eb99..9c4a1dd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/RootLoggerComponentBuilder.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core.config.builder.api;
* Assembler for constructing the root Logger Components.
* @since 2.4
*/
-public interface RootLoggerComponentBuilder extends ComponentBuilder<RootLoggerComponentBuilder> {
+public interface RootLoggerComponentBuilder extends FilterableComponentBuilder<RootLoggerComponentBuilder> {
/**
* Add an Appender reference to the Logger component.
@@ -28,11 +28,4 @@ public interface RootLoggerComponentBuilder extends ComponentBuilder<RootLoggerC
* @return this Assembler.
*/
RootLoggerComponentBuilder add(AppenderRefComponentBuilder assembler);
-
- /**
- * Add a Filter to the Logger component.
- * @param assembler The FilterComponentBuilder with all of its attributes and sub-components set.
- * @return this Assembler.
- */
- RootLoggerComponentBuilder add(FilterComponentBuilder assembler);
}