Skip to content

Commit 94b9fcd

Browse files
Address review comments
1 parent 0d60756 commit 94b9fcd

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/ProjectMetadata.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,11 +1539,7 @@ public Builder removeReservedState(ReservedStateMetadata metadata) {
15391539
return this;
15401540
}
15411541

1542-
public Settings settings() {
1543-
return this.settings;
1544-
}
1545-
1546-
public ProjectMetadata.Builder settings(Settings settings) {
1542+
public Builder settings(Settings settings) {
15471543
this.settings = settings;
15481544
return this;
15491545
}

server/src/main/java/org/elasticsearch/common/settings/SettingsUpdater.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ public synchronized ProjectMetadata updateProjectSettings(
150150
// validate that settings and their values are correct
151151
scopedSettings.validate(finalSettings, true);
152152

153-
ProjectMetadata.Builder result = ProjectMetadata.builder(projectMetadata)
154-
.settings(Settings.builder().put(finalSettings).put(unknownOrInvalidSettings).build());
153+
Settings resultSettings = Settings.builder().put(finalSettings).put(unknownOrInvalidSettings).build();
154+
ProjectMetadata.Builder result = ProjectMetadata.builder(projectMetadata).settings(resultSettings);
155155
// validate that SettingsUpdaters can be applied without errors
156-
scopedSettings.validateUpdate(result.settings());
156+
scopedSettings.validateUpdate(resultSettings);
157157

158158
return result.build();
159159
}

0 commit comments

Comments
 (0)