Skip to content

Commit 5cfecb6

Browse files
authored
Use consistent terminology for transport version resources/references (#132882) (#132896)
The build system for transport versions operate on two different types of projects. A project can have named references to transport versions, and it could also be the source of truth for transport version resources, where latest and definitions files exist. This commit renames the plugins and tasks to consistently use that terminology.
1 parent a6f18c5 commit 5cfecb6

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

build-tools-internal/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,13 @@ gradlePlugin {
220220
id = 'elasticsearch.internal-yaml-rest-test'
221221
implementationClass = 'org.elasticsearch.gradle.internal.test.rest.InternalYamlRestTestPlugin'
222222
}
223-
transportVersionManagementPlugin {
224-
id = 'elasticsearch.transport-version-management'
225-
implementationClass = 'org.elasticsearch.gradle.internal.transport.TransportVersionManagementPlugin'
223+
transportVersionReferencesPlugin {
224+
id = 'elasticsearch.transport-version-references'
225+
implementationClass = 'org.elasticsearch.gradle.internal.transport.TransportVersionReferencesPlugin'
226226
}
227-
globalTransportVersionManagementPlugin {
228-
id = 'elasticsearch.global-transport-version-management'
229-
implementationClass = 'org.elasticsearch.gradle.internal.transport.GlobalTransportVersionManagementPlugin'
227+
transportVersionResourcesPlugin {
228+
id = 'elasticsearch.transport-version-resources'
229+
implementationClass = 'org.elasticsearch.gradle.internal.transport.TransportVersionResourcesPlugin'
230230
}
231231
}
232232
}

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionManagementPluginFuncTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ class TransportVersionManagementPluginFuncTest extends AbstractGradleFuncTest {
9292

9393
file("myserver/build.gradle") << """
9494
apply plugin: 'java-library'
95-
apply plugin: 'elasticsearch.transport-version-management'
96-
apply plugin: 'elasticsearch.global-transport-version-management'
95+
apply plugin: 'elasticsearch.transport-version-references'
96+
apply plugin: 'elasticsearch.transport-version-resources'
9797
"""
9898
definedTransportVersion("existing_91", "8012000")
9999
definedTransportVersion("existing_92", "8123000,8012001")
@@ -112,7 +112,7 @@ class TransportVersionManagementPluginFuncTest extends AbstractGradleFuncTest {
112112

113113
file("myplugin/build.gradle") << """
114114
apply plugin: 'java-library'
115-
apply plugin: 'elasticsearch.transport-version-management'
115+
apply plugin: 'elasticsearch.transport-version-references'
116116
117117
dependencies {
118118
implementation project(":myserver")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.elasticsearch.gradle.internal.info.BuildParameterExtension;
1616
import org.elasticsearch.gradle.internal.precommit.JarHellPrecommitPlugin;
1717
import org.elasticsearch.gradle.internal.test.ClusterFeaturesMetadataPlugin;
18-
import org.elasticsearch.gradle.internal.transport.TransportVersionManagementPlugin;
18+
import org.elasticsearch.gradle.internal.transport.TransportVersionReferencesPlugin;
1919
import org.elasticsearch.gradle.plugin.PluginBuildPlugin;
2020
import org.elasticsearch.gradle.plugin.PluginPropertiesExtension;
2121
import org.elasticsearch.gradle.util.GradleUtils;
@@ -37,7 +37,7 @@ public void apply(Project project) {
3737
project.getPluginManager().apply(JarHellPrecommitPlugin.class);
3838
project.getPluginManager().apply(ElasticsearchJavaPlugin.class);
3939
project.getPluginManager().apply(ClusterFeaturesMetadataPlugin.class);
40-
project.getPluginManager().apply(TransportVersionManagementPlugin.class);
40+
project.getPluginManager().apply(TransportVersionReferencesPlugin.class);
4141
boolean isCi = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class).getCi();
4242
// Clear default dependencies added by public PluginBuildPlugin as we add our
4343
// own project dependencies for internal builds
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getDefinitionsDirectory;
2121
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getResourcesDirectory;
2222

23-
public class TransportVersionManagementPlugin implements Plugin<Project> {
23+
public class TransportVersionReferencesPlugin implements Plugin<Project> {
2424

2525
@Override
2626
public void apply(Project project) {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getDefinitionsDirectory;
2424
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getResourcesDirectory;
2525

26-
public class GlobalTransportVersionManagementPlugin implements Plugin<Project> {
26+
public class TransportVersionResourcesPlugin implements Plugin<Project> {
2727

2828
@Override
2929
public void apply(Project project) {
@@ -37,13 +37,13 @@ public void apply(Project project) {
3737

3838
// iterate through all projects, and if the management plugin is applied, add that project back as a dep to check
3939
for (Project subProject : project.getRootProject().getSubprojects()) {
40-
subProject.getPlugins().withType(TransportVersionManagementPlugin.class).configureEach(plugin -> {
40+
subProject.getPlugins().withType(TransportVersionReferencesPlugin.class).configureEach(plugin -> {
4141
tvReferencesConfig.getDependencies().add(depsHandler.project(Map.of("path", subProject.getPath())));
4242
});
4343
}
4444

4545
var validateTask = project.getTasks()
46-
.register("validateTransportVersionDefinitions", ValidateTransportVersionDefinitionsTask.class, t -> {
46+
.register("validateTransportVersionDefinitions", ValidateTransportVersionResourcesTask.class, t -> {
4747
t.setGroup("Transport Versions");
4848
t.setDescription("Validates that all defined TransportVersion constants are used in at least one project");
4949
Directory resourcesDir = getResourcesDirectory(project);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
* Validates that each defined transport version constant is referenced by at least one project.
5454
*/
5555
@CacheableTask
56-
public abstract class ValidateTransportVersionDefinitionsTask extends DefaultTask {
56+
public abstract class ValidateTransportVersionResourcesTask extends DefaultTask {
5757

5858
@InputDirectory
5959
@Optional
@@ -85,7 +85,7 @@ private record IdAndDefinition(TransportVersionId id, TransportVersionDefinition
8585
Map<String, TransportVersionLatest> latestByBranch = new HashMap<>();
8686

8787
@Inject
88-
public ValidateTransportVersionDefinitionsTask(ExecOperations execOperations) {
88+
public ValidateTransportVersionResourcesTask(ExecOperations execOperations) {
8989
this.execOperations = execOperations;
9090
this.rootPath = getProject().getRootProject().getLayout().getProjectDirectory().getAsFile().toPath();
9191
}

server/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ apply plugin: 'elasticsearch.publish'
1212
apply plugin: 'elasticsearch.internal-cluster-test'
1313
apply plugin: 'elasticsearch.internal-test-artifact'
1414
apply plugin: 'elasticsearch.test-build-info'
15-
apply plugin: 'elasticsearch.transport-version-management'
16-
apply plugin: 'elasticsearch.global-transport-version-management'
15+
apply plugin: 'elasticsearch.transport-version-references'
16+
apply plugin: 'elasticsearch.transport-version-resources'
1717

1818
publishing {
1919
publications {

x-pack/plugin/esql/compute/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.elasticsearch.gradle.internal.util.SourceDirectoryCommandLineArgument
33
apply plugin: 'elasticsearch.build'
44
apply plugin: 'elasticsearch.string-templates'
55
apply plugin: 'elasticsearch.publish'
6-
apply plugin: 'elasticsearch.transport-version-management'
6+
apply plugin: 'elasticsearch.transport-version-references'
77

88
base {
99
archivesName = 'x-pack-esql-compute'

0 commit comments

Comments
 (0)