Skip to content

Commit 630d529

Browse files
authored
Rename the transport version generate task to be shorter (#134420)
Most developers won't need to know what "definitions" are, they only care about generating a transport version. This commit renames the gradle task for generate to omit "definition" and simply be "generateTransportVersion".
1 parent f9299ac commit 630d529

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
122122
apply plugin: 'elasticsearch.transport-version-references'
123123
apply plugin: 'elasticsearch.transport-version-resources'
124124
125-
tasks.named('generateTransportVersionDefinition') {
125+
tasks.named('generateTransportVersion') {
126126
currentUpperBoundName = '9.2'
127127
}
128128
"""

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
1818
def runGenerateAndValidateTask(String... additionalArgs) {
1919
List<String> args = new ArrayList<>()
2020
args.add(":myserver:validateTransportVersionResources")
21-
args.add(":myserver:generateTransportVersionDefinition")
21+
args.add(":myserver:generateTransportVersion")
2222
args.addAll(additionalArgs);
2323
return gradleRunner(args.toArray())
2424
}
2525

2626
def runGenerateTask(String... additionalArgs) {
2727
List<String> args = new ArrayList<>()
28-
args.add(":myserver:generateTransportVersionDefinition")
28+
args.add(":myserver:generateTransportVersion")
2929
args.addAll(additionalArgs);
3030
return gradleRunner(args.toArray())
3131
}
@@ -35,11 +35,11 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
3535
}
3636

3737
void assertGenerateSuccess(BuildResult result) {
38-
assert result.task(":myserver:generateTransportVersionDefinition").outcome == TaskOutcome.SUCCESS
38+
assert result.task(":myserver:generateTransportVersion").outcome == TaskOutcome.SUCCESS
3939
}
4040

4141
void assertGenerateFailure(BuildResult result, String expectedOutput) {
42-
assert result.task(":myserver:generateTransportVersionDefinition").outcome == TaskOutcome.FAILED
42+
assert result.task(":myserver:generateTransportVersion").outcome == TaskOutcome.FAILED
4343
assertOutputContains(result.output, expectedOutput)
4444
}
4545

@@ -449,7 +449,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
449449
referencedTransportVersion("new_tv")
450450
file("myserver/alt_upper_bound.csv").text = "some_tv,8126000"
451451
file("myserver/build.gradle") << """
452-
tasks.named('generateTransportVersionDefinition') {
452+
tasks.named('generateTransportVersion') {
453453
alternateUpperBoundFile = project.file("alt_upper_bound.csv")
454454
}
455455
tasks.named('validateTransportVersionResources') {
@@ -470,7 +470,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
470470
referencedTransportVersion("new_tv")
471471
file("myserver/alt_upper_bound.csv").text = "some_tv,8122100"
472472
file("myserver/build.gradle") << """
473-
tasks.named('generateTransportVersionDefinition') {
473+
tasks.named('generateTransportVersion') {
474474
alternateUpperBoundFile = project.file("alt_upper_bound.csv")
475475
}
476476
tasks.named('validateTransportVersionResources') {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void apply(Project project) {
8383
});
8484

8585
var generateDefinitionsTask = project.getTasks()
86-
.register("generateTransportVersionDefinition", GenerateTransportVersionDefinitionTask.class, t -> {
86+
.register("generateTransportVersion", GenerateTransportVersionDefinitionTask.class, t -> {
8787
t.setGroup(taskGroup);
8888
t.setDescription("(Re)generates a transport version definition file");
8989
t.getReferencesFiles().setFrom(tvReferencesConfig);

0 commit comments

Comments
 (0)