Skip to content
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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();
}
Expand Down