From d4f5e3b4ac85f9794e15746a9647bc9a88ee749b Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Thu, 15 May 2025 21:01:04 +0200 Subject: [PATCH 1/2] Parameter 'request' is never used --- .../maven/settings/building/DefaultSettingsBuilder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java index 051b8f44722d..9788207c37e6 100644 --- a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java +++ b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java @@ -92,10 +92,10 @@ public SettingsBuildingResult build(SettingsBuildingRequest request) throws Sett Source globalSettingsSource = getSettingsSource(request.getGlobalSettingsFile(), request.getGlobalSettingsSource()); - Settings globalSettings = readSettings(globalSettingsSource, request, problems); + Settings globalSettings = readSettings(globalSettingsSource, problems); Source userSettingsSource = getSettingsSource(request.getUserSettingsFile(), request.getUserSettingsSource()); - Settings userSettings = readSettings(userSettingsSource, request, problems); + Settings userSettings = readSettings(userSettingsSource, problems); settingsMerger.merge(userSettings, globalSettings, TrackableBase.GLOBAL_LEVEL); @@ -140,8 +140,7 @@ private Source getSettingsSource(File settingsFile, Source settingsSource) { return null; } - private Settings readSettings( - Source settingsSource, SettingsBuildingRequest request, DefaultSettingsProblemCollector problems) { + private Settings readSettings(Source settingsSource, DefaultSettingsProblemCollector problems) { if (settingsSource == null) { return new Settings(); } From bd5190d86093dca757c4deea5f354ce5e98f8728 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Thu, 15 May 2025 21:01:59 +0200 Subject: [PATCH 2/2] make fields of DefaultSettingsBuilder final --- .../building/DefaultSettingsBuilder.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java index 9788207c37e6..9b5146522516 100644 --- a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java +++ b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java @@ -55,11 +55,11 @@ @Deprecated(since = "4.0.0") public class DefaultSettingsBuilder implements SettingsBuilder { - private SettingsReader settingsReader; + private final SettingsReader settingsReader; - private SettingsWriter settingsWriter; + private final SettingsWriter settingsWriter; - private SettingsValidator settingsValidator; + private final SettingsValidator settingsValidator; private final MavenSettingsMerger settingsMerger = new MavenSettingsMerger(); @@ -71,21 +71,6 @@ public DefaultSettingsBuilder( this.settingsValidator = settingsValidator; } - public DefaultSettingsBuilder setSettingsReader(SettingsReader settingsReader) { - this.settingsReader = settingsReader; - return this; - } - - public DefaultSettingsBuilder setSettingsWriter(SettingsWriter settingsWriter) { - this.settingsWriter = settingsWriter; - return this; - } - - public DefaultSettingsBuilder setSettingsValidator(SettingsValidator settingsValidator) { - this.settingsValidator = settingsValidator; - return this; - } - @Override public SettingsBuildingResult build(SettingsBuildingRequest request) throws SettingsBuildingException { DefaultSettingsProblemCollector problems = new DefaultSettingsProblemCollector(null);