Skip to content

Commit 6088f4a

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 18d6a0c commit 6088f4a

File tree

10 files changed

+71
-44
lines changed

10 files changed

+71
-44
lines changed

‎server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComposableIndexTemplateAction.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ protected void masterOperation(
8888
) {
8989
ProjectId projectId = projectResolver.getProjectId();
9090
verifyIfUsingReservedComponentTemplates(request, state.metadata().reservedStateMetadata().values());
91-
verifyIfUsingReservedComponentTemplates(request, ProjectStateRegistry.get(state).reservedStateMetadata(projectResolver.getProjectId()).values());
91+
verifyIfUsingReservedComponentTemplates(
92+
request,
93+
ProjectStateRegistry.get(state).reservedStateMetadata(projectResolver.getProjectId()).values()
94+
);
9295
ComposableIndexTemplate indexTemplate = request.indexTemplate();
9396
indexTemplateService.putIndexTemplateV2(
9497
request.cause(),

‎server/src/main/java/org/elasticsearch/cluster/ClusterState.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,8 @@ public void writeTo(StreamOutput out) throws IOException {
13201320
out.writeLong(version);
13211321
out.writeString(stateUUID);
13221322
if (out.getTransportVersion().before(TransportVersions.MULTI_PROJECT)) {
1323-
Map<String, ReservedStateMetadata> singleProjectReservedState = ProjectStateRegistry.get(this).reservedStateMetadata(Metadata.DEFAULT_PROJECT_ID);
1323+
Map<String, ReservedStateMetadata> singleProjectReservedState = ProjectStateRegistry.get(this)
1324+
.reservedStateMetadata(Metadata.DEFAULT_PROJECT_ID);
13241325
metadata.writeTo(out, singleProjectReservedState);
13251326
} else {
13261327
metadata.writeTo(out);
@@ -1384,12 +1385,12 @@ private Diff<Metadata> getMetadataDiff(ClusterState before, ClusterState after)
13841385
final Diff<Metadata> metadata;
13851386
ProjectStateRegistry projectStateRegistry = ProjectStateRegistry.get(after);
13861387
if (projectStateRegistry.size() == 1 && projectStateRegistry.hasProject(Metadata.DEFAULT_PROJECT_ID)) {
1387-
Map<String, ReservedStateMetadata> reservedStateMetadataBefore = ProjectStateRegistry.get(before).reservedStateMetadata(DEFAULT_PROJECT_ID);
1388-
Map<String, ReservedStateMetadata> reservedStateMetadataAfter = projectStateRegistry.reservedStateMetadata(DEFAULT_PROJECT_ID);
1389-
DiffableUtils.MapDiff<
1390-
String,
1391-
ReservedStateMetadata,
1392-
Map<String, ReservedStateMetadata>> diff = DiffableUtils.diff(
1388+
Map<String, ReservedStateMetadata> reservedStateMetadataBefore = ProjectStateRegistry.get(before)
1389+
.reservedStateMetadata(DEFAULT_PROJECT_ID);
1390+
Map<String, ReservedStateMetadata> reservedStateMetadataAfter = projectStateRegistry.reservedStateMetadata(
1391+
DEFAULT_PROJECT_ID
1392+
);
1393+
DiffableUtils.MapDiff<String, ReservedStateMetadata, Map<String, ReservedStateMetadata>> diff = DiffableUtils.diff(
13931394
reservedStateMetadataBefore,
13941395
reservedStateMetadataAfter,
13951396
DiffableUtils.getStringKeySerializer()

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -709,8 +709,10 @@ public Diff<Metadata> diff(Metadata previousState) {
709709
return diff(previousState, DiffableUtils.emptyDiff());
710710
}
711711

712-
public Diff<Metadata> diff(Metadata previousState,
713-
MapDiff<String, ReservedStateMetadata, Map<String, ReservedStateMetadata>> singleProjectReservedStateMetadata) {
712+
public Diff<Metadata> diff(
713+
Metadata previousState,
714+
MapDiff<String, ReservedStateMetadata, Map<String, ReservedStateMetadata>> singleProjectReservedStateMetadata
715+
) {
714716
return new MetadataDiff(previousState, this, singleProjectReservedStateMetadata);
715717
}
716718

@@ -864,8 +866,11 @@ private static class MetadataDiff implements Diff<Metadata> {
864866
// This is used only when the node has a single project and needs to send the diff to an old node (wire BWC).
865867
private final MapDiff<String, ProjectCustom, ImmutableOpenMap<String, ProjectCustom>> combinedTasksDiff;
866868

867-
MetadataDiff(Metadata before, Metadata after,
868-
MapDiff<String, ReservedStateMetadata, Map<String, ReservedStateMetadata>> singleProjectReservedState) {
869+
MetadataDiff(
870+
Metadata before,
871+
Metadata after,
872+
MapDiff<String, ReservedStateMetadata, Map<String, ReservedStateMetadata>> singleProjectReservedState
873+
) {
869874
this.empty = before == after;
870875
this.fromNodeBeforeMultiProjectsSupport = false; // diff on this node, always after multi-projects, even when disabled
871876
clusterUUID = after.clusterUUID;

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2262,11 +2262,7 @@ private ProjectMetadataDiff(ProjectMetadata before, ProjectMetadata after) {
22622262
templates = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), TEMPLATES_DIFF_VALUE_READER);
22632263
customs = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), PROJECT_CUSTOM_VALUE_SERIALIZER);
22642264
if (in.getTransportVersion().before(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
2265-
DiffableUtils.readImmutableOpenMapDiff(
2266-
in,
2267-
DiffableUtils.getStringKeySerializer(),
2268-
RESERVED_DIFF_VALUE_READER
2269-
);
2265+
DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), RESERVED_DIFF_VALUE_READER);
22702266
}
22712267
if (in.getTransportVersion()
22722268
.between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {

‎server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ public ProjectStateRegistry(StreamInput in) throws IOException {
6969
projectsEntries = in.readMap(ProjectId::readFrom, Entry::readFrom);
7070
} else {
7171
Map<ProjectId, Settings> settingsMap = in.readMap(ProjectId::readFrom, Settings::readSettingsFromStream);
72-
projectsEntries = settingsMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
73-
e -> new Entry(e.getValue(), ImmutableOpenMap.of())));
72+
projectsEntries = settingsMap.entrySet()
73+
.stream()
74+
.collect(Collectors.toMap(Map.Entry::getKey, e -> new Entry(e.getValue(), ImmutableOpenMap.of())));
7475
}
7576
if (in.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
7677
projectsMarkedForDeletion = in.readCollectionAsImmutableSet(ProjectId::readFrom);
@@ -115,7 +116,7 @@ public Settings getProjectSettings(ProjectId projectId) {
115116
public Map<String, ReservedStateMetadata> reservedStateMetadata(ProjectId projectId) {
116117
return projectsEntries.getOrDefault(projectId, EMPTY_ENTRY).reservedStateMetadata;
117118
}
118-
119+
119120
public Set<ProjectId> getProjectsMarkedForDeletion() {
120121
return projectsMarkedForDeletion;
121122
}
@@ -362,11 +363,14 @@ public ProjectStateRegistry build() {
362363
}
363364
}
364365

365-
private record Entry(Settings settings,
366-
ImmutableOpenMap<String, ReservedStateMetadata> reservedStateMetadata) implements Writeable, Diffable<Entry> {
367-
Entry() {
366+
private record Entry(Settings settings, ImmutableOpenMap<String, ReservedStateMetadata> reservedStateMetadata)
367+
implements
368+
Writeable,
369+
Diffable<Entry> {
370+
371+
Entry() {
368372
this(Settings.EMPTY, ImmutableOpenMap.of());
369-
}
373+
}
370374

371375
public static Entry readFrom(StreamInput in) throws IOException {
372376
Settings settings = Settings.readSettingsFromStream(in);
@@ -419,17 +423,16 @@ public Diff<Entry> diff(Entry previousState) {
419423
return SimpleDiffable.empty();
420424
}
421425

422-
return new EntryDiff(settings.diff(previousState.settings), DiffableUtils.diff(
423-
previousState.reservedStateMetadata,
424-
reservedStateMetadata,
425-
DiffableUtils.getStringKeySerializer()
426-
));
426+
return new EntryDiff(
427+
settings.diff(previousState.settings),
428+
DiffableUtils.diff(previousState.reservedStateMetadata, reservedStateMetadata, DiffableUtils.getStringKeySerializer())
429+
);
427430
}
428431

429-
private record EntryDiff(Diff<Settings> settingsDiff, DiffableUtils.MapDiff<
430-
String,
431-
ReservedStateMetadata,
432-
ImmutableOpenMap<String, ReservedStateMetadata>> reservedStateMetadata) implements Diff<Entry> {
432+
private record EntryDiff(
433+
Diff<Settings> settingsDiff,
434+
DiffableUtils.MapDiff<String, ReservedStateMetadata, ImmutableOpenMap<String, ReservedStateMetadata>> reservedStateMetadata
435+
) implements Diff<Entry> {
433436

434437
public static EntryDiff readFrom(StreamInput in) throws IOException {
435438
Diff<Settings> settingsDiff = Settings.readSettingsDiffFromStream(in);

‎server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,12 @@ public Path watchedFile() {
131131
* @param mdBuilder the current metadata builder for the new cluster state
132132
* @param projectId the project associated with the restore
133133
*/
134-
public void handleSnapshotRestore(ClusterState clusterState, ClusterState.Builder builder, Metadata.Builder mdBuilder, ProjectId projectId) {
134+
public void handleSnapshotRestore(
135+
ClusterState clusterState,
136+
ClusterState.Builder builder,
137+
Metadata.Builder mdBuilder,
138+
ProjectId projectId
139+
) {
135140
assert clusterState.nodes().isLocalNodeElectedMaster();
136141

137142
ReservedStateMetadata fileSettingsMetadata = clusterState.metadata().reservedStateMetadata().get(NAMESPACE);

‎server/src/main/java/org/elasticsearch/reservedstate/service/ReservedProjectStateUpdateTask.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ protected ClusterState execute(ClusterState currentState) {
7878
);
7979
ProjectMetadata updatedProjectMetadata = updatedClusterState.getMetadata().getProject(projectId);
8080
return ClusterState.builder(currentState)
81-
.putCustom(ProjectStateRegistry.TYPE, ProjectStateRegistry.builder(updatedProjectStateRegistry).putReservedStateMetadata(projectId, result.v2()).build())
81+
.putCustom(
82+
ProjectStateRegistry.TYPE,
83+
ProjectStateRegistry.builder(updatedProjectStateRegistry).putReservedStateMetadata(projectId, result.v2()).build()
84+
)
8285
.putProjectMetadata(ProjectMetadata.builder(updatedProjectMetadata))
8386
.build();
8487
}

‎server/src/main/java/org/elasticsearch/reservedstate/service/ReservedStateErrorTask.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,10 @@ ClusterState execute(ClusterState currentState) {
101101
ReservedStateMetadata.Builder resBuilder = ReservedStateMetadata.builder(errorState.namespace(), reservedMetadata);
102102
resBuilder.errorMetadata(errorMetadata);
103103

104-
stateBuilder.putCustom(ProjectStateRegistry.TYPE, ProjectStateRegistry.builder(projectStateRegistry)
105-
.putReservedStateMetadata(projectId, resBuilder.build())
106-
.build());
104+
stateBuilder.putCustom(
105+
ProjectStateRegistry.TYPE,
106+
ProjectStateRegistry.builder(projectStateRegistry).putReservedStateMetadata(projectId, resBuilder.build()).build()
107+
);
107108
} else {
108109
Metadata.Builder metadataBuilder = Metadata.builder(currentState.metadata());
109110

‎server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,8 @@ public void testBlockUsingReservedComponentTemplates() throws Exception {
755755

756756
var updatedState = processJSON(action, prevState, settingsJSON);
757757

758-
ProjectStateRegistry withReservedState = ProjectStateRegistry.builder(updatedState.state()).putReservedStateMetadata(
758+
ProjectStateRegistry withReservedState = ProjectStateRegistry.builder(updatedState.state())
759+
.putReservedStateMetadata(
759760
projectId,
760761
ReservedStateMetadata.builder("test")
761762
.putHandler(new ReservedStateHandlerMetadata(ReservedComposableIndexTemplateAction.NAME, updatedState.keys()))
@@ -923,7 +924,8 @@ public void testTemplatesWithReservedPrefix() throws Exception {
923924
allOf(aMapWithSize(2), hasKey(reservedComposableIndexName(conflictingTemplateName)), hasKey(conflictingTemplateName))
924925
);
925926

926-
ProjectStateRegistry withReservedState = ProjectStateRegistry.builder(updatedState.state()).putReservedStateMetadata(
927+
ProjectStateRegistry withReservedState = ProjectStateRegistry.builder(updatedState.state())
928+
.putReservedStateMetadata(
927929
projectId,
928930
new ReservedStateMetadata.Builder("file_settings").putHandler(
929931
new ReservedStateHandlerMetadata(ReservedComposableIndexTemplateAction.NAME, updatedState.keys())

‎server/src/test/java/org/elasticsearch/reservedstate/service/ReservedClusterStateServiceTests.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,10 @@ public void testUpdateTaskDuplicateError() {
742742

743743
ClusterState.Builder builder = ClusterState.builder(new ClusterName("test"));
744744
if (projectId.isPresent()) {
745-
builder.putCustom(ProjectStateRegistry.TYPE, ProjectStateRegistry.builder().putReservedStateMetadata(projectId.get(), operatorMetadata).build());
745+
builder.putCustom(
746+
ProjectStateRegistry.TYPE,
747+
ProjectStateRegistry.builder().putReservedStateMetadata(projectId.get(), operatorMetadata).build()
748+
);
746749
} else {
747750
builder.metadata(Metadata.builder().put(operatorMetadata));
748751
}
@@ -853,10 +856,12 @@ public TransformState transform(Map<String, Object> source, TransformState prevS
853856
.putHandler(hmOne)
854857
.build();
855858

856-
857859
builder = ClusterState.builder(new ClusterName("test"));
858860
if (projectId.isPresent()) {
859-
builder.putCustom(ProjectStateRegistry.TYPE, ProjectStateRegistry.builder().putReservedStateMetadata(projectId.get(), opMetadata).build());
861+
builder.putCustom(
862+
ProjectStateRegistry.TYPE,
863+
ProjectStateRegistry.builder().putReservedStateMetadata(projectId.get(), opMetadata).build()
864+
);
860865
} else {
861866
builder.metadata(Metadata.builder().put(opMetadata));
862867
}
@@ -875,7 +880,10 @@ public void testCheckMetadataVersion() {
875880
Optional<ProjectId> projectId = randomBoolean() ? Optional.empty() : Optional.of(randomProjectIdOrDefault());
876881
ClusterState.Builder builder = ClusterState.builder(new ClusterName("test"));
877882
if (projectId.isPresent()) {
878-
builder.putCustom(ProjectStateRegistry.TYPE, ProjectStateRegistry.builder().putReservedStateMetadata(projectId.get(), operatorMetadata).build());
883+
builder.putCustom(
884+
ProjectStateRegistry.TYPE,
885+
ProjectStateRegistry.builder().putReservedStateMetadata(projectId.get(), operatorMetadata).build()
886+
);
879887
} else {
880888
builder.metadata(Metadata.builder().put(operatorMetadata));
881889
}

0 commit comments

Comments
 (0)