From 591b5d46a4c5d2f84d63ff59f38f63d87aaf366b Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Fri, 17 Oct 2025 13:47:23 +0200 Subject: [PATCH] [prone] Add `UnusedVariable` --- .../org/apache/maven/api/xml/XmlNode.java | 4 ++-- .../maven/impl/DefaultSettingsBuilder.java | 5 ++--- .../maven/impl/model/DefaultModelBuilder.java | 1 - .../impl/model/DefaultModelObjectPool.java | 22 +++++++------------ .../maven/internal/xml/XmlNodeImpl.java | 4 ++-- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/XmlNode.java b/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/XmlNode.java index 7cf78c9cc199..132b7299d63d 100644 --- a/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/XmlNode.java +++ b/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/XmlNode.java @@ -512,7 +512,7 @@ public String toString() { StringWriter writer = new StringWriter(); XmlService.write(this, writer); return writer.toString(); - } catch (IOException e) { + } catch (IOException ignored) { return toStringObject(); } } @@ -527,7 +527,7 @@ private String toStringObject() { w = addToStringField(sb, value, o -> !o.isEmpty(), "value", w); w = addToStringField(sb, attributes, o -> !o.isEmpty(), "attributes", w); w = addToStringField(sb, children, o -> !o.isEmpty(), "children", w); - w = addToStringField(sb, inputLocation, Objects::nonNull, "inputLocation", w); + addToStringField(sb, inputLocation, Objects::nonNull, "inputLocation", w); sb.append("]"); return sb.toString(); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java index be7dd9e86312..c1536c7db75d 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java @@ -200,7 +200,7 @@ private Settings readSettings( return Settings.newInstance(); } - settings = interpolate(settings, request, problems); + settings = interpolate(settings, request); settings = decrypt(settingsSource, settings, request, problems); settingsValidator.validate(settings, isProjectSettings, problems); @@ -228,8 +228,7 @@ private Settings readSettings( return settings; } - private Settings interpolate( - Settings settings, SettingsBuilderRequest request, ProblemCollector problems) { + private Settings interpolate(Settings settings, SettingsBuilderRequest request) { UnaryOperator src; if (request.getInterpolationSource().isPresent()) { src = request.getInterpolationSource().get(); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java index 1ac6aff66473..0ebefde6320b 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java @@ -138,7 +138,6 @@ public class DefaultModelBuilder implements ModelBuilder { private static final String FILE = "file"; private static final String IMPORT = "import"; private static final String PARENT = "parent"; - private static final String MODEL = "model"; private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelObjectPool.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelObjectPool.java index bec34fe0fa76..f4bbfe31926c 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelObjectPool.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelObjectPool.java @@ -18,10 +18,8 @@ */ package org.apache.maven.impl.model; -import java.util.Arrays; import java.util.Map; import java.util.Objects; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; @@ -33,6 +31,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static java.util.Arrays.stream; +import static org.apache.maven.api.Constants.MAVEN_MODEL_PROCESSOR_POOLED_TYPES; + /** * Default implementation of ModelObjectProcessor that provides memory optimization * through object pooling and interning. @@ -80,7 +81,11 @@ public T process(T object) { String simpleClassName = objectType.getSimpleName(); // Check if this object type should be pooled (read configuration dynamically) - if (!getPooledTypes(properties).contains(simpleClassName)) { + if (!stream(getProperty(MAVEN_MODEL_PROCESSOR_POOLED_TYPES, "Dependency") + .split(",")) + .map(String::trim) + .collect(Collectors.toSet()) + .contains(simpleClassName)) { return object; } @@ -95,17 +100,6 @@ private String getProperty(String name, String defaultValue) { return value instanceof String str ? str : defaultValue; } - /** - * Gets the set of object types that should be pooled. - */ - private Set getPooledTypes(Map properties) { - String pooledTypesProperty = getProperty(Constants.MAVEN_MODEL_PROCESSOR_POOLED_TYPES, "Dependency"); - return Arrays.stream(pooledTypesProperty.split(",")) - .map(String::trim) - .filter(s -> !s.isEmpty()) - .collect(Collectors.toSet()); - } - /** * Creates a cache for the specified object type with the appropriate reference type. */ diff --git a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java index c57eb6e9374a..cbca7b23b0dc 100644 --- a/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java +++ b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java @@ -295,7 +295,7 @@ public String toString() { StringWriter writer = new StringWriter(); XmlService.write(this, writer); return writer.toString(); - } catch (IOException e) { + } catch (IOException ignored) { return toStringObject(); } } @@ -310,7 +310,7 @@ public String toStringObject() { w = addToStringField(sb, value, o -> !o.isEmpty(), "value", w); w = addToStringField(sb, attributes, o -> !o.isEmpty(), "attributes", w); w = addToStringField(sb, children, o -> !o.isEmpty(), "children", w); - w = addToStringField(sb, location, Objects::nonNull, "location", w); + addToStringField(sb, location, Objects::nonNull, "location", w); sb.append("]"); return sb.toString(); }