You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2024/11/01 18:33:51 UTC
(logging-log4j2) branch 2.x updated: Use varargs to create filters
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new db73c3aac9 Use varargs to create filters
db73c3aac9 is described below
commit db73c3aac94b7d6c074ddc60ab1c8451a284bd3e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 1 14:33:46 2024 -0400
Use varargs to create filters
---
.../main/java/org/apache/log4j/bridge/FilterAdapter.java | 2 +-
.../log4j/core/filter/AbstractFilterableTest.java | 16 ++++++++--------
.../logging/log4j/core/filter/CompositeFilterTest.java | 6 +++---
.../logging/log4j/core/filter/CompositeFilter.java | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/FilterAdapter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/FilterAdapter.java
index c01d179da4..06204842ea 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/FilterAdapter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/FilterAdapter.java
@@ -69,7 +69,7 @@ public final class FilterAdapter extends AbstractFilter {
if (first instanceof FilterWrapper && ((FilterWrapper) first).getFilter() instanceof CompositeFilter) {
composite = (CompositeFilter) ((FilterWrapper) first).getFilter();
} else {
- composite = CompositeFilter.createFilters(new org.apache.logging.log4j.core.Filter[] {adapt(first)});
+ composite = CompositeFilter.createFilters(adapt(first));
}
return FilterWrapper.adapt(composite.addFilter(adapt(second)));
}
diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java
index 078cc0469e..fec1da628c 100644
--- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java
+++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java
@@ -74,7 +74,7 @@ public class AbstractFilterableTest {
public void testAddCompositeFilter() throws Exception {
final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
- final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
+ final Filter compositeFilter = CompositeFilter.createFilters(filter1, filter2);
filterable.addFilter(compositeFilter);
assertSame(compositeFilter, filterable.getFilter());
@@ -85,7 +85,7 @@ public class AbstractFilterableTest {
final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter filter3 = ThresholdFilter.createFilter(Level.ERROR, null, null);
- final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2, filter3});
+ final Filter compositeFilter = CompositeFilter.createFilters(filter1, filter2, filter3);
filterable.addFilter(compositeFilter);
assertSame(compositeFilter, filterable.getFilter());
@@ -101,7 +101,7 @@ public class AbstractFilterableTest {
final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter notInCompositeFilterFilter = ThresholdFilter.createFilter(Level.ERROR, null, null);
- final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
+ final Filter compositeFilter = CompositeFilter.createFilters(filter1, filter2);
filterable.addFilter(notInCompositeFilterFilter);
assertSame(notInCompositeFilterFilter, filterable.getFilter());
@@ -117,7 +117,7 @@ public class AbstractFilterableTest {
final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter notInCompositeFilterFilter = ThresholdFilter.createFilter(Level.ERROR, null, null);
- final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
+ final Filter compositeFilter = CompositeFilter.createFilters(filter1, filter2);
filterable.addFilter(compositeFilter);
assertSame(compositeFilter, filterable.getFilter());
@@ -200,7 +200,7 @@ public class AbstractFilterableTest {
public void testRemoveSimpleFilterFromCompositeFilter() {
final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
- final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
+ final Filter compositeFilter = CompositeFilter.createFilters(filter1, filter2);
filterable.addFilter(compositeFilter);
@@ -215,7 +215,7 @@ public class AbstractFilterableTest {
public void testRemoveSimpleFilterFromCompositeAndSimpleFilter() {
final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
- final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
+ final Filter compositeFilter = CompositeFilter.createFilters(filter1, filter2);
final Filter anotherFilter = ThresholdFilter.createFilter(Level.WARN, null, null);
filterable.addFilter(compositeFilter);
@@ -231,7 +231,7 @@ public class AbstractFilterableTest {
public void testRemoveCompositeFilterFromCompositeFilter() {
final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
- final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
+ final Filter compositeFilter = CompositeFilter.createFilters(filter1, filter2);
filterable.addFilter(compositeFilter);
filterable.removeFilter(compositeFilter);
@@ -242,7 +242,7 @@ public class AbstractFilterableTest {
public void testRemoveFiltersFromComposite() {
final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
- final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
+ final Filter compositeFilter = CompositeFilter.createFilters(filter1, filter2);
final Filter anotherFilter = ThresholdFilter.createFilter(Level.WARN, null, null);
filterable.addFilter(compositeFilter);
diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/CompositeFilterTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/CompositeFilterTest.java
index 72ff43a507..a778259562 100644
--- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/CompositeFilterTest.java
+++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/CompositeFilterTest.java
@@ -35,9 +35,9 @@ public class CompositeFilterTest {
assertNotEquals(a, c);
assertNotEquals(b, c);
final Filter[] expected = new Filter[] {a, b, c};
- final CompositeFilter singleA = CompositeFilter.createFilters(new Filter[] {a});
- final CompositeFilter singleB = CompositeFilter.createFilters(new Filter[] {b});
- final CompositeFilter singleC = CompositeFilter.createFilters(new Filter[] {c});
+ final CompositeFilter singleA = CompositeFilter.createFilters(a);
+ final CompositeFilter singleB = CompositeFilter.createFilters(b);
+ final CompositeFilter singleC = CompositeFilter.createFilters(c);
// Concatenating one at a time
final CompositeFilter concat1 = singleA.addFilter(b).addFilter(c);
assertArrayEquals(expected, concat1.getFiltersArray());
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 2728da2756..0ee85c5ec1 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
@@ -684,7 +684,7 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
* @return The CompositeFilter.
*/
@PluginFactory
- public static CompositeFilter createFilters(@PluginElement("Filters") final Filter[] filters) {
+ public static CompositeFilter createFilters(@PluginElement("Filters") final Filter... filters) {
return new CompositeFilter(filters);
}
}