Use varargs to create filters

Author: garydgregory

log4j-1.2-api/src/main/java/org/apache/log4j/bridge/FilterAdapter.java

@@ -69,7 +69,7 @@ public static Filter addFilter(final Filter first, final Filter second) {
         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)));
     }

log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java

@@ -74,7 +74,7 @@ public void testAddMultipleEqualSimpleFilter() throws Exception {
     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 void testAddMultipleCompositeFilters() throws Exception {
         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 void testAddSimpleFilterAndCompositeFilter() throws Exception {
         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 void testAddCompositeFilterAndSimpleFilter() throws Exception {
         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 void testRemoveNonExistingFilterFromSingleSimpleFilter() throws Exception
     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 void testRemoveSimpleFilterFromCompositeFilter() {
     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 void testRemoveSimpleFilterFromCompositeAndSimpleFilter() {
     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 void testRemoveCompositeFilterFromCompositeFilter() {
     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);

log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/CompositeFilterTest.java

@@ -35,9 +35,9 @@ public void testConcatenation() {
         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());

log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java

@@ -684,7 +684,7 @@ public String toString() {
      * @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);
     }
 }