From 73c07dfba21dc9ffff80d67a67bddf0c15461ba9 Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Mon, 15 Sep 2025 09:37:18 -0700 Subject: [PATCH] Make transport version comments parsable --- .../transport/TransportVersionDefinition.java | 13 ++++++++++++- .../transport/TransportVersionUpperBound.java | 11 ++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionDefinition.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionDefinition.java index 65f4caeb95206..5a345c239bd7e 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionDefinition.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionDefinition.java @@ -20,8 +20,19 @@ public static TransportVersionDefinition fromString(Path file, String contents) String name = filename.substring(0, filename.length() - 4); List ids = new ArrayList<>(); + String idsLine = null; if (contents.isEmpty() == false) { - for (String rawId : contents.split(",")) { + String[] lines = contents.split(System.lineSeparator()); + for (String line : lines) { + line = line.replaceAll("\\s+", ""); + if (line.startsWith("#") == false) { + idsLine = line; + break; + } + } + } + if (idsLine != null) { + for (String rawId : idsLine.split(",")) { try { ids.add(TransportVersionId.fromString(rawId)); } catch (NumberFormatException e) { diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionUpperBound.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionUpperBound.java index d3b914647f0fa..af88aa646d790 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionUpperBound.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionUpperBound.java @@ -23,7 +23,16 @@ public static TransportVersionUpperBound fromString(Path file, String contents) int slashIndex = filename.lastIndexOf('/'); String branch = filename.substring(slashIndex == -1 ? 0 : (slashIndex + 1), filename.length() - 4); - String[] parts = contents.split(","); + String idsLine = null; + String[] lines = contents.split(System.lineSeparator()); + for (String line : lines) { + line = line.replaceAll("\\s+", ""); + if (line.startsWith("#") == false) { + idsLine = line; + break; + } + } + String[] parts = idsLine.split(","); if (parts.length != 2) { throw new IllegalStateException("Invalid transport version upper bound file [" + file + "]: " + contents); }