Skip to content

Commit d136933

Browse files
Change the order of fields in a serialised version for consistency
1 parent df3d4d6 commit d136933

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,8 @@ private record EntryDiff(Diff<Settings> settingsDiff, DiffableUtils.MapDiff<
422422
ImmutableOpenMap<String, ReservedStateMetadata>> reservedStateMetadata) implements Diff<Entry> {
423423

424424
public static EntryDiff readFrom(StreamInput in) throws IOException {
425+
Diff<Settings> settingsDiff = Settings.readSettingsDiffFromStream(in);
426+
425427
DiffableUtils.MapDiff<String, ReservedStateMetadata, ImmutableOpenMap<String, ReservedStateMetadata>> reservedStateMetadata;
426428
if (in.getTransportVersion().onOrAfter(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
427429
reservedStateMetadata = DiffableUtils.readImmutableOpenMapDiff(
@@ -432,7 +434,8 @@ public static EntryDiff readFrom(StreamInput in) throws IOException {
432434
} else {
433435
reservedStateMetadata = DiffableUtils.emptyDiff();
434436
}
435-
return new EntryDiff(Settings.readSettingsDiffFromStream(in), reservedStateMetadata);
437+
438+
return new EntryDiff(settingsDiff, reservedStateMetadata);
436439
}
437440

438441
@Override
@@ -442,10 +445,10 @@ public Entry apply(Entry part) {
442445

443446
@Override
444447
public void writeTo(StreamOutput out) throws IOException {
448+
out.writeWriteable(settingsDiff);
445449
if (out.getTransportVersion().onOrAfter(TransportVersions.PROJECT_RESERVED_STATE_MOVE_TO_REGISTRY)) {
446450
reservedStateMetadata.writeTo(out);
447451
}
448-
out.writeWriteable(settingsDiff);
449452
}
450453
}
451454
}

0 commit comments

Comments
 (0)