Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated RegexFilter implementtation with changes from 2.x branch merge to main [3.x] (#3086) #3513

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Updated RegexFilter implementtation with changes from 2.x branch merge to main [3.x] (#3086) #3513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e8bbd1d
Removed 'patternFlags' @PluginAttribute from RegexFilter @PluginFacto…
JWT007 Mar 2, 2025
cdd9eed
Updates per PR Code Review (#3086)
JWT007 Mar 2, 2025
3827a0c
A few more improvements + added tests (#3086)
JWT007 Mar 2, 2025
4d60384
Fix validation behavior in RegexFilter (#3086)
JWT007 Mar 2, 2025
aff317e
Fixed a reverse logic check in a validation (#3086)
JWT007 Mar 2, 2025
20d541f
Fix Spotless errors (#3086)
JWT007 Mar 2, 2025
d289be3
Fix RegexFilterTest (#3086)
JWT007 Mar 2, 2025
0d348a6
Cleaned up cherry-pick from 2.x - removed deprecated API (#3086)
JWT007 Mar 2, 2025
5a0aee1
Reverted cherry picked change to legacy Builder. (#3086)
JWT007 Mar 2, 2025
2c35ef8
Removed 'isValid()' from RegexFilter#Builder() - validation API has n…
JWT007 Mar 2, 2025
050567d
Cleaned up AbstractFilterableTest to better match JUnit5 (#3086)
JWT007 Mar 2, 2025
e6a5ee3
Renamed and updated changelog. (#3086)
JWT007 Mar 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public class AbstractFilterTest {
@Test
public void testUnrolledBackwardsCompatible() {
final ConcreteFilter filter = new ConcreteFilter();
final Filter.Result expected = Filter.Result.DENY;
verifyMethodsWithUnrolledVarargs(filter, Filter.Result.DENY);

filter.testResult = Filter.Result.ACCEPT;
Expand Down
58 changes: 27 additions & 31 deletions ...-core-test/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Filter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class AbstractFilterableTest {
class AbstractFilterableTest {

MockedAbstractFilterable filterable;

Expand All @@ -37,41 +37,41 @@ public void setup() {
}

@Test
public void testAddSimpleFilter() throws Exception {
void testAddSimpleFilter() {
final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);

filterable.addFilter(filter);
assertSame(filter, filterable.getFilter());
}

@Test
public void testAddMultipleSimpleFilters() throws Exception {
void testAddMultipleSimpleFilters() {
final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);

filterable.addFilter(filter);
assertSame(filter, filterable.getFilter());
// adding a second filter converts the filter
// into a CompositeFilter.class
filterable.addFilter(filter);
assertTrue(filterable.getFilter() instanceof CompositeFilter);
assertInstanceOf(CompositeFilter.class, filterable.getFilter());
assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length);
}

@Test
public void testAddMultipleEqualSimpleFilter() throws Exception {
void testAddMultipleEqualSimpleFilter() {
final Filter filter = new EqualFilter("test");

filterable.addFilter(filter);
assertSame(filter, filterable.getFilter());
// adding a second filter converts the filter
// into a CompositeFilter.class
filterable.addFilter(filter);
assertTrue(filterable.getFilter() instanceof CompositeFilter);
assertInstanceOf(CompositeFilter.class, filterable.getFilter());
assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length);
}

@Test
public void testAddCompositeFilter() throws Exception {
void testAddCompositeFilter() {
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});
Expand All @@ -81,7 +81,7 @@ public void testAddCompositeFilter() throws Exception {
}

@Test
public void testAddMultipleCompositeFilters() throws Exception {
void testAddMultipleCompositeFilters() {
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);
Expand All @@ -92,12 +92,12 @@ public void testAddMultipleCompositeFilters() throws Exception {
// adding a second filter converts the filter
// into a CompositeFilter.class
filterable.addFilter(compositeFilter);
assertTrue(filterable.getFilter() instanceof CompositeFilter);
assertInstanceOf(CompositeFilter.class, filterable.getFilter());
assertEquals(6, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length);
}

@Test
public void testAddSimpleFilterAndCompositeFilter() throws Exception {
void testAddSimpleFilterAndCompositeFilter() {
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);
Expand All @@ -108,12 +108,12 @@ public void testAddSimpleFilterAndCompositeFilter() throws Exception {
// adding a second filter converts the filter
// into a CompositeFilter.class
filterable.addFilter(compositeFilter);
assertTrue(filterable.getFilter() instanceof CompositeFilter);
assertInstanceOf(CompositeFilter.class, filterable.getFilter());
assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length);
}

@Test
public void testAddCompositeFilterAndSimpleFilter() throws Exception {
void testAddCompositeFilterAndSimpleFilter() {
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);
Expand All @@ -124,12 +124,12 @@ public void testAddCompositeFilterAndSimpleFilter() throws Exception {
// adding a second filter converts the filter
// into a CompositeFilter.class
filterable.addFilter(notInCompositeFilterFilter);
assertTrue(filterable.getFilter() instanceof CompositeFilter);
assertInstanceOf(CompositeFilter.class, filterable.getFilter());
assertEquals(3, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length);
}

@Test
public void testRemoveSimpleFilterFromSimpleFilter() throws Exception {
void testRemoveSimpleFilterFromSimpleFilter() {
final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);

filterable.addFilter(filter);
Expand All @@ -138,7 +138,7 @@ public void testRemoveSimpleFilterFromSimpleFilter() throws Exception {
}

@Test
public void testRemoveSimpleEqualFilterFromSimpleFilter() throws Exception {
void testRemoveSimpleEqualFilterFromSimpleFilter() {
final Filter filterOriginal = new EqualFilter("test");
final Filter filterCopy = new EqualFilter("test");

Expand All @@ -148,7 +148,7 @@ public void testRemoveSimpleEqualFilterFromSimpleFilter() throws Exception {
}

@Test
public void testRemoveSimpleEqualFilterFromTwoSimpleFilters() throws Exception {
void testRemoveSimpleEqualFilterFromTwoSimpleFilters() {
final Filter filterOriginal = new EqualFilter("test");
final Filter filterCopy = new EqualFilter("test");

Expand All @@ -161,15 +161,15 @@ public void testRemoveSimpleEqualFilterFromTwoSimpleFilters() throws Exception {
}

@Test
public void testRemoveSimpleEqualFilterFromMultipleSimpleFilters() throws Exception {
void testRemoveSimpleEqualFilterFromMultipleSimpleFilters() {
final Filter filterOriginal = new EqualFilter("test");
final Filter filterCopy = new EqualFilter("test");

filterable.addFilter(filterOriginal);
filterable.addFilter(filterOriginal);
filterable.addFilter(filterCopy);
filterable.removeFilter(filterCopy);
assertTrue(filterable.getFilter() instanceof CompositeFilter);
assertInstanceOf(CompositeFilter.class, filterable.getFilter());
assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length);
filterable.removeFilter(filterCopy);
assertEquals(filterOriginal, filterable.getFilter());
Expand All @@ -178,7 +178,7 @@ public void testRemoveSimpleEqualFilterFromMultipleSimpleFilters() throws Except
}

@Test
public void testRemoveNullFromSingleSimpleFilter() throws Exception {
void testRemoveNullFromSingleSimpleFilter() {
final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);

filterable.addFilter(filter);
Expand All @@ -187,7 +187,7 @@ public void testRemoveNullFromSingleSimpleFilter() throws Exception {
}

@Test
public void testRemoveNonExistingFilterFromSingleSimpleFilter() throws Exception {
void testRemoveNonExistingFilterFromSingleSimpleFilter() {
final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);
final Filter newFilter = ThresholdFilter.createFilter(Level.WARN, null, null);

Expand All @@ -197,7 +197,7 @@ public void testRemoveNonExistingFilterFromSingleSimpleFilter() throws Exception
}

@Test
public void testRemoveSimpleFilterFromCompositeFilter() {
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});
Expand All @@ -212,7 +212,7 @@ public void testRemoveSimpleFilterFromCompositeFilter() {
}

@Test
public void testRemoveSimpleFilterFromCompositeAndSimpleFilter() {
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});
Expand All @@ -223,12 +223,12 @@ public void testRemoveSimpleFilterFromCompositeAndSimpleFilter() {

// should not remove internal filter of compositeFilter
filterable.removeFilter(anotherFilter);
assertTrue(filterable.getFilter() instanceof CompositeFilter);
assertInstanceOf(CompositeFilter.class, filterable.getFilter());
assertEquals(2, ((CompositeFilter) filterable.getFilter()).getFiltersArray().length);
}

@Test
public void testRemoveCompositeFilterFromCompositeFilter() {
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});
Expand All @@ -239,7 +239,7 @@ public void testRemoveCompositeFilterFromCompositeFilter() {
}

@Test
public void testRemoveFiltersFromComposite() {
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});
Expand Down Expand Up @@ -274,11 +274,7 @@ public boolean equals(final Object o) {

final EqualFilter that = (EqualFilter) o;

if (key != null ? !key.equals(that.key) : that.key != null) {
return false;
}

return true;
return key != null ? key.equals(that.key) : that.key == null;
}

@Override
Expand Down
Loading
Loading