Skip to content

Commit 3c465d4

Browse files
committed
make definitions dir optional for validation
1 parent df07e02 commit 3c465d4

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ public void generateTransportVersionManifest() throws IOException {
3434
try (var writer = Files.newBufferedWriter(manifestFile)) {
3535
try (var stream = Files.list(constantsDir)) {
3636
for (String filename : stream.map(p -> p.getFileName().toString()).toList()) {
37+
if (filename.equals(manifestFile.getFileName().toString())) {
38+
// don't list self
39+
continue;
40+
}
3741
writer.write(filename + "\n");
3842
}
3943
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.gradle.api.tasks.CacheableTask;
1616
import org.gradle.api.tasks.InputDirectory;
1717
import org.gradle.api.tasks.InputFile;
18+
import org.gradle.api.tasks.Optional;
1819
import org.gradle.api.tasks.PathSensitive;
1920
import org.gradle.api.tasks.PathSensitivity;
2021
import org.gradle.api.tasks.TaskAction;
@@ -30,6 +31,7 @@
3031
public abstract class ValidateTransportVersionReferencesTask extends DefaultTask {
3132

3233
@InputDirectory
34+
@Optional
3335
@PathSensitive(PathSensitivity.RELATIVE)
3436
public abstract DirectoryProperty getDefinitionsDirectory();
3537

@@ -39,11 +41,11 @@ public abstract class ValidateTransportVersionReferencesTask extends DefaultTask
3941

4042
@TaskAction
4143
public void validateTransportVersions() throws IOException {
42-
Path constantsDir = getDefinitionsDirectory().getAsFile().get().toPath();
44+
Path definitionsDir = getDefinitionsDirectory().getAsFile().get().toPath();
4345
Path namesFile = getReferencesFile().get().getAsFile().toPath();
4446

4547
for (var tvReference : TransportVersionUtils.readReferencesFile(namesFile)) {
46-
Path constantFile = constantsDir.resolve(tvReference.name() + ".csv");
48+
Path constantFile = definitionsDir.resolve(tvReference.name() + ".csv");
4749
if (Files.exists(constantFile) == false) {
4850
throw new RuntimeException(
4951
"TransportVersion.fromName(\""

0 commit comments

Comments
 (0)