Skip to content

Commit 0c45219

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent a7ab20d commit 0c45219

File tree

5 files changed

+88
-97
lines changed

5 files changed

+88
-97
lines changed

‎server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -950,8 +950,13 @@ private MetadataDiff(StreamInput in) throws IOException {
950950
RESERVED_DIFF_VALUE_READER
951951
);
952952

953-
singleProject = new ProjectMetadata.ProjectMetadataDiff(indices, templates, projectCustoms,
954-
DiffableUtils.emptyDiff(), Settings.EMPTY_DIFF);
953+
singleProject = new ProjectMetadata.ProjectMetadataDiff(
954+
indices,
955+
templates,
956+
projectCustoms,
957+
DiffableUtils.emptyDiff(),
958+
Settings.EMPTY_DIFF
959+
);
955960
multiProject = null;
956961
} else {
957962
fromNodeBeforeMultiProjectsSupport = false;

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,8 @@ public ProjectMetadata withLifecycleState(Index index, LifecycleExecutionState l
226226
indicesLookup,
227227
mappingsByHash,
228228
settings,
229-
oldestIndexVersion);
229+
oldestIndexVersion
230+
);
230231
}
231232

232233
public ProjectMetadata withIndexSettingsUpdates(Map<Index, Settings> updates) {
@@ -259,7 +260,8 @@ public ProjectMetadata withIndexSettingsUpdates(Map<Index, Settings> updates) {
259260
indicesLookup,
260261
mappingsByHash,
261262
settings,
262-
oldestIndexVersion);
263+
oldestIndexVersion
264+
);
263265
}
264266

265267
/**
@@ -293,7 +295,8 @@ public ProjectMetadata withAllocationAndTermUpdatesOnly(Map<String, IndexMetadat
293295
indicesLookup,
294296
mappingsByHash,
295297
settings,
296-
oldestIndexVersion);
298+
oldestIndexVersion
299+
);
297300
}
298301

299302
/**
@@ -381,7 +384,8 @@ public ProjectMetadata withAddedIndex(IndexMetadata index) {
381384
null,
382385
updatedMappingsByHash,
383386
settings,
384-
IndexVersion.min(index.getCompatibilityVersion(), oldestIndexVersion));
387+
IndexVersion.min(index.getCompatibilityVersion(), oldestIndexVersion)
388+
);
385389
}
386390

387391
private ImmutableOpenMap<String, Set<Index>> aliasesAfterAddingIndex(IndexMetadata index, Map<String, AliasMetadata> aliases) {
@@ -1704,7 +1708,8 @@ public ProjectMetadata build(boolean skipNameCollisionChecks) {
17041708
indicesLookup,
17051709
Collections.unmodifiableMap(mappingsByHash),
17061710
settings,
1707-
IndexVersion.fromId(oldestIndexVersionId));
1711+
IndexVersion.fromId(oldestIndexVersionId)
1712+
);
17081713
}
17091714

17101715
static void ensureNoNameCollisions(
@@ -2180,9 +2185,7 @@ public Iterator<? extends ToXContent> toXContentChunked(ToXContent.Params p) {
21802185
multiProject
21812186
? ChunkedToXContentHelper.object("reserved_state", reservedStateMetadata().values().iterator())
21822187
: Collections.emptyIterator(),
2183-
multiProject
2184-
? ChunkedToXContentHelper.object("settings", Iterators.single(settings))
2185-
: Collections.emptyIterator()
2188+
multiProject ? ChunkedToXContentHelper.object("settings", Iterators.single(settings)) : Collections.emptyIterator()
21862189
);
21872190
}
21882191

@@ -2367,8 +2370,11 @@ public void writeTo(StreamOutput out) throws IOException {
23672370

23682371
@Override
23692372
public ProjectMetadata apply(ProjectMetadata part) {
2370-
if (indices.isEmpty() && templates.isEmpty() && customs.isEmpty()
2371-
&& reservedStateMetadata.isEmpty() && settingsDiff == Settings.EMPTY_DIFF) {
2373+
if (indices.isEmpty()
2374+
&& templates.isEmpty()
2375+
&& customs.isEmpty()
2376+
&& reservedStateMetadata.isEmpty()
2377+
&& settingsDiff == Settings.EMPTY_DIFF) {
23722378
// nothing to do
23732379
return part;
23742380
}

‎server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ public class ClusterService extends AbstractLifecycleComponent {
5959

6060
private final String nodeName;
6161

62-
public ClusterService(Settings settings, ClusterSettings clusterSettings,
63-
ThreadPool threadPool, TaskManager taskManager) {
62+
public ClusterService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool, TaskManager taskManager) {
6463
this(
6564
settings,
6665
clusterSettings,
@@ -70,12 +69,18 @@ public ClusterService(Settings settings, ClusterSettings clusterSettings,
7069
);
7170
}
7271

73-
public ClusterService(Settings settings, ClusterSettings clusterSettings, ProjectScopedSettings projectScopedSettings,
74-
ThreadPool threadPool, TaskManager taskManager) {
72+
public ClusterService(
73+
Settings settings,
74+
ClusterSettings clusterSettings,
75+
ProjectScopedSettings projectScopedSettings,
76+
ThreadPool threadPool,
77+
TaskManager taskManager
78+
) {
7579
this(
7680
settings,
7781
clusterSettings,
78-
projectScopedSettings, new MasterService(settings, clusterSettings, threadPool, taskManager),
82+
projectScopedSettings,
83+
new MasterService(settings, clusterSettings, threadPool, taskManager),
7984
new ClusterApplierService(Node.NODE_NAME_SETTING.get(settings), settings, clusterSettings, threadPool)
8085
);
8186
}
@@ -86,13 +91,7 @@ public ClusterService(
8691
MasterService masterService,
8792
ClusterApplierService clusterApplierService
8893
) {
89-
this(
90-
settings,
91-
clusterSettings,
92-
new ProjectScopedSettings(settings, Collections.emptySet()),
93-
masterService,
94-
clusterApplierService
95-
);
94+
this(settings, clusterSettings, new ProjectScopedSettings(settings, Collections.emptySet()), masterService, clusterApplierService);
9695
}
9796

9897
public ClusterService(

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,18 @@ public synchronized ProjectMetadata updateProjectSettings(
131131
final Settings settingsToApply,
132132
final Logger logger
133133
) {
134-
final Tuple<Settings, Settings> partitionedSettings = partitionKnownAndValidSettings(
135-
projectMetadata.settings(),
136-
"project",
137-
logger
138-
);
134+
final Tuple<Settings, Settings> partitionedSettings = partitionKnownAndValidSettings(projectMetadata.settings(), "project", logger);
139135
final Settings knownAndValidPersistentSettings = partitionedSettings.v1();
140136
final Settings unknownOrInvalidSettings = partitionedSettings.v2();
141137
Settings.Builder builder = Settings.builder().put(knownAndValidPersistentSettings);
142138

143139
// TODO: apply only dynamic?
144-
boolean changed = scopedSettings.updateSettings(settingsToApply, builder, persistentUpdates,
145-
"project[" + projectMetadata.id() + "]");
140+
boolean changed = scopedSettings.updateSettings(
141+
settingsToApply,
142+
builder,
143+
persistentUpdates,
144+
"project[" + projectMetadata.id() + "]"
145+
);
146146
if (changed == false) {
147147
return projectMetadata;
148148
}

‎server/src/test/java/org/elasticsearch/common/settings/ProjectSettingsUpdaterTests.java‎

Lines changed: 47 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
*/
99
package org.elasticsearch.common.settings;
1010

11-
import org.elasticsearch.cluster.ClusterName;
12-
import org.elasticsearch.cluster.ClusterState;
13-
import org.elasticsearch.cluster.metadata.Metadata;
1411
import org.elasticsearch.cluster.metadata.ProjectId;
1512
import org.elasticsearch.cluster.metadata.ProjectMetadata;
16-
import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator;
1713
import org.elasticsearch.common.settings.Setting.Property;
1814
import org.elasticsearch.test.ESTestCase;
1915

@@ -55,9 +51,7 @@ public class ProjectSettingsUpdaterTests extends ESTestCase {
5551

5652
private static ProjectMetadata projectWithSettings(Settings settings) {
5753
ProjectId projectId = randomUniqueProjectId();
58-
return ProjectMetadata.builder(projectId)
59-
.settings(settings)
60-
.build();
54+
return ProjectMetadata.builder(projectId).settings(settings).build();
6155
}
6256

6357
public void testUpdateSetting() {
@@ -67,10 +61,9 @@ public void testUpdateSetting() {
6761
projectScopedSettings.addSettingsUpdateConsumer(SETTING_A, valueA::set);
6862
projectScopedSettings.addSettingsUpdateConsumer(SETTING_B, valueB::set);
6963
SettingsUpdater updater = new SettingsUpdater(projectScopedSettings);
70-
ProjectMetadata projectMetadata = projectWithSettings(Settings.builder()
71-
.put(SETTING_A.getKey(), 1.5)
72-
.put(SETTING_B.getKey(), 2.5)
73-
.build());
64+
ProjectMetadata projectMetadata = projectWithSettings(
65+
Settings.builder().put(SETTING_A.getKey(), 1.5).put(SETTING_B.getKey(), 2.5).build()
66+
);
7467
ProjectMetadata updatedProjectMetadata = updater.updateProjectSettings(
7568
projectMetadata,
7669
Settings.builder().put(SETTING_A.getKey(), 0.5).build(),
@@ -80,11 +73,7 @@ public void testUpdateSetting() {
8073
assertEquals(SETTING_A.get(updatedProjectMetadata.settings()), 0.4, 0.1);
8174
assertEquals(SETTING_B.get(updatedProjectMetadata.settings()), 2.5, 0.1);
8275

83-
updatedProjectMetadata = updater.updateProjectSettings(
84-
projectMetadata,
85-
Settings.builder().putNull("project.*").build(),
86-
logger
87-
);
76+
updatedProjectMetadata = updater.updateProjectSettings(projectMetadata, Settings.builder().putNull("project.*").build(), logger);
8877
assertEquals(SETTING_A.get(updatedProjectMetadata.settings()), 0.55, 0.1);
8978
assertEquals(SETTING_B.get(updatedProjectMetadata.settings()), 0.1, 0.1);
9079

@@ -99,18 +88,14 @@ public void testAllOrNothing() {
9988
projectScopedSettings.addSettingsUpdateConsumer(SETTING_A, valueA::set);
10089
projectScopedSettings.addSettingsUpdateConsumer(SETTING_B, valueB::set);
10190
SettingsUpdater updater = new SettingsUpdater(projectScopedSettings);
102-
ProjectMetadata projectMetadata = projectWithSettings(Settings.builder()
103-
.put(SETTING_A.getKey(), 1.5)
104-
.put(SETTING_B.getKey(), 2.5)
105-
.build());
91+
ProjectMetadata projectMetadata = projectWithSettings(
92+
Settings.builder().put(SETTING_A.getKey(), 1.5).put(SETTING_B.getKey(), 2.5).build()
93+
);
10694

10795
try {
10896
updater.updateProjectSettings(
10997
projectMetadata,
110-
Settings.builder()
111-
.put(SETTING_A.getKey(), "not a float")
112-
.put(SETTING_B.getKey(), 1.0f)
113-
.build(),
98+
Settings.builder().put(SETTING_A.getKey(), "not a float").put(SETTING_B.getKey(), 1.0f).build(),
11499
logger
115100
);
116101
fail("all or nothing");
@@ -154,8 +139,12 @@ public void testUpdateWithUnknownAndSettings() {
154139
final int numberOfDynamicSettings = randomIntBetween(1, 8);
155140
final List<Setting<String>> dynamicSettings = new ArrayList<>(numberOfDynamicSettings);
156141
for (int i = 0; i < numberOfDynamicSettings; i++) {
157-
final Setting<String> dynamicSetting = Setting.simpleString("dynamic.setting" + i,
158-
Property.Dynamic, Property.NodeScope, Property.ProjectScope);
142+
final Setting<String> dynamicSetting = Setting.simpleString(
143+
"dynamic.setting" + i,
144+
Property.Dynamic,
145+
Property.NodeScope,
146+
Property.ProjectScope
147+
);
159148
dynamicSettings.add(dynamicSetting);
160149
}
161150

@@ -203,27 +192,17 @@ public void testUpdateWithUnknownAndSettings() {
203192
}
204193
}
205194

206-
final ProjectMetadata afterUpdate = settingsUpdater.updateProjectSettings(
207-
projectMetadata,
208-
toApply.build(),
209-
logger
210-
);
195+
final ProjectMetadata afterUpdate = settingsUpdater.updateProjectSettings(projectMetadata, toApply.build(), logger);
211196

212197
// the invalid settings should be archived and not present in non-archived form
213198
for (final Setting<String> invalidSetting : invalidSettings) {
214-
assertThat(
215-
afterUpdate.settings().keySet(),
216-
hasItem(ARCHIVED_SETTINGS_PREFIX + invalidSetting.getKey())
217-
);
199+
assertThat(afterUpdate.settings().keySet(), hasItem(ARCHIVED_SETTINGS_PREFIX + invalidSetting.getKey()));
218200
assertThat(afterUpdate.settings().keySet(), not(hasItem(invalidSetting.getKey())));
219201
}
220202

221203
// the unknown settings should be archived and not present in non-archived form
222204
for (final Setting<String> unknownSetting : unknownSettings) {
223-
assertThat(
224-
afterUpdate.settings().keySet(),
225-
hasItem(ARCHIVED_SETTINGS_PREFIX + unknownSetting.getKey())
226-
);
205+
assertThat(afterUpdate.settings().keySet(), hasItem(ARCHIVED_SETTINGS_PREFIX + unknownSetting.getKey()));
227206
assertThat(afterUpdate.settings().keySet(), not(hasItem(unknownSetting.getKey())));
228207
}
229208

@@ -235,10 +214,7 @@ public void testUpdateWithUnknownAndSettings() {
235214
} else {
236215
if (existingSettings.keys().contains(dynamicSetting.getKey())) {
237216
assertThat(afterUpdate.settings().keySet(), hasItem(dynamicSetting.getKey()));
238-
assertThat(
239-
afterUpdate.settings().get(dynamicSetting.getKey()),
240-
equalTo("existing_value")
241-
);
217+
assertThat(afterUpdate.settings().get(dynamicSetting.getKey()), equalTo("existing_value"));
242218
} else {
243219
assertThat(afterUpdate.settings().keySet(), not(hasItem(dynamicSetting.getKey())));
244220
}
@@ -288,35 +264,22 @@ public void testRemovingArchivedSettingsDoesNotRemoveNonArchivedInvalidOrUnknown
288264

289265
final Settings.Builder toApply = Settings.builder().put("archived.*", (String) null);
290266

291-
final ProjectMetadata afterUpdate = settingsUpdater.updateProjectSettings(
292-
projectMetadata,
293-
toApply.build(),
294-
logger
295-
);
267+
final ProjectMetadata afterUpdate = settingsUpdater.updateProjectSettings(projectMetadata, toApply.build(), logger);
296268

297269
// existing archived settings are removed
298270
for (final Setting<String> archivedSetting : archivedSettings) {
299-
assertThat(
300-
afterUpdate.settings().keySet(),
301-
not(hasItem(ARCHIVED_SETTINGS_PREFIX + archivedSetting.getKey()))
302-
);
271+
assertThat(afterUpdate.settings().keySet(), not(hasItem(ARCHIVED_SETTINGS_PREFIX + archivedSetting.getKey())));
303272
}
304273

305274
// the invalid settings should be archived and not present in non-archived form
306275
for (final Setting<String> invalidSetting : invalidSettings) {
307-
assertThat(
308-
afterUpdate.settings().keySet(),
309-
hasItem(ARCHIVED_SETTINGS_PREFIX + invalidSetting.getKey())
310-
);
276+
assertThat(afterUpdate.settings().keySet(), hasItem(ARCHIVED_SETTINGS_PREFIX + invalidSetting.getKey()));
311277
assertThat(afterUpdate.settings().keySet(), not(hasItem(invalidSetting.getKey())));
312278
}
313279

314280
// the unknown settings should be archived and not present in non-archived form
315281
for (final Setting<String> unknownSetting : unknownSettings) {
316-
assertThat(
317-
afterUpdate.settings().keySet(),
318-
hasItem(ARCHIVED_SETTINGS_PREFIX + unknownSetting.getKey())
319-
);
282+
assertThat(afterUpdate.settings().keySet(), hasItem(ARCHIVED_SETTINGS_PREFIX + unknownSetting.getKey()));
320283
assertThat(afterUpdate.settings().keySet(), not(hasItem(unknownSetting.getKey())));
321284
}
322285
}
@@ -424,23 +387,41 @@ public Iterator<Setting<?>> settings() {
424387
);
425388

426389
public void testUpdateOfValidationDependentSettings() {
427-
final ProjectScopedSettings projectScopedSettings = new ProjectScopedSettings(Settings.EMPTY,
428-
new HashSet<>(asList(SETTING_FOO_LOW, SETTING_FOO_HIGH)));
390+
final ProjectScopedSettings projectScopedSettings = new ProjectScopedSettings(
391+
Settings.EMPTY,
392+
new HashSet<>(asList(SETTING_FOO_LOW, SETTING_FOO_HIGH))
393+
);
429394
final SettingsUpdater updater = new SettingsUpdater(projectScopedSettings);
430395
ProjectMetadata projectMetadata = projectWithSettings(Settings.EMPTY);
431396

432-
projectMetadata = updater.updateProjectSettings(projectMetadata, Settings.builder().put(SETTING_FOO_LOW.getKey(), 20).build(), logger);
397+
projectMetadata = updater.updateProjectSettings(
398+
projectMetadata,
399+
Settings.builder().put(SETTING_FOO_LOW.getKey(), 20).build(),
400+
logger
401+
);
433402
assertThat(projectMetadata.settings().get(SETTING_FOO_LOW.getKey()), equalTo("20"));
434403

435-
projectMetadata = updater.updateProjectSettings(projectMetadata, Settings.builder().put(SETTING_FOO_HIGH.getKey(), 40).build(), logger);
404+
projectMetadata = updater.updateProjectSettings(
405+
projectMetadata,
406+
Settings.builder().put(SETTING_FOO_HIGH.getKey(), 40).build(),
407+
logger
408+
);
436409
assertThat(projectMetadata.settings().get(SETTING_FOO_LOW.getKey()), equalTo("20"));
437410
assertThat(projectMetadata.settings().get(SETTING_FOO_HIGH.getKey()), equalTo("40"));
438411

439-
projectMetadata = updater.updateProjectSettings(projectMetadata, Settings.builder().put(SETTING_FOO_LOW.getKey(), 5).build(), logger);
412+
projectMetadata = updater.updateProjectSettings(
413+
projectMetadata,
414+
Settings.builder().put(SETTING_FOO_LOW.getKey(), 5).build(),
415+
logger
416+
);
440417
assertThat(projectMetadata.settings().get(SETTING_FOO_LOW.getKey()), equalTo("5"));
441418
assertThat(projectMetadata.settings().get(SETTING_FOO_HIGH.getKey()), equalTo("40"));
442419

443-
projectMetadata = updater.updateProjectSettings(projectMetadata, Settings.builder().put(SETTING_FOO_HIGH.getKey(), 8).build(), logger);
420+
projectMetadata = updater.updateProjectSettings(
421+
projectMetadata,
422+
Settings.builder().put(SETTING_FOO_HIGH.getKey(), 8).build(),
423+
logger
424+
);
444425
assertThat(projectMetadata.settings().get(SETTING_FOO_LOW.getKey()), equalTo("5"));
445426
assertThat(projectMetadata.settings().get(SETTING_FOO_HIGH.getKey()), equalTo("8"));
446427

0 commit comments

Comments
 (0)