From 37bb244e08d036656d92e0135eb5355372a2b772 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 23 Sep 2025 06:19:27 -0700 Subject: [PATCH] Use gradleProperty instead of findProperty (#135203) Followup to use more canonical way to find gradle properties in transport version build code. --- .../transport/TransportVersionResourcesPlugin.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java index a08ea3be9b27c..756627616fb3b 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java @@ -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; @@ -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 upstreamRef = project.getProviders().gradleProperty("org.elasticsearch.transport.upstreamRef"); + if (upstreamRef.isPresent()) { + spec.getParameters().getUpstreamRefOverride().set(upstreamRef.get()); } }); @@ -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 resourceRootProperty = project.getProviders().gradleProperty("org.elasticsearch.transport.resourceRoot"); + return resourceRootProperty.isPresent() ? resourceRootProperty.get() : "transport"; } }