Format Java source files automatically

CONTRIBUTING.md

@@ -155,19 +155,47 @@ For Eclipse, go to `Preferences->Java->Installed JREs` and add `-ea` to
 
 ### Java Language Formatting Guidelines
 
+Java files in the Elasticsearch codebase are formatted with
+[google-java-format](https://github.com/google/google-java-format), which
+enforces the [Google Java
+Style](https://google.github.io/styleguide/javaguide.html). There are
+plugins available for Eclipse, JetBrains IDEs such as IntelliJ IDEA, and a
+CLI interface. Formatting checks are also integrated into the build - check
+the code with:
+
+    ./gradlew verifyGoogleJavaFormat
+
+Format the code with:
+
+    ./gradlew googleJavaFormat
+
+Code is formatted with the `--aosp` option (Android Open Source Project),
+which indents with 4 spaces instead of 2. There are no other formatting
+options available.
+
+These tasks can also be run for specific subprojects.
+
 Please follow these formatting guidelines:
 
-* Java indent is 4 spaces
-* Line width is 140 characters
-* Lines of code surrounded by `// tag` and `// end` comments are included in the
-documentation and should only be 76 characters wide not counting
-leading indentation
-* The rest is left to Java coding standards
-* Disable “auto-format on save” to prevent unnecessary format changes. This makes reviews much harder as it generates unnecessary formatting changes. If your IDE supports formatting only modified chunks that is fine to do.
-* Wildcard imports (`import foo.bar.baz.*`) are forbidden and will cause the build to fail. This can be done automatically by your IDE:
- * Eclipse: `Preferences->Java->Code Style->Organize Imports`. There are two boxes labeled "`Number of (static )? imports needed for .*`". Set their values to 99999 or some other absurdly high value.
- * IntelliJ: `Preferences/Settings->Editor->Code Style->Java->Imports`. There are two configuration options: `Class count to use import with '*'` and `Names count to use static import with '*'`. Set their values to 99999 or some other absurdly high value.
-* Don't worry too much about import order. Try not to change it but don't worry about fighting your IDE to stop it from doing so.
+* Lines of code surrounded by `// tag` and `// end` comments are included
+  in the documentation and should only be 76 characters wide not counting
+  leading indentation
+* Wildcard imports (`import foo.bar.baz.*`) are forbidden and will cause
+  the build to fail. This can be done automatically by your IDE:
+   * Eclipse: `Preferences->Java->Code Style->Organize Imports`. There are
+     two boxes labeled "`Number of (static )? imports needed for .*`". Set
+     their values to 99999 or some other absurdly high value.
+   * IntelliJ: `Preferences/Settings->Editor->Code Style->Java->Imports`.
+     There are two configuration options: `Class count to use import with
+     '*'` and `Names count to use static import with '*'`. Set their values
+     to 99999 or some other absurdly high value.
+
+If a file compiles successfully but fails to format, the Gradle plugin does
+not give much help. Instead, download the `google-java-format` JAR
+directly, ensuring to fetch the one with all dependencies included, and
+check the files like so:
+
+    java -jar path/to/google-java-format-1.7-all-deps.jar --aosp path/to/File.java
 
 ### License Headers
 

build.gradle

@@ -35,6 +35,7 @@ plugins {
     id 'com.gradle.build-scan' version '2.4'
     id 'lifecycle-base'
     id 'elasticsearch.global-build-info'
+    id 'com.github.sherter.google-java-format' version '0.8'
 }
 
 apply plugin: 'nebula.info-scm'
@@ -98,6 +99,15 @@ subprojects {
   plugins.withType(BuildPlugin).whenPluginAdded {
     project.licenseFile = project.rootProject.file('licenses/APACHE-LICENSE-2.0.txt')
     project.noticeFile = project.rootProject.file('NOTICE.txt')
+
+    // Although the plugin is applied at the top-level, that doesn't make
+    // it available on subprojects.
+    project.apply plugin: 'com.github.sherter.google-java-format'
+    check.dependsOn 'verifyGoogleJavaFormat'
+
+    googleJavaFormat {
+      options style: 'AOSP'
+    }
   }
 }
 
@@ -530,3 +540,7 @@ allprojects {
       }
   }
 }
+
+googleJavaFormat {
+  options style: 'AOSP'
+}

server/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java

@@ -21,7 +21,6 @@
 
 import org.apache.lucene.document.LatLonDocValuesField;
 import org.apache.lucene.document.LatLonPoint;
-//import org.apache.lucene.geo.Rectangle;
 import org.apache.lucene.search.IndexOrDocValuesQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;

server/src/main/java/org/elasticsearch/script/ScriptException.java

@@ -1,14 +1,3 @@
-package org.elasticsearch.script;
-
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.rest.RestStatus;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -28,6 +17,17 @@
  * under the License.
  */
 
+package org.elasticsearch.script;
+
+import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.rest.RestStatus;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;