Skip to content

[9.1] Add ability to comment in transport version files (#134329) #134336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
Merged

[9.1] Add ability to comment in transport version files (#134329) #134336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion server/src/main/java/org/elasticsearch/TransportVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ public static TransportVersion fromBufferedReader(
Integer upperBound
) {
try {
String line = bufferedReader.readLine();
String line;
do {
line = bufferedReader.readLine();
} while (line.replaceAll("\\s+", "").startsWith("#"));
String[] parts = line.replaceAll("\\s+", "").split(",");
String check;
while ((check = bufferedReader.readLine()) != null) {
Expand Down
37 changes: 37 additions & 0 deletions server/src/test/java/org/elasticsearch/TransportVersionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,4 +354,41 @@ public void testSupports() {
assertThat(new TransportVersion(null, 100001000, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 100001001, null).supports(test4), is(true));
}

public void testComment() {
byte[] data1 = ("#comment" + System.lineSeparator() + "1000000").getBytes(StandardCharsets.UTF_8);
TransportVersion test1 = TransportVersion.fromBufferedReader(
"<test>",
"testSupports3",
false,
true,
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data1), StandardCharsets.UTF_8)),
5000000
);
assertThat(new TransportVersion(null, 1000000, null).supports(test1), is(true));

byte[] data2 = (" # comment" + System.lineSeparator() + "1000000").getBytes(StandardCharsets.UTF_8);
TransportVersion test2 = TransportVersion.fromBufferedReader(
"<test>",
"testSupports3",
false,
true,
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data2), StandardCharsets.UTF_8)),
5000000
);
assertThat(new TransportVersion(null, 1000000, null).supports(test2), is(true));

byte[] data3 = ("#comment" + System.lineSeparator() + "# comment3" + System.lineSeparator() + "1000000").getBytes(
StandardCharsets.UTF_8
);
TransportVersion test3 = TransportVersion.fromBufferedReader(
"<test>",
"testSupports3",
false,
true,
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data3), StandardCharsets.UTF_8)),
5000000
);
assertThat(new TransportVersion(null, 1000000, null).supports(test3), is(true));
}
}