Skip to content

Commit 5ae871f

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

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
@@ -117,7 +117,10 @@ public static TransportVersion fromBufferedReader(
117117
Integer upperBound
118118
) {
119119
try {
120-
String line = bufferedReader.readLine();
120+
String line;
121+
do {
122+
line = bufferedReader.readLine();
123+
} while (line.replaceAll("\\s+", "").startsWith("#"));
121124
String[] parts = line.replaceAll("\\s+", "").split(",");
122125
String check;
123126
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
@@ -363,4 +363,41 @@ public void testSupports() {
363363
assertThat(new TransportVersion(null, 100001000, null).supports(test4), is(true));
364364
assertThat(new TransportVersion(null, 100001001, null).supports(test4), is(true));
365365
}
366+
367+
public void testComment() {
368+
byte[] data1 = ("#comment" + System.lineSeparator() + "1000000").getBytes(StandardCharsets.UTF_8);
369+
TransportVersion test1 = TransportVersion.fromBufferedReader(
370+
"<test>",
371+
"testSupports3",
372+
false,
373+
true,
374+
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data1), StandardCharsets.UTF_8)),
375+
5000000
376+
);
377+
assertThat(new TransportVersion(null, 1000000, null).supports(test1), is(true));
378+
379+
byte[] data2 = (" # comment" + System.lineSeparator() + "1000000").getBytes(StandardCharsets.UTF_8);
380+
TransportVersion test2 = TransportVersion.fromBufferedReader(
381+
"<test>",
382+
"testSupports3",
383+
false,
384+
true,
385+
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data2), StandardCharsets.UTF_8)),
386+
5000000
387+
);
388+
assertThat(new TransportVersion(null, 1000000, null).supports(test2), is(true));
389+
390+
byte[] data3 = ("#comment" + System.lineSeparator() + "# comment3" + System.lineSeparator() + "1000000").getBytes(
391+
StandardCharsets.UTF_8
392+
);
393+
TransportVersion test3 = TransportVersion.fromBufferedReader(
394+
"<test>",
395+
"testSupports3",
396+
false,
397+
true,
398+
new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data3), StandardCharsets.UTF_8)),
399+
5000000
400+
);
401+
assertThat(new TransportVersion(null, 1000000, null).supports(test3), is(true));
402+
}
366403
}

0 commit comments

Comments
 (0)