Skip to content

Commit 00f5e6f

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 4be022c commit 00f5e6f

File tree

3 files changed

+27
-25
lines changed

3 files changed

+27
-25
lines changed

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,17 +1359,18 @@ public void writeTo(StreamOutput out) throws IOException {
13591359
}
13601360

13611361
private static class ClusterStateDiff implements Diff<ClusterState> {
1362-
private static final DiffableUtils.ValueSerializer<ProjectId, Settings> SETTINGS_SERIALIZER = new DiffableUtils.DiffableValueSerializer<>() {
1363-
@Override
1364-
public Settings read(StreamInput in, ProjectId key) throws IOException {
1365-
return Settings.readSettingsFromStream(in);
1366-
}
1362+
private static final DiffableUtils.ValueSerializer<ProjectId, Settings> SETTINGS_SERIALIZER =
1363+
new DiffableUtils.DiffableValueSerializer<>() {
1364+
@Override
1365+
public Settings read(StreamInput in, ProjectId key) throws IOException {
1366+
return Settings.readSettingsFromStream(in);
1367+
}
13671368

1368-
@Override
1369-
public Diff<Settings> readDiff(StreamInput in, ProjectId key) throws IOException {
1370-
return Settings.readSettingsDiffFromStream(in);
1371-
}
1372-
};
1369+
@Override
1370+
public Diff<Settings> readDiff(StreamInput in, ProjectId key) throws IOException {
1371+
return Settings.readSettingsDiffFromStream(in);
1372+
}
1373+
};
13731374

13741375
private final long toVersion;
13751376

@@ -1411,7 +1412,12 @@ public Diff<Settings> readDiff(StreamInput in, ProjectId key) throws IOException
14111412
metadata = after.metadata.diff(before.metadata);
14121413
blocks = after.blocks.diff(before.blocks);
14131414
customs = DiffableUtils.diff(before.customs, after.customs, DiffableUtils.getStringKeySerializer(), CUSTOM_VALUE_SERIALIZER);
1414-
projectsSettings = DiffableUtils.diff(before.projectsSettings, after.projectsSettings, ProjectId.PROJECT_ID_SERIALIZER, SETTINGS_SERIALIZER);
1415+
projectsSettings = DiffableUtils.diff(
1416+
before.projectsSettings,
1417+
after.projectsSettings,
1418+
ProjectId.PROJECT_ID_SERIALIZER,
1419+
SETTINGS_SERIALIZER
1420+
);
14151421
}
14161422

14171423
ClusterStateDiff(StreamInput in, DiscoveryNode localNode) throws IOException {

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -947,12 +947,7 @@ private MetadataDiff(StreamInput in) throws IOException {
947947
RESERVED_DIFF_VALUE_READER
948948
);
949949

950-
singleProject = new ProjectMetadata.ProjectMetadataDiff(
951-
indices,
952-
templates,
953-
projectCustoms,
954-
DiffableUtils.emptyDiff()
955-
);
950+
singleProject = new ProjectMetadata.ProjectMetadataDiff(indices, templates, projectCustoms, DiffableUtils.emptyDiff());
956951
multiProject = null;
957952
} else {
958953
fromNodeBeforeMultiProjectsSupport = false;

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2192,7 +2192,8 @@ public static ProjectMetadata readFrom(StreamInput in) throws IOException {
21922192
builder.put(ReservedStateMetadata.readFrom(in));
21932193
}
21942194

2195-
if (in.getTransportVersion().between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
2195+
if (in.getTransportVersion()
2196+
.between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
21962197
Settings.readSettingsFromStream(in);
21972198
}
21982199

@@ -2237,7 +2238,8 @@ public void writeTo(StreamOutput out) throws IOException {
22372238
VersionedNamedWriteable.writeVersionedWriteables(out, filteredCustoms);
22382239
out.writeCollection(reservedStateMetadata.values());
22392240

2240-
if (out.getTransportVersion().between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
2241+
if (out.getTransportVersion()
2242+
.between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
22412243
Settings.EMPTY.writeTo(out);
22422244
}
22432245
}
@@ -2304,7 +2306,8 @@ private ProjectMetadataDiff(ProjectMetadata before, ProjectMetadata after) {
23042306
DiffableUtils.getStringKeySerializer(),
23052307
RESERVED_DIFF_VALUE_READER
23062308
);
2307-
if (in.getTransportVersion().between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
2309+
if (in.getTransportVersion()
2310+
.between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
23082311
Settings.readSettingsDiffFromStream(in);
23092312
}
23102313
}
@@ -2331,17 +2334,15 @@ public void writeTo(StreamOutput out) throws IOException {
23312334
templates.writeTo(out);
23322335
customs.writeTo(out);
23332336
reservedStateMetadata.writeTo(out);
2334-
if (out.getTransportVersion().between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
2337+
if (out.getTransportVersion()
2338+
.between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
23352339
Settings.EMPTY_DIFF.writeTo(out);
23362340
}
23372341
}
23382342

23392343
@Override
23402344
public ProjectMetadata apply(ProjectMetadata part) {
2341-
if (indices.isEmpty()
2342-
&& templates.isEmpty()
2343-
&& customs.isEmpty()
2344-
&& reservedStateMetadata.isEmpty()) {
2345+
if (indices.isEmpty() && templates.isEmpty() && customs.isEmpty() && reservedStateMetadata.isEmpty()) {
23452346
// nothing to do
23462347
return part;
23472348
}

0 commit comments

Comments
 (0)