Skip to content

[9.0] Use gradleProperty instead of findProperty (#135203) #135277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2025
Merged

[9.0] Use gradleProperty instead of findProperty (#135203) #135277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions ...ain/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.gradle.api.Project;
import org.gradle.api.file.Directory;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.Copy;
import org.gradle.language.base.plugins.LifecycleBasePlugin;

Expand Down Expand Up @@ -49,9 +50,9 @@ public void apply(Project project) {
Directory transportResources = project.getLayout().getProjectDirectory().dir("src/main/resources/" + resourceRoot);
spec.getParameters().getTransportResourcesDirectory().set(transportResources);
spec.getParameters().getRootDirectory().set(project.getLayout().getSettingsDirectory().getAsFile());
Object upstreamRef = project.findProperty("org.elasticsearch.transport.upstreamRef");
if (upstreamRef != null) {
spec.getParameters().getUpstreamRefOverride().set(upstreamRef.toString());
Provider<String> upstreamRef = project.getProviders().gradleProperty("org.elasticsearch.transport.upstreamRef");
if (upstreamRef.isPresent()) {
spec.getParameters().getUpstreamRefOverride().set(upstreamRef.get());
}
});

Expand Down Expand Up @@ -120,10 +121,7 @@ public void apply(Project project) {
}

private static String getResourceRoot(Project project) {
var resourceRoot = project.findProperty("org.elasticsearch.transport.resourceRoot");
if (resourceRoot == null) {
resourceRoot = "transport";
}
return resourceRoot.toString();
Provider<String> resourceRootProperty = project.getProviders().gradleProperty("org.elasticsearch.transport.resourceRoot");
return resourceRootProperty.isPresent() ? resourceRootProperty.get() : "transport";
}
}