Skip to content

make fields of DefaultSettingsBuilder final #2339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

make fields of DefaultSettingsBuilder final #2339

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4f5e3b
Parameter 'request' is never used
May 15, 2025
bd5190d
make fields of DefaultSettingsBuilder final
May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 6 additions & 22 deletions ...ings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -71,31 +71,16 @@ 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);

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);

Expand Down Expand Up @@ -140,8 +125,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();
}
Expand Down