Skip to content

Commit 1e90c4d

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

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
@@ -399,4 +399,41 @@ public void testSupports() {
399399
assertThat(new TransportVersion(null, 100001000, null).supports(test4), is(true));
400400
assertThat(new TransportVersion(null, 100001001, null).supports(test4), is(true));
401401
}
402+
403+
public void testComment() {
404+
byte[] data1 = ("#comment" + System.lineSeparator() + "1000000").getBytes(StandardCharsets.UTF_8);
405+
TransportVersion test1 = TransportVersion.fromBufferedReader(
406+
"<test>",
407+
"testSupports3",
408+
false,
409+
true,
410+
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data1), StandardCharsets.UTF_8)),
411+
5000000
412+
);
413+
assertThat(new TransportVersion(null, 1000000, null).supports(test1), is(true));
414+
415+
byte[] data2 = (" # comment" + System.lineSeparator() + "1000000").getBytes(StandardCharsets.UTF_8);
416+
TransportVersion test2 = TransportVersion.fromBufferedReader(
417+
"<test>",
418+
"testSupports3",
419+
false,
420+
true,
421+
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data2), StandardCharsets.UTF_8)),
422+
5000000
423+
);
424+
assertThat(new TransportVersion(null, 1000000, null).supports(test2), is(true));
425+
426+
byte[] data3 = ("#comment" + System.lineSeparator() + "# comment3" + System.lineSeparator() + "1000000").getBytes(
427+
StandardCharsets.UTF_8
428+
);
429+
TransportVersion test3 = TransportVersion.fromBufferedReader(
430+
"<test>",
431+
"testSupports3",
432+
false,
433+
true,
434+
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data3), StandardCharsets.UTF_8)),
435+
5000000
436+
);
437+
assertThat(new TransportVersion(null, 1000000, null).supports(test3), is(true));
438+
}
402439
}

0 commit comments

Comments
 (0)