Skip to content

Commit e9f08e5

Browse files
authored
Add ability to comment in transport version files (#134329) (#134339)
Comments may be added to the beginning of transport version files by starting each comment line with the hash # character.
1 parent 2121465 commit e9f08e5

File tree

2 files changed

+41
-1
lines changed

2 files changed

+41
-1
lines changed

server/src/main/java/org/elasticsearch/TransportVersion.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,10 @@ public static TransportVersion fromBufferedReader(
114114
Integer upperBound
115115
) {
116116
try {
117-
String line = bufferedReader.readLine();
117+
String line;
118+
do {
119+
line = bufferedReader.readLine();
120+
} while (line.replaceAll("\\s+", "").startsWith("#"));
118121
String[] parts = line.replaceAll("\\s+", "").split(",");
119122
String check;
120123
while ((check = bufferedReader.readLine()) != null) {

server/src/test/java/org/elasticsearch/TransportVersionTests.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,4 +401,41 @@ public void testSupports() {
401401
assertThat(new TransportVersion(null, 100001000, null).supports(test4), is(true));
402402
assertThat(new TransportVersion(null, 100001001, null).supports(test4), is(true));
403403
}
404+
405+
public void testComment() {
406+
byte[] data1 = ("#comment" + System.lineSeparator() + "1000000").getBytes(StandardCharsets.UTF_8);
407+
TransportVersion test1 = TransportVersion.fromBufferedReader(
408+
"<test>",
409+
"testSupports3",
410+
false,
411+
true,
412+
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data1), StandardCharsets.UTF_8)),
413+
5000000
414+
);
415+
assertThat(new TransportVersion(null, 1000000, null).supports(test1), is(true));
416+
417+
byte[] data2 = (" # comment" + System.lineSeparator() + "1000000").getBytes(StandardCharsets.UTF_8);
418+
TransportVersion test2 = TransportVersion.fromBufferedReader(
419+
"<test>",
420+
"testSupports3",
421+
false,
422+
true,
423+
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data2), StandardCharsets.UTF_8)),
424+
5000000
425+
);
426+
assertThat(new TransportVersion(null, 1000000, null).supports(test2), is(true));
427+
428+
byte[] data3 = ("#comment" + System.lineSeparator() + "# comment3" + System.lineSeparator() + "1000000").getBytes(
429+
StandardCharsets.UTF_8
430+
);
431+
TransportVersion test3 = TransportVersion.fromBufferedReader(
432+
"<test>",
433+
"testSupports3",
434+
false,
435+
true,
436+
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data3), StandardCharsets.UTF_8)),
437+
5000000
438+
);
439+
assertThat(new TransportVersion(null, 1000000, null).supports(test3), is(true));
440+
}
404441
}

0 commit comments

Comments
 (0)