From 20a49a562b5c8d866b679618c302cdf788d068b6 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 23 Jan 2025 20:43:52 +0800 Subject: [PATCH 1/3] Replace deprecated `CLOSED_OUTPUT_STREAM` with `INSTANCE` in `org.apache.commons.io.output.ClosedOutputStream` --- .../plugins/shade/transformer/CloseShieldOutputStream.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/log4j-transform-maven-shade-plugin-extensions/src/main/java/org/apache/logging/log4j/maven/plugins/shade/transformer/CloseShieldOutputStream.java b/log4j-transform-maven-shade-plugin-extensions/src/main/java/org/apache/logging/log4j/maven/plugins/shade/transformer/CloseShieldOutputStream.java index 9ea09e2..cffc942 100644 --- a/log4j-transform-maven-shade-plugin-extensions/src/main/java/org/apache/logging/log4j/maven/plugins/shade/transformer/CloseShieldOutputStream.java +++ b/log4j-transform-maven-shade-plugin-extensions/src/main/java/org/apache/logging/log4j/maven/plugins/shade/transformer/CloseShieldOutputStream.java @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.maven.plugins.shade.transformer; -import static org.apache.commons.io.output.ClosedOutputStream.CLOSED_OUTPUT_STREAM; +import static org.apache.commons.io.output.ClosedOutputStream.INSTANCE; import java.io.IOException; import java.io.OutputStream; @@ -37,6 +37,6 @@ final class CloseShieldOutputStream extends ProxyOutputStream { @Override public void close() throws IOException { out.flush(); - out = CLOSED_OUTPUT_STREAM; + out = INSTANCE; } } From b6db663f13bfa99e5b5c67f81889a28ae44eee0c Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 23 Jan 2025 20:47:00 +0800 Subject: [PATCH 2/3] Replace deprecated `getDependencyArtifacts` with `getArtifacts` in `org.apache.maven.project.MavenProject` --- .../org/apache/logging/log4j/transform/maven/LocationMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j-transform-maven-plugin/src/main/java/org/apache/logging/log4j/transform/maven/LocationMojo.java b/log4j-transform-maven-plugin/src/main/java/org/apache/logging/log4j/transform/maven/LocationMojo.java index 0fc805c..fb68ab5 100644 --- a/log4j-transform-maven-plugin/src/main/java/org/apache/logging/log4j/transform/maven/LocationMojo.java +++ b/log4j-transform-maven-plugin/src/main/java/org/apache/logging/log4j/transform/maven/LocationMojo.java @@ -210,7 +210,7 @@ private boolean validateLog4jVersion() throws MojoExecutionException { return false; } // Transitive dependency - if (!project.getDependencyArtifacts().contains(log4jApi)) { + if (!project.getArtifacts().contains(log4jApi)) { getLog().warn("Log4j2 API should not be a transitive dependency."); } } catch (OverConstrainedVersionException e) { From 13759a48d7eed315a34968dbcef281be3a8b9382 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 23 Jan 2025 20:50:37 +0800 Subject: [PATCH 3/3] Cleanups --- .../internal/v1/AbstractV1ConfigurationParserTest.java | 2 +- .../apache/logging/log4j/transform/maven/LocationMojo.java | 5 ++--- .../shade/transformer/Log4j2PluginCacheFileTransformer.java | 2 +- .../apache/logging/log4j/weaver/LocationCacheGenerator.java | 2 +- .../apache/logging/log4j/weaver/LocationMethodVisitor.java | 4 ++-- .../logging/log4j/weaver/log4j2/LoggerConversionHandler.java | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/log4j-converter-config/src/test/java/org/apache/logging/converter/config/internal/v1/AbstractV1ConfigurationParserTest.java b/log4j-converter-config/src/test/java/org/apache/logging/converter/config/internal/v1/AbstractV1ConfigurationParserTest.java index 071f8d8..10a6033 100644 --- a/log4j-converter-config/src/test/java/org/apache/logging/converter/config/internal/v1/AbstractV1ConfigurationParserTest.java +++ b/log4j-converter-config/src/test/java/org/apache/logging/converter/config/internal/v1/AbstractV1ConfigurationParserTest.java @@ -27,7 +27,7 @@ public class AbstractV1ConfigurationParserTest extends AbstractConfigurationMapperTest { - static ConfigurationNode EXAMPLE_V1_CONFIGURATION = newNodeBuilder() + static final ConfigurationNode EXAMPLE_V1_CONFIGURATION = newNodeBuilder() .setPluginName("Configuration") .addChild(newNodeBuilder() .setPluginName("Properties") diff --git a/log4j-transform-maven-plugin/src/main/java/org/apache/logging/log4j/transform/maven/LocationMojo.java b/log4j-transform-maven-plugin/src/main/java/org/apache/logging/log4j/transform/maven/LocationMojo.java index fb68ab5..512b4ce 100644 --- a/log4j-transform-maven-plugin/src/main/java/org/apache/logging/log4j/transform/maven/LocationMojo.java +++ b/log4j-transform-maven-plugin/src/main/java/org/apache/logging/log4j/transform/maven/LocationMojo.java @@ -42,7 +42,6 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -102,7 +101,7 @@ public class LocationMojo extends AbstractMojo { private int staleMillis; @Override - public void execute() throws MojoExecutionException, MojoFailureException { + public void execute() throws MojoExecutionException { if ("pom".equals(project.getPackaging())) { getLog().info("Skipping project with packaging \"pom\"."); return; @@ -192,7 +191,7 @@ private WrappedIOException(IOException cause) { } } - private boolean validateLog4jVersion() throws MojoExecutionException { + private boolean validateLog4jVersion() { Optional artifact = project.getArtifacts().stream() .filter(a -> LOG4J_GROUP_ID.equals(a.getGroupId()) && LOG4J_API_ARTIFACT_ID.equals(a.getArtifactId())) .findAny(); diff --git a/log4j-transform-maven-shade-plugin-extensions/src/main/java/org/apache/logging/log4j/maven/plugins/shade/transformer/Log4j2PluginCacheFileTransformer.java b/log4j-transform-maven-shade-plugin-extensions/src/main/java/org/apache/logging/log4j/maven/plugins/shade/transformer/Log4j2PluginCacheFileTransformer.java index 945dea8..bc437be 100644 --- a/log4j-transform-maven-shade-plugin-extensions/src/main/java/org/apache/logging/log4j/maven/plugins/shade/transformer/Log4j2PluginCacheFileTransformer.java +++ b/log4j-transform-maven-shade-plugin-extensions/src/main/java/org/apache/logging/log4j/maven/plugins/shade/transformer/Log4j2PluginCacheFileTransformer.java @@ -107,7 +107,7 @@ public void processResource( */ @Override public boolean hasTransformedResource() { - return tempFiles.size() > 0; + return !tempFiles.isEmpty(); } /** diff --git a/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/LocationCacheGenerator.java b/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/LocationCacheGenerator.java index a103343..6341b42 100644 --- a/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/LocationCacheGenerator.java +++ b/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/LocationCacheGenerator.java @@ -278,7 +278,7 @@ public int getIndex() { */ private static class LocationCacheContents { private final List locations = new CopyOnWriteArrayList<>(); - private Set lambdas = EnumSet.noneOf(SupplierLambdaType.class); + private final Set lambdas = EnumSet.noneOf(SupplierLambdaType.class); public int addLocation( final String internalClassName, final String methodName, final String fileName, final int lineNumber) { diff --git a/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/LocationMethodVisitor.java b/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/LocationMethodVisitor.java index f16cb96..b366af5 100644 --- a/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/LocationMethodVisitor.java +++ b/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/LocationMethodVisitor.java @@ -42,8 +42,8 @@ public class LocationMethodVisitor extends GeneratorAdapter { // Programmatically define LAMBDA_METAFACTORY_HANDLE - private static Type SUPPLIER_OF_OBJECT_TYPE = Type.getMethodType(OBJECT_TYPE); - private static Type SUPPLIER_OF_MESSAGE_TYPE = Type.getMethodType(MESSAGE_TYPE); + private static final Type SUPPLIER_OF_OBJECT_TYPE = Type.getMethodType(OBJECT_TYPE); + private static final Type SUPPLIER_OF_MESSAGE_TYPE = Type.getMethodType(MESSAGE_TYPE); private static final Type LAMBDA_METAFACTORY_TYPE = Type.getType(LambdaMetafactory.class); private static final Type METHOD_HANDLE_TYPE = Type.getType(MethodHandle.class); private static final Type METHOD_TYPE_TYPE = Type.getType(MethodType.class); diff --git a/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandler.java b/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandler.java index 0587874..c474c78 100644 --- a/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandler.java +++ b/log4j-weaver/src/main/java/org/apache/logging/log4j/weaver/log4j2/LoggerConversionHandler.java @@ -279,8 +279,8 @@ private void handleTraceEntry(LocationMethodVisitor mv, String descriptor) { if (types.length == 1) { mv.push((String) null); } - for (int i = 0; i < vars.length; i++) { - mv.loadLocal(vars[i]); + for (int var : vars) { + mv.loadLocal(var); } final boolean usesSuppliers = types[types.length - 1].equals(SUPPLIER_ARRAY_TYPE); mv.invokeSupplierLambda(