Skip to content

Commit d945947

Browse files
rjernstrjernst
committed
done
1 parent 3d30062 commit d945947

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/CollectTransportVersionNamesTask.java‎ renamed to ‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/CollectTransportVersionReferencesTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* provided directory, and then records the value of string literals passed as arguments. It then records each
4242
* string on a newline along with path and line number in the provided output file.
4343
*/
44-
public abstract class CollectTransportVersionNamesTask extends DefaultTask {
44+
public abstract class CollectTransportVersionReferencesTask extends DefaultTask {
4545
public static final String TRANSPORT_VERSION_SET_CLASS = "org/elasticsearch/TransportVersion";
4646
public static final String TRANSPORT_VERSION_SET_METHOD_NAME = "fromName";
4747
public static final String CLASS_EXTENSION = ".class";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222

2323
public abstract class GenerateTransportVersionManifestTask extends DefaultTask {
2424
@InputDirectory
25-
public abstract DirectoryProperty getConstantsDirectory();
25+
public abstract DirectoryProperty getDefinitionsDirectory();
2626

2727
@OutputFile
2828
public abstract RegularFileProperty getManifestFile();
2929

3030
@TaskAction
3131
public void generateTransportVersionManifest() throws IOException {
32-
Path constantsDir = getConstantsDirectory().get().getAsFile().toPath();
32+
Path constantsDir = getDefinitionsDirectory().get().getAsFile().toPath();
3333
Path manifestFile = getManifestFile().get().getAsFile().toPath();
3434
try (var writer = Files.newBufferedWriter(manifestFile)) {
3535
try (var stream = Files.list(constantsDir)) {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,25 @@ public void apply(Project project) {
4343
Configuration tvReferencesConfig = project.getConfigurations().detachedConfiguration(tvDependencies.toArray(new Dependency[0]));
4444
tvReferencesConfig.attributes(TransportVersionUtils::addTransportVersionReferencesAttribute);
4545

46+
var validateTask = project.getTasks()
47+
.register("validateTransportVersionConstants", ValidateTransportVersionDefinitionsTask.class, t -> {
48+
t.setGroup("Transport Versions");
49+
t.setDescription("Validates that all defined TransportVersion constants are used in at least one project");
50+
t.getDefinitionsDirectory().set(TransportVersionUtils.getDefinitionsDirectory(project));
51+
t.getReferencesFiles().setFrom(tvReferencesConfig);
52+
});
53+
54+
project.getTasks().named("check").configure(t -> t.dependsOn(validateTask));
55+
4656
var generateManifestTask = project.getTasks()
4757
.register("generateTransportVersionManifest", GenerateTransportVersionManifestTask.class, t -> {
4858
t.setGroup("Transport Versions");
4959
t.setDescription("Generate a manifest resource for all the known transport version constants");
50-
t.getConstantsDirectory().set(TransportVersionUtils.getConstantsDirectory(project));
60+
t.getDefinitionsDirectory().set(TransportVersionUtils.getDefinitionsDirectory(project));
5161
t.getManifestFile().set(project.getLayout().getBuildDirectory().file("generated-resources/manifest.txt"));
5262
});
5363
project.getTasks().named(JavaPlugin.PROCESS_RESOURCES_TASK_NAME, Copy.class).configure(t -> {
5464
t.into("transport/constants", c -> c.from(generateManifestTask));
5565
});
56-
57-
var validateTask = project.getTasks()
58-
.register("validateTransportVersionConstants", ValidateTransportVersionConstantsTask.class, t -> {
59-
t.setGroup("Transport Versions");
60-
t.setDescription("Validates that all defined TransportVersion constants are used in at least one project");
61-
t.getConstantsDirectory().set(TransportVersionUtils.getConstantsDirectory(project));
62-
t.getReferencesFiles().setFrom(tvReferencesConfig);
63-
});
64-
65-
project.getTasks().named("check").configure(t -> t.dependsOn(validateTask));
6666
}
6767
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public class TransportVersionManagementPlugin implements Plugin<Project> {
1919

2020
@Override
2121
public void apply(Project project) {
22-
String transportVersionReferencesFile = "generated-transport-constants/transport-version-set-names.txt";
23-
var collectTask = project.getTasks().register("collectTransportVersionNames", CollectTransportVersionNamesTask.class, t -> {
22+
String transportVersionReferencesFile = "transport-version/references.txt";
23+
var collectTask = project.getTasks().register("collectTransportVersionReferences", CollectTransportVersionReferencesTask.class, t -> {
2424
t.setGroup("Transport Versions");
25-
t.setDescription("Collects all TransportVersion names used throughout the project");
25+
t.setDescription("Collects all TransportVersion references used throughout the project");
2626
SourceSet mainSourceSet = GradleUtils.getJavaSourceSets(project).findByName(SourceSet.MAIN_SOURCE_SET_NAME);
2727
t.getClassPath().setFrom(mainSourceSet.getRuntimeClasspath());
2828
t.getOutputFile().set(project.getLayout().getBuildDirectory().file(transportVersionReferencesFile));
@@ -39,8 +39,8 @@ public void apply(Project project) {
3939
var validateTask = project.getTasks()
4040
.register("validateTransportVersionReferences", ValidateTransportVersionReferencesTask.class, t -> {
4141
t.setGroup("Transport Versions");
42-
t.setDescription("Validates that all TransportVersion names used in the project have an associated data file");
43-
t.getConstantsDirectory().set(TransportVersionUtils.getConstantsDirectory(project));
42+
t.setDescription("Validates that all TransportVersion references used in the project have an associated definition file");
43+
t.getDefinitionsDirectory().set(TransportVersionUtils.getDefinitionsDirectory(project));
4444
t.getReferencesFile().set(project.getLayout().getBuildDirectory().file(transportVersionReferencesFile));
4545
t.dependsOn(collectTask);
4646

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public String toString() {
3939
}
4040
}
4141

42-
static TransportVersionConstant readConstantFile(Path file) throws IOException {
42+
static TransportVersionConstant readDefinitionFile(Path file) throws IOException {
4343
assert file.endsWith(".csv");
4444
String rawName = file.getFileName().toString();
4545
String name = rawName.substring(0, rawName.length() - 4);
@@ -72,9 +72,9 @@ static List<TransportVersionReference> readReferencesFile(Path file) throws IOEx
7272
return results;
7373
}
7474

75-
static Directory getConstantsDirectory(Project project) {
75+
static Directory getDefinitionsDirectory(Project project) {
7676
Directory serverDir = project.getRootProject().project(":server").getLayout().getProjectDirectory();
77-
return serverDir.dir("src/main/resources/transport/constants");
77+
return serverDir.dir("src/main/resources/transport/defined");
7878
}
7979

8080
static void addTransportVersionReferencesAttribute(AttributeContainer attributes) {

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionConstantsTask.java‎ renamed to ‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionDefinitionsTask.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323
import java.util.HashSet;
2424
import java.util.Set;
2525

26-
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.readConstantFile;
26+
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.readDefinitionFile;
2727
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.readReferencesFile;
2828

2929
/**
3030
* Validates that each defined transport version constant is referenced by at least one project.
3131
*/
32-
public abstract class ValidateTransportVersionConstantsTask extends DefaultTask {
32+
public abstract class ValidateTransportVersionDefinitionsTask extends DefaultTask {
3333

3434
@InputDirectory
35-
public abstract DirectoryProperty getConstantsDirectory();
35+
public abstract DirectoryProperty getDefinitionsDirectory();
3636

3737
@InputFiles
3838
public abstract ConfigurableFileCollection getReferencesFiles();
3939

4040
@TaskAction
4141
public void validateTransportVersions() throws IOException {
42-
Path constantsDir = getConstantsDirectory().getAsFile().get().toPath();
42+
Path constantsDir = getDefinitionsDirectory().getAsFile().get().toPath();
4343

4444
Set<String> allTvNames = new HashSet<>();
4545
for (var tvReferencesFile : getReferencesFiles()) {
@@ -48,7 +48,7 @@ public void validateTransportVersions() throws IOException {
4848

4949
try (var constantsStream = Files.list(constantsDir)) {
5050
for (var constantsFile : constantsStream.toList()) {
51-
var tv = readConstantFile(constantsFile);
51+
var tv = readDefinitionFile(constantsFile);
5252
if (allTvNames.contains(tv.name()) == false) {
5353
throw new IllegalStateException("Transport version constant " + tv.name() + " is not referenced");
5454
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
public abstract class ValidateTransportVersionReferencesTask extends DefaultTask {
2727

2828
@InputDirectory
29-
public abstract DirectoryProperty getConstantsDirectory();
29+
public abstract DirectoryProperty getDefinitionsDirectory();
3030

3131
@InputFile
3232
public abstract RegularFileProperty getReferencesFile();
3333

3434
@TaskAction
3535
public void validateTransportVersions() throws IOException {
36-
Path constantsDir = getConstantsDirectory().getAsFile().get().toPath();
36+
Path constantsDir = getDefinitionsDirectory().getAsFile().get().toPath();
3737
Path namesFile = getReferencesFile().get().getAsFile().toPath();
3838

3939
for (var tvReference : TransportVersionUtils.readReferencesFile(namesFile)) {

0 commit comments

Comments
 (0)