Skip to content

Commit b961662

Browse files
committed
Merge pull request #40235 from ppkarwasz
* gh-40235: Polish "Replace custom filter with DenyAllFilter" Replace custom filter with DenyAllFilter Closes gh-40235
2 parents 3496fe0 + ef9f1b4 commit b961662

File tree

1 file changed

+3
-28
lines changed

1 file changed

+3
-28
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java

+3-28
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -31,9 +31,7 @@
3131

3232
import org.apache.logging.log4j.Level;
3333
import org.apache.logging.log4j.LogManager;
34-
import org.apache.logging.log4j.Marker;
3534
import org.apache.logging.log4j.core.Filter;
36-
import org.apache.logging.log4j.core.LogEvent;
3735
import org.apache.logging.log4j.core.Logger;
3836
import org.apache.logging.log4j.core.LoggerContext;
3937
import org.apache.logging.log4j.core.config.AbstractConfiguration;
@@ -42,14 +40,13 @@
4240
import org.apache.logging.log4j.core.config.ConfigurationSource;
4341
import org.apache.logging.log4j.core.config.LoggerConfig;
4442
import org.apache.logging.log4j.core.config.composite.CompositeConfiguration;
45-
import org.apache.logging.log4j.core.filter.AbstractFilter;
43+
import org.apache.logging.log4j.core.filter.DenyAllFilter;
4644
import org.apache.logging.log4j.core.net.UrlConnectionFactory;
4745
import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
4846
import org.apache.logging.log4j.core.net.ssl.SslConfigurationFactory;
4947
import org.apache.logging.log4j.core.util.AuthorizationProvider;
5048
import org.apache.logging.log4j.core.util.NameUtil;
5149
import org.apache.logging.log4j.jul.Log4jBridgeHandler;
52-
import org.apache.logging.log4j.message.Message;
5350
import org.apache.logging.log4j.util.PropertiesUtil;
5451

5552
import org.springframework.boot.context.properties.bind.BindResult;
@@ -106,29 +103,7 @@ public class Log4J2LoggingSystem extends AbstractLoggingSystem {
106103
LEVELS.map(LogLevel.OFF, Level.OFF);
107104
}
108105

109-
private static final Filter FILTER = new AbstractFilter() {
110-
111-
@Override
112-
public Result filter(LogEvent event) {
113-
return Result.DENY;
114-
}
115-
116-
@Override
117-
public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) {
118-
return Result.DENY;
119-
}
120-
121-
@Override
122-
public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) {
123-
return Result.DENY;
124-
}
125-
126-
@Override
127-
public Result filter(Logger logger, Level level, Marker marker, String msg, Object... params) {
128-
return Result.DENY;
129-
}
130-
131-
};
106+
private static final Filter FILTER = DenyAllFilter.newBuilder().build();
132107

133108
public Log4J2LoggingSystem(ClassLoader classLoader) {
134109
super(classLoader);

0 commit comments

Comments
 (0)