Skip to content

Commit f602b15

Browse files
committed
allow changing resource root instead of manifest file
1 parent fc8e56f commit f602b15

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ static Directory getResourcesDirectory(Project project) {
5050
if (projectName == null) {
5151
projectName = ":server";
5252
}
53+
var resourceRoot = project.findProperty("org.elasticsearch.transport.resourceRoot");
54+
if (resourceRoot == null) {
55+
resourceRoot = "transport";
56+
}
5357
Directory projectDir = project.project(projectName.toString()).getLayout().getProjectDirectory();
54-
return projectDir.dir("src/main/resources/transport");
58+
return projectDir.dir("src/main/resources/" + resourceRoot);
5559
}
5660
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,20 +165,20 @@ public static TransportVersion fromBufferedReader(
165165

166166
public static List<TransportVersion> collectFromResources(
167167
String component,
168+
String resourceRoot,
168169
Function<String, InputStream> resourceLoader,
169-
String manifestFileName,
170170
String latestFileName
171171
) {
172172
TransportVersion latest = parseFromBufferedReader(
173173
component,
174-
"/transport/latest/" + latestFileName,
174+
resourceRoot + "/latest/" + latestFileName,
175175
resourceLoader,
176176
(c, p, br) -> fromBufferedReader(c, p, true, false, br, Integer.MAX_VALUE)
177177
);
178178
if (latest != null) {
179179
List<String> versionRelativePaths = parseFromBufferedReader(
180180
component,
181-
"/transport/definitions/" + manifestFileName,
181+
resourceRoot + "/definitions/manifest.txt",
182182
resourceLoader,
183183
(c, p, br) -> br.lines().filter(line -> line.isBlank() == false).toList()
184184
);
@@ -187,7 +187,7 @@ public static List<TransportVersion> collectFromResources(
187187
for (String versionRelativePath : versionRelativePaths) {
188188
TransportVersion transportVersion = parseFromBufferedReader(
189189
component,
190-
"/transport/definitions/" + versionRelativePath,
190+
resourceRoot + "/definitions/" + versionRelativePath,
191191
resourceLoader,
192192
(c, p, br) -> fromBufferedReader(c, p, false, versionRelativePath.startsWith("named/"), br, latest.id())
193193
);
@@ -429,8 +429,8 @@ private static class VersionsHolder {
429429
List<TransportVersion> allVersions = new ArrayList<>(TransportVersions.DEFINED_VERSIONS);
430430
List<TransportVersion> streamVersions = collectFromResources(
431431
"<server>",
432+
"/transport",
432433
TransportVersion.class::getResourceAsStream,
433-
"manifest.txt",
434434
Version.CURRENT.major + "." + Version.CURRENT.minor + ".csv"
435435
);
436436
Map<String, TransportVersion> allVersionsByName = streamVersions.stream()

0 commit comments

Comments
 (0)