Skip to content

Commit 3d1c3e8

Browse files
committed
Reduced logs from new POI version 5.3.0
1 parent 46ef3fc commit 3d1c3e8

File tree

2 files changed

+51
-9
lines changed

2 files changed

+51
-9
lines changed

sql12/core/src/org/apache/logging/log4j/FixPoiLog4jDependencyLogBuilderMock.java

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,18 @@
99
public class FixPoiLog4jDependencyLogBuilderMock implements LogBuilder
1010
{
1111
public final static ILogger s_log = LoggerController.createLogger(FixPoiLog4jDependencyLogBuilderMock.class);
12+
private final Level _level;
13+
14+
public FixPoiLog4jDependencyLogBuilderMock(Level level)
15+
{
16+
_level = level;
17+
}
1218

1319
@Override
1420
public void log(CharSequence message)
1521
{
22+
if(noLog()){return;}
23+
1624
s_log.info(message);
1725
}
1826

@@ -28,39 +36,50 @@ public void log(String message, Object... params)
2836
logMultParam(message, params);
2937
}
3038

31-
private static void logMultParam(String message, Object... params)
39+
private void logMultParam(String message, Object... params)
3240
{
41+
if(noLog()){return;}
42+
3343
s_log.info(message + " | PARAMS: " + List.of(params));
3444
}
3545

3646
@Override
3747
public void log(String message, org.apache.logging.log4j.util.Supplier<?>... params)
3848
{
49+
if(noLog()){return;}
50+
3951
s_log.info(message + " | PARAMS: " + params);
4052
}
4153

4254
@Override
4355
public void log(Message message)
4456
{
57+
if(noLog()){return;}
58+
4559
s_log.info(message);
4660
}
4761

4862
@Override
4963
public void log(org.apache.logging.log4j.util.Supplier<Message> messageSupplier)
5064
{
65+
if(noLog()){return;}
66+
5167
s_log.info(messageSupplier.get());
5268
}
5369

5470
@Override
5571
public Message logAndGet(org.apache.logging.log4j.util.Supplier<Message> messageSupplier)
5672
{
73+
if(noLog()){return messageSupplier.get();}
74+
5775
s_log.info(messageSupplier.get());
5876
return messageSupplier.get();
5977
}
6078

6179
@Override
6280
public void log(Object message)
6381
{
82+
if(noLog()){return;}
6483
s_log.info(message);
6584
}
6685

@@ -129,4 +148,9 @@ public void log()
129148
{
130149
logMultParam("EMPTY");
131150
}
151+
152+
private boolean noLog()
153+
{
154+
return _level == Level.TRACE || _level == Level.DEBUG || _level == Level.INFO;
155+
}
132156
}

sql12/core/src/org/apache/logging/log4j/LoggerImpl.java

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,69 @@
22

33
public class LoggerImpl implements Logger
44
{
5+
private FixPoiLog4jDependencyLogBuilderMock _traceMock = new FixPoiLog4jDependencyLogBuilderMock(Level.TRACE);
6+
private FixPoiLog4jDependencyLogBuilderMock _debugMock = new FixPoiLog4jDependencyLogBuilderMock(Level.DEBUG);
7+
private FixPoiLog4jDependencyLogBuilderMock _infoMock = new FixPoiLog4jDependencyLogBuilderMock(Level.INFO);
8+
private FixPoiLog4jDependencyLogBuilderMock _warnMock = new FixPoiLog4jDependencyLogBuilderMock(Level.WARN);
9+
private FixPoiLog4jDependencyLogBuilderMock _errorMock = new FixPoiLog4jDependencyLogBuilderMock(Level.ERROR);
10+
private FixPoiLog4jDependencyLogBuilderMock _fatalMock = new FixPoiLog4jDependencyLogBuilderMock(Level.FATAL);
11+
private FixPoiLog4jDependencyLogBuilderMock _allMock = new FixPoiLog4jDependencyLogBuilderMock(Level.ALL);
12+
private FixPoiLog4jDependencyLogBuilderMock _offMock = new FixPoiLog4jDependencyLogBuilderMock(Level.OFF);
13+
514
@Override
615
public LogBuilder atTrace()
716
{
8-
return new FixPoiLog4jDependencyLogBuilderMock();
17+
return _traceMock;
918
}
1019

1120
@Override
1221
public LogBuilder atDebug()
1322
{
14-
return new FixPoiLog4jDependencyLogBuilderMock();
23+
return _debugMock;
1524
}
1625

1726
@Override
1827
public LogBuilder atInfo()
1928
{
20-
return new FixPoiLog4jDependencyLogBuilderMock();
29+
return _infoMock;
2130
}
2231

2332
@Override
2433
public LogBuilder atWarn()
2534
{
26-
return new FixPoiLog4jDependencyLogBuilderMock();
35+
return _warnMock;
2736
}
2837

2938
@Override
3039
public LogBuilder atError()
3140
{
32-
return new FixPoiLog4jDependencyLogBuilderMock();
41+
return _errorMock;
3342
}
3443

3544
@Override
3645
public LogBuilder atFatal()
3746
{
38-
return new FixPoiLog4jDependencyLogBuilderMock();
47+
return _fatalMock;
3948
}
4049

4150
@Override
4251
public LogBuilder always()
4352
{
44-
return new FixPoiLog4jDependencyLogBuilderMock();
53+
return _allMock;
4554
}
4655

4756
@Override
4857
public LogBuilder atLevel(Level level)
4958
{
50-
return new FixPoiLog4jDependencyLogBuilderMock();
59+
if(Level.OFF == level) return _offMock;
60+
if(Level.FATAL == level) return _fatalMock;
61+
if(Level.ERROR == level) return _errorMock;
62+
if(Level.WARN == level) return _warnMock;
63+
if(Level.INFO == level) return _infoMock;
64+
if(Level.DEBUG == level) return _debugMock;
65+
if(Level.TRACE == level) return _traceMock;
66+
if(Level.ALL == level) return _allMock;
67+
68+
return _infoMock;
5169
}
5270
}

0 commit comments

Comments
 (0)