Skip to content

Commit 0b7fe68

Browse files
authored
Make transport version comments parsable (#134733) (#134838)
This adds the ability to filter comments from transport version internal state files during parsing in gradle tasks.
1 parent 843f7ef commit 0b7fe68

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionDefinition.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,19 @@ public static TransportVersionDefinition fromString(Path file, String contents)
2020
String name = filename.substring(0, filename.length() - 4);
2121
List<TransportVersionId> ids = new ArrayList<>();
2222

23+
String idsLine = null;
2324
if (contents.isEmpty() == false) {
24-
for (String rawId : contents.split(",")) {
25+
String[] lines = contents.split(System.lineSeparator());
26+
for (String line : lines) {
27+
line = line.replaceAll("\\s+", "");
28+
if (line.startsWith("#") == false) {
29+
idsLine = line;
30+
break;
31+
}
32+
}
33+
}
34+
if (idsLine != null) {
35+
for (String rawId : idsLine.split(",")) {
2536
try {
2637
ids.add(TransportVersionId.fromString(rawId));
2738
} catch (NumberFormatException e) {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionUpperBound.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@ public static TransportVersionUpperBound fromString(Path file, String contents)
2323
int slashIndex = filename.lastIndexOf('/');
2424
String branch = filename.substring(slashIndex == -1 ? 0 : (slashIndex + 1), filename.length() - 4);
2525

26-
String[] parts = contents.split(",");
26+
String idsLine = null;
27+
String[] lines = contents.split(System.lineSeparator());
28+
for (String line : lines) {
29+
line = line.replaceAll("\\s+", "");
30+
if (line.startsWith("#") == false) {
31+
idsLine = line;
32+
break;
33+
}
34+
}
35+
String[] parts = idsLine.split(",");
2736
if (parts.length != 2) {
2837
throw new IllegalStateException("Invalid transport version upper bound file [" + file + "]: " + contents);
2938
}

0 commit comments

Comments
 (0)