From 9125684d8633572cc303222c4f9fa25ce2f0db5d Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Sat, 14 Apr 2018 20:48:48 -0400 Subject: [PATCH] Minor cleanup in NodeInfo.groovy This commit is a minor cleanup of a code block in NodeInfo.groovy. We remove an unused variable, make the formatting of the code consistent, and cast a property that is typed as an Object to a String to avoid an annoying IDE warning. --- .../groovy/org/elasticsearch/gradle/test/NodeInfo.groovy | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy index fcc357258b9..1fc944eeec6 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy @@ -165,13 +165,12 @@ class NodeInfo { args.add("${esScript}") } - final String javaHome if (nodeVersion.before("6.2.0")) { - env = ['JAVA_HOME':"${-> getJavaHome(project, 8, "JAVA8_HOME must be set to run BWC tests against [" + nodeVersion + "]")}"] + env = ['JAVA_HOME': "${-> getJavaHome(project, 8, "JAVA8_HOME must be set to run BWC tests against [" + nodeVersion + "]")}"] } else if (nodeVersion.onOrAfter("6.2.0") && nodeVersion.before("6.3.0")) { - env = ['JAVA_HOME':"${-> getJavaHome(project, 9, "JAVA9_HOME must be set to run BWC tests against [" + nodeVersion + "]")}"] + env = ['JAVA_HOME': "${-> getJavaHome(project, 9, "JAVA9_HOME must be set to run BWC tests against [" + nodeVersion + "]")}"] } else { - env = ['JAVA_HOME':project.runtimeJavaHome] + env = ['JAVA_HOME': (String) project.runtimeJavaHome] } args.addAll("-E", "node.portsfile=true")