Skip to content

Commit 1266847

Browse files
committed
update gradle values to use callable
1 parent 8833e6e commit 1266847

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/plugin/GenerateTestBuildInfoTask.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ private void extractLocationsFromDirectory(File dir, List<Location> locations) t
272272
private String extractClassNameFromDirectory(File dir) throws IOException {
273273
var visitor = new SimpleFileVisitor<Path>() {
274274
String result = null;
275+
275276
@Override
276277
public @NotNull FileVisitResult visitFile(@NotNull Path candidate, @NotNull BasicFileAttributes attrs) {
277278
String name = candidate.getFileName().toString(); // Just the part after the last dir separator

build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@
1616
import org.gradle.api.file.RegularFile;
1717
import org.gradle.api.provider.Provider;
1818
import org.gradle.api.provider.ProviderFactory;
19+
import org.gradle.api.tasks.TaskProvider;
1920
import org.gradle.jvm.tasks.Jar;
2021
import org.gradle.language.jvm.tasks.ProcessResources;
2122

23+
import java.util.concurrent.Callable;
24+
2225
import javax.inject.Inject;
2326

2427
/**
@@ -70,12 +73,19 @@ public void apply(final Project project) {
7073
});
7174

7275
project.getTasks().withType(ProcessResources.class).named("processResources").configure(task -> {
73-
var componentName = project.getExtensions().getByType(PluginPropertiesExtension.class).getName();
74-
var pluginProperties = project.getTasks().withType(GeneratePluginPropertiesTask.class).named("pluginProperties");
75-
task.into("META-INF/es-plugins/" + componentName + "/", copy -> {
76-
copy.from(pluginProperties);
77-
copy.from(project.getLayout().getProjectDirectory().file("src/main/plugin-metadata/entitlement-policy.yaml"));
78-
});
76+
task.into(
77+
(Callable<String>) () -> "META-INF/es-plugins/"
78+
+ project.getExtensions().getByType(PluginPropertiesExtension.class).getName()
79+
+ "/",
80+
copy -> {
81+
copy.from(
82+
(Callable<TaskProvider<GeneratePluginPropertiesTask>>) () -> project.getTasks()
83+
.withType(GeneratePluginPropertiesTask.class)
84+
.named("pluginProperties")
85+
);
86+
copy.from(project.getLayout().getProjectDirectory().file("src/main/plugin-metadata/entitlement-policy.yaml"));
87+
}
88+
);
7989
});
8090
}
8191
}

0 commit comments

Comments
 (0)