This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 4a44b0bd6f Fix compilation with ErrorProne
4a44b0bd6f is described below
commit 4a44b0bd6f411463262f715ea08838a10959282c
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Mon Sep 25 17:59:46 2023 +0200
Fix compilation with ErrorProne
Fixes the compilation errors reported by ErrorProne.
---
.../org/apache/logging/log4j/PerformanceComparison.java | 6 ++----
.../log4j/core/lookup/MainInputArgumentsMapLookup.java | 1 -
.../logging/log4j/core/pattern/PatternParserTest.java | 1 -
.../logging/log4j/core/tools/GenerateCustomLoggerTest.java | 1 +
.../log4j/core/tools/GenerateExtendedLoggerTest.java | 1 +
.../appender/CsvJsonParameterLayoutFileAppenderTest.java | 2 +-
.../log4j/flume/appender/FlumeEmbeddedAppenderTest.java | 13 +++++--------
.../jndi/appender/routing/RoutingAppenderWithJndiTest.java | 1 +
.../java/org/apache/logging/log4j/jndi/JndiManager.java | 2 +-
.../org/apache/logging/log4j/jpa/appender/JpaAppender.java | 2 +-
.../layout/template/json/resolver/MessageResolverTest.java | 8 ++++----
.../json/resolver/StackTraceStringResolverTest.java | 3 ++-
.../layout/template/json/util/CharSequencePointerTest.java | 1 +
13 files changed, 20 insertions(+), 22 deletions(-)
diff --git
a/log4j-core-its/src/test/java/org/apache/logging/log4j/PerformanceComparison.java
b/log4j-core-its/src/test/java/org/apache/logging/log4j/PerformanceComparison.java
index d277ccd2d3..cf87903581 100644
---
a/log4j-core-its/src/test/java/org/apache/logging/log4j/PerformanceComparison.java
+++
b/log4j-core-its/src/test/java/org/apache/logging/log4j/PerformanceComparison.java
@@ -30,7 +30,6 @@ import
org.apache.logging.log4j.core.test.categories.PerformanceTests;
import org.apache.logging.log4j.core.test.util.Profiler;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -110,9 +109,8 @@ public class PerformanceComparison {
System.out.println("###############################################");
}
- @Test
- @Ignore
- public void testRawPerformance() throws Exception {
+ //@Test
+ private void testRawPerformance() throws Exception {
final OutputStream os = new FileOutputStream("target/testos.log",
true);
final long result1 = writeToStream(COUNT, os);
os.close();
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java
index 6d0f2638bf..2a6564ef27 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/lookup/MainInputArgumentsMapLookup.java
@@ -34,7 +34,6 @@ public class MainInputArgumentsMapLookup extends MapLookup {
final String[] args = null;
for (final Map.Entry<Thread, StackTraceElement[]> entry :
allStackTraces.entrySet()) {
final StackTraceElement[] stackTraceElements = entry.getValue();
- entry.getKey();
// Can't use the thread name to look for "main" since anyone can
set it.
// Can't use thread ID since it can be any positive value, and is
likely vendor dependent. Oracle seems to
// use 1.
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
index 5714c957c4..f606ef883d 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
@@ -204,7 +204,6 @@ public class PatternParserTest {
final List<PatternFormatter> formatters =
parser.parse(nestedPatternHighlight);
assertNotNull(formatters);
final Throwable t = new Throwable();
- t.getStackTrace();
final LogEvent event = Log4jLogEvent.newBuilder() //
.setLoggerName("org.apache.logging.log4j.PatternParserTest") //
.setMarker(MarkerManager.getMarker("TEST")) //
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java
index 1418ab036c..2394b15a75 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java
@@ -70,6 +70,7 @@ public class GenerateCustomLoggerTest {
}
@Test
+ @SuppressWarnings("ReturnValueIgnored")
public void testGenerateSource() throws Exception {
final String CLASSNAME =
"org.apache.logging.log4j.core.MyCustomLogger";
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java
index dafb163374..45342f8394 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java
@@ -71,6 +71,7 @@ public class GenerateExtendedLoggerTest {
}
@Test
+ @SuppressWarnings("ReturnValueIgnored")
public void testGenerateSource() throws Exception {
final String CLASSNAME =
"org.apache.logging.log4j.core.MyExtendedLogger";
diff --git
a/log4j-csv/src/test/java/org/apache/logging/log4j/csv/appender/CsvJsonParameterLayoutFileAppenderTest.java
b/log4j-csv/src/test/java/org/apache/logging/log4j/csv/appender/CsvJsonParameterLayoutFileAppenderTest.java
index e39b1b08d7..d459f0fa94 100644
---
a/log4j-csv/src/test/java/org/apache/logging/log4j/csv/appender/CsvJsonParameterLayoutFileAppenderTest.java
+++
b/log4j-csv/src/test/java/org/apache/logging/log4j/csv/appender/CsvJsonParameterLayoutFileAppenderTest.java
@@ -45,7 +45,7 @@ public class CsvJsonParameterLayoutFileAppenderTest {
@Rule
public RuleChain rule = loggerContextRule.withCleanFilesRule(FILE_PATH);
- public void testNoNulCharacters(final String message, final String
expected) throws IOException {
+ private void testNoNulCharacters(final String message, final String
expected) throws IOException {
@SuppressWarnings("resource")
final LoggerContext loggerContext =
loggerContextRule.getLoggerContext();
final Logger logger = loggerContext.getLogger("com.example");
diff --git
a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
index e44f2f1a13..f781bb58f3 100644
---
a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
+++
b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
@@ -56,7 +56,6 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.fail;
@@ -195,10 +194,9 @@ public class FlumeEmbeddedAppenderTest {
" Received: " + body, body.endsWith(expected));
}
}
- /* Flume 1.4.0 does not support interceptors on the embedded agent */
- @Test
- @Ignore
- public void testHeaderAddedByInterceptor() {
+ /* Flume 1.4.0 does not support interceptors on the embedded agent
+ @Test */
+ private void testHeaderAddedByInterceptor() {
final StructuredDataMessage msg = new StructuredDataMessage("Test",
"Test Log4j", "Test");
EventLogger.logEvent(msg);
@@ -209,9 +207,8 @@ public class FlumeEmbeddedAppenderTest {
Assert.assertEquals("local", environmentHeader);
}
- @Test
- @Ignore
- public void testPerformance() throws Exception {
+ /* @Test */
+ private void testPerformance() throws Exception {
final long start = System.currentTimeMillis();
final int count = 10000;
for (int i = 0; i < count; ++i) {
diff --git
a/log4j-jndi-test/src/test/java/org/apache/logging/log4j/jndi/appender/routing/RoutingAppenderWithJndiTest.java
b/log4j-jndi-test/src/test/java/org/apache/logging/log4j/jndi/appender/routing/RoutingAppenderWithJndiTest.java
index b9a051dabe..a2b7d03cf0 100644
---
a/log4j-jndi-test/src/test/java/org/apache/logging/log4j/jndi/appender/routing/RoutingAppenderWithJndiTest.java
+++
b/log4j-jndi-test/src/test/java/org/apache/logging/log4j/jndi/appender/routing/RoutingAppenderWithJndiTest.java
@@ -69,6 +69,7 @@ public class RoutingAppenderWithJndiTest {
}
@Test
+ @SuppressWarnings("BanJNDI")
public void routingTest() throws NamingException {
// default route when there's no jndi resource
StructuredDataMessage msg = new StructuredDataMessage("Test", "This is
a message from unknown context", "Context");
diff --git
a/log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JndiManager.java
b/log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JndiManager.java
index 69021a5be3..b6b371d98d 100644
--- a/log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JndiManager.java
+++ b/log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JndiManager.java
@@ -190,7 +190,7 @@ public final class JndiManager extends AbstractManager {
* @return the named object if it could be located.
* @throws NamingException if a naming exception is encountered
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "BanJNDI"})
public <T> T lookup(final String name) throws NamingException {
if (context == null) {
return null;
diff --git
a/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/JpaAppender.java
b/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/JpaAppender.java
index 98fbaef064..e64d476634 100644
---
a/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/JpaAppender.java
+++
b/log4j-jpa/src/main/java/org/apache/logging/log4j/jpa/appender/JpaAppender.java
@@ -92,7 +92,7 @@ public final class JpaAppender extends
AbstractDatabaseAppender<JpaDatabaseManag
LoaderUtil.loadClass(entityClassName).asSubclass(AbstractLogEventWrapperEntity.class);
try {
- entityClass.getConstructor();
+ final Constructor<?> ignored = entityClass.getConstructor();
} catch (final NoSuchMethodException e) {
LOGGER.error("Entity class [{}] does not have a no-arg
constructor. The JPA provider will reject it.",
entityClassName);
diff --git
a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverTest.java
b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverTest.java
index d9a3ee0d73..c219473a38 100644
---
a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverTest.java
+++
b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverTest.java
@@ -20,6 +20,7 @@ import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -168,10 +169,9 @@ class MessageResolverTest {
// Create the log event.
final int id = 0xDEADBEEF;
final String name = "name-" + id;
- final Object attachment = new LinkedHashMap<String, Object>() {{
- put("id", id);
- put("name", name);
- }};
+ final Map<String, Object> attachment = new LinkedHashMap<>();
+ attachment.put("id", id);
+ attachment.put("name", name);
final ObjectMessage message = new ObjectMessage(attachment);
final LogEvent logEvent = Log4jLogEvent
.newBuilder()
diff --git
a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolverTest.java
b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolverTest.java
index ef2b12e34c..5be0b50105 100644
---
a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolverTest.java
+++
b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolverTest.java
@@ -634,6 +634,7 @@ class StackTraceStringResolverTest {
private static final NonAsciiUtf8MethodNameContainingException
INSTANCE =
createInstance();
+ @SuppressWarnings("UnicodeInCode")
private static NonAsciiUtf8MethodNameContainingException
createInstance() {
try {
throwException_அஆஇฬ๘();
@@ -643,7 +644,7 @@ class StackTraceStringResolverTest {
}
}
- @SuppressWarnings("NonAsciiCharacters")
+ @SuppressWarnings({"NonAsciiCharacters", "UnicodeInCode"})
private static void throwException_அஆஇฬ๘() {
throw new NonAsciiUtf8MethodNameContainingException(
"exception with non-ASCII UTF-8 method name");
diff --git
a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/util/CharSequencePointerTest.java
b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/util/CharSequencePointerTest.java
index 0eef771e98..5ccf81e025 100644
---
a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/util/CharSequencePointerTest.java
+++
b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/util/CharSequencePointerTest.java
@@ -37,6 +37,7 @@ class CharSequencePointerTest {
}
@Test
+ @SuppressWarnings("ReturnValueIgnored")
void toString_should_fail_without_reset() {
// noinspection ResultOfMethodCallIgnored
assertMissingReset(pointer::toString);
