Apply 2-space indent to all gradle scripts

.ci/init.gradle

@@ -2,113 +2,113 @@ import com.bettercloud.vault.VaultConfig;
 import com.bettercloud.vault.Vault;
 
 initscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.bettercloud:vault-java-driver:4.1.0'
-    }
+  repositories {
+    mavenCentral()
+  }
+  dependencies {
+    classpath 'com.bettercloud:vault-java-driver:4.1.0'
+  }
 }
 
-boolean USE_ARTIFACTORY=false
+boolean USE_ARTIFACTORY = false
 
 if (System.getenv('VAULT_ADDR') == null) {
-    throw new GradleException("You must set the VAULT_ADDR environment variable to use this init script.")
+  throw new GradleException("You must set the VAULT_ADDR environment variable to use this init script.")
 }
 
 if (System.getenv('VAULT_ROLE_ID') == null && System.getenv('VAULT_SECRET_ID') == null && System.getenv('VAULT_TOKEN') == null) {
-    throw new GradleException("You must set either the VAULT_ROLE_ID and VAULT_SECRET_ID environment variables, " +
-            "or the VAULT_TOKEN environment variable to use this init script.")
+  throw new GradleException("You must set either the VAULT_ROLE_ID and VAULT_SECRET_ID environment variables, " +
+    "or the VAULT_TOKEN environment variable to use this init script.")
 }
 
 final String vaultToken = System.getenv('VAULT_TOKEN') ?: new Vault(
-        new VaultConfig()
-            .address(System.env.VAULT_ADDR)
-            .engineVersion(1)
-            .build()
-    )
-    .withRetries(5, 1000)
-    .auth()
-    .loginByAppRole("approle", System.env.VAULT_ROLE_ID, System.env.VAULT_SECRET_ID)
-    .getAuthClientToken();
+  new VaultConfig()
+    .address(System.env.VAULT_ADDR)
+    .engineVersion(1)
+    .build()
+)
+  .withRetries(5, 1000)
+  .auth()
+  .loginByAppRole("approle", System.env.VAULT_ROLE_ID, System.env.VAULT_SECRET_ID)
+  .getAuthClientToken();
 
 final Vault vault = new Vault(
-     new VaultConfig()
-        .address(System.env.VAULT_ADDR)
-        .engineVersion(1)
-        .token(vaultToken)
-        .build()
+  new VaultConfig()
+    .address(System.env.VAULT_ADDR)
+    .engineVersion(1)
+    .token(vaultToken)
+    .build()
 )
-        .withRetries(5, 1000)
+  .withRetries(5, 1000)
 
 
 if (USE_ARTIFACTORY) {
-    final Map<String,String> artifactoryCredentials = vault.logical()
-            .read("secret/elasticsearch-ci/artifactory.elstc.co")
-            .getData();
-    logger.info("Using elastic artifactory repos")
-    Closure configCache = {
-        return {
-            name "artifactory-gradle-release"
-            url "https://artifactory.elstc.co/artifactory/gradle-release"
-            credentials {
-                username artifactoryCredentials.get("username")
-                password artifactoryCredentials.get("token")
-            }
-        }
+  final Map<String, String> artifactoryCredentials = vault.logical()
+    .read("secret/elasticsearch-ci/artifactory.elstc.co")
+    .getData();
+  logger.info("Using elastic artifactory repos")
+  Closure configCache = {
+    return {
+      name "artifactory-gradle-release"
+      url "https://artifactory.elstc.co/artifactory/gradle-release"
+      credentials {
+        username artifactoryCredentials.get("username")
+        password artifactoryCredentials.get("token")
+      }
     }
-    settingsEvaluated { settings ->
-        settings.pluginManagement {
-            repositories {
-                maven configCache()
-            }
-        }
+  }
+  settingsEvaluated { settings ->
+    settings.pluginManagement {
+      repositories {
+        maven configCache()
+      }
     }
-    projectsLoaded {
-        allprojects {
-            buildscript {
-                repositories {
-                    maven configCache()
-                }
-            }
-            repositories {
-                maven configCache()
-            }
+  }
+  projectsLoaded {
+    allprojects {
+      buildscript {
+        repositories {
+          maven configCache()
         }
+      }
+      repositories {
+        maven configCache()
+      }
     }
+  }
 }
 
 projectsLoaded {
-    rootProject {
-        project.pluginManager.withPlugin('com.gradle.build-scan') {
-            buildScan.server = 'https://gradle-enterprise.elastic.co'
-        }
+  rootProject {
+    project.pluginManager.withPlugin('com.gradle.build-scan') {
+      buildScan.server = 'https://gradle-enterprise.elastic.co'
     }
+  }
 }
 
 
 final String buildCacheUrl = System.getProperty('org.elasticsearch.build.cache.url')
 final boolean buildCachePush = Boolean.valueOf(System.getProperty('org.elasticsearch.build.cache.push', 'false'))
 
 if (buildCacheUrl) {
-    final Map<String,String> buildCacheCredentials = vault.logical()
-            .read("secret/elasticsearch-ci/gradle-build-cache")
-            .getData();
-    gradle.settingsEvaluated { settings ->
-        settings.buildCache {
-            local {
-                // Disable the local build cache in CI since we use ephemeral workers and it incurs an IO penalty
-                enabled = false
-            }
-            remote(HttpBuildCache) {
-                url = buildCacheUrl
-                push = buildCachePush
-                credentials {
-                        username = buildCacheCredentials.get("username")
-                        password = buildCacheCredentials.get("password")
-                }
-            }
+  final Map<String, String> buildCacheCredentials = vault.logical()
+    .read("secret/elasticsearch-ci/gradle-build-cache")
+    .getData();
+  gradle.settingsEvaluated { settings ->
+    settings.buildCache {
+      local {
+        // Disable the local build cache in CI since we use ephemeral workers and it incurs an IO penalty
+        enabled = false
+      }
+      remote(HttpBuildCache) {
+        url = buildCacheUrl
+        push = buildCachePush
+        credentials {
+          username = buildCacheCredentials.get("username")
+          password = buildCacheCredentials.get("password")
         }
+      }
     }
+  }
 }
 

.editorconfig

@@ -2,12 +2,15 @@
 
 root = true
 
-[*.java]
+[*]
 charset = utf-8
-indent_style = space
-indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
+indent_style = space
+indent_size = 4
 
 [*.bat]
 indent_size = 2
+
+[*.gradle]
+indent_size = 2

benchmarks/build.gradle

@@ -29,16 +29,16 @@ archivesBaseName = 'elasticsearch-benchmarks'
 test.enabled = false
 
 dependencies {
-    compile(project(":server")) {
-        // JMH ships with the conflicting version 4.6. This prevents us from using jopt-simple in benchmarks (which should be ok) but allows
-        // us to invoke the JMH uberjar as usual.
-        exclude group: 'net.sf.jopt-simple', module: 'jopt-simple'
-    }
-    compile "org.openjdk.jmh:jmh-core:$versions.jmh"
-    annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$versions.jmh"
-    // Dependencies of JMH
-    runtime 'net.sf.jopt-simple:jopt-simple:4.6'
-    runtime 'org.apache.commons:commons-math3:3.2'
+  compile(project(":server")) {
+    // JMH ships with the conflicting version 4.6. This prevents us from using jopt-simple in benchmarks (which should be ok) but allows
+    // us to invoke the JMH uberjar as usual.
+    exclude group: 'net.sf.jopt-simple', module: 'jopt-simple'
+  }
+  compile "org.openjdk.jmh:jmh-core:$versions.jmh"
+  annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$versions.jmh"
+  // Dependencies of JMH
+  runtime 'net.sf.jopt-simple:jopt-simple:4.6'
+  runtime 'org.apache.commons:commons-math3:3.2'
 }
 
 compileJava.options.compilerArgs << "-Xlint:-cast,-rawtypes,-unchecked,-processing"
@@ -55,13 +55,13 @@ forbiddenApisMain.enabled = false
 dependencyLicenses.enabled = false
 dependenciesInfo.enabled = false
 
-thirdPartyAudit.ignoreViolations (
-        // these classes intentionally use JDK internal API (and this is ok since the project is maintained by Oracle employees)
-        'org.openjdk.jmh.profile.AbstractHotspotProfiler',
-        'org.openjdk.jmh.profile.HotspotThreadProfiler',
-        'org.openjdk.jmh.profile.HotspotClassloadingProfiler',
-        'org.openjdk.jmh.profile.HotspotCompilationProfiler',
-        'org.openjdk.jmh.profile.HotspotMemoryProfiler',
-        'org.openjdk.jmh.profile.HotspotRuntimeProfiler',
-        'org.openjdk.jmh.util.Utils'
+thirdPartyAudit.ignoreViolations(
+  // these classes intentionally use JDK internal API (and this is ok since the project is maintained by Oracle employees)
+  'org.openjdk.jmh.profile.AbstractHotspotProfiler',
+  'org.openjdk.jmh.profile.HotspotThreadProfiler',
+  'org.openjdk.jmh.profile.HotspotClassloadingProfiler',
+  'org.openjdk.jmh.profile.HotspotCompilationProfiler',
+  'org.openjdk.jmh.profile.HotspotMemoryProfiler',
+  'org.openjdk.jmh.profile.HotspotRuntimeProfiler',
+  'org.openjdk.jmh.util.Utils'
 )