honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-31 04:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use Groovy's withDefault ()

Browse Source 
Closes
This commit is contained in:
Alpar Torok 2019-01-23 12:09:40 +02:00 committed by GitHub
parent 6130d15172
commit f54a3b5f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

4
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

@ -392,7 +392,7 @@ class BuildPlugin implements Plugin<Project> {
static void requireJavaHome(Task task, int version) { static void requireJavaHome(Task task, int version) {
Project rootProject = task.project.rootProject // use root project for global accounting Project rootProject = task.project.rootProject // use root project for global accounting
if (rootProject.hasProperty('requiredJavaVersions') == false) { if (rootProject.hasProperty('requiredJavaVersions') == false) {
rootProject.rootProject.ext.requiredJavaVersions = [:].withDefault{key -> return []} rootProject.rootProject.ext.requiredJavaVersions = [:]
rootProject.gradle.taskGraph.whenReady { TaskExecutionGraph taskGraph -> rootProject.gradle.taskGraph.whenReady { TaskExecutionGraph taskGraph ->
List<String> messages = [] List<String> messages = []
for (entry in rootProject.requiredJavaVersions) { for (entry in rootProject.requiredJavaVersions) {
@ -415,7 +415,7 @@ class BuildPlugin implements Plugin<Project> {
throw new GradleException("JAVA${version}_HOME required to run task:\n${task}") throw new GradleException("JAVA${version}_HOME required to run task:\n${task}")
} }
} else { } else {
rootProject.requiredJavaVersions.get(version).add(task) rootProject.requiredJavaVersions.getOrDefault(version, []).add(task)
} }
} }