diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/BoolQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/BoolQueryBuilder.java
index 85072b3..4b1adbd 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/BoolQueryBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/BoolQueryBuilder.java
@@ -20,7 +20,7 @@
 
 /**
  * A Query that matches documents matching boolean combinations of other queries. A trimmed down
- * version of {@link org.elasticsearch.index.query.BoolQueryBuilder} for this very package.
+ * version of org.elasticsearch.index.query.BoolQueryBuilder for this very package.
  */
 public class BoolQueryBuilder extends QueryBuilder {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/ExistsQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/ExistsQueryBuilder.java
index 6fa0af4..b1b3b1b 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/ExistsQueryBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/ExistsQueryBuilder.java
@@ -18,7 +18,7 @@
 
 /**
  * Constructs a query that only match on documents that the field has a value in them. A trimmed
- * down version of {@link org.elasticsearch.index.query.ExistsQueryBuilder} for this very package.
+ * down version of org.elasticsearch.index.query.ExistsQueryBuilder for this very package.
  */
 class ExistsQueryBuilder extends QueryBuilder {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchAllQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchAllQueryBuilder.java
index b07af34..b2411a2 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchAllQueryBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchAllQueryBuilder.java
@@ -17,8 +17,8 @@
 import java.io.IOException;
 
 /**
- * A query that matches on all documents. A trimmed down version of {@link
- * org.elasticsearch.index.query.MatchAllQueryBuilder} for this very package.
+ * A query that matches on all documents. A trimmed down version of
+ * org.elasticsearch.index.query.MatchAllQueryBuilder for this very package.
  */
 class MatchAllQueryBuilder extends QueryBuilder {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchQueryBuilder.java
index 1b1c51a..e0c9a65 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchQueryBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchQueryBuilder.java
@@ -20,7 +20,7 @@
 /**
  * Match query is a query that analyzes the text and constructs a query as the result of the
  * analysis. It can construct different queries based on the type provided. A trimmed down version
- * of {@link org.elasticsearch.index.query.MatchQueryBuilder} for this very package.
+ * of org.elasticsearch.index.query.MatchQueryBuilder for this very package.
  */
 class MatchQueryBuilder extends QueryBuilder {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilder.java
index cb6476e..b56db0b 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilder.java
@@ -16,10 +16,7 @@
 
 import java.io.IOException;
 
-/**
- * A trimmed down version of {@link org.elasticsearch.index.query.QueryBuilder} for this very
- * package.
- */
+/** A trimmed down version of org.elasticsearch.index.query.QueryBuilder for this very package. */
 public abstract class QueryBuilder {
 
   protected QueryBuilder() {}
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilders.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilders.java
index c97d70e..38e6acd 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilders.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilders.java
@@ -15,8 +15,8 @@
 package com.google.gerrit.elasticsearch.builders;
 
 /**
- * A static factory for simple "import static" usage. A trimmed down version of {@link
- * org.elasticsearch.index.query.QueryBuilders} for this very package.
+ * A static factory for simple "import static" usage. A trimmed down version of
+ * org.elasticsearch.index.query.QueryBuilders for this very package.
  */
 public abstract class QueryBuilders {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QuerySourceBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QuerySourceBuilder.java
index f57ef3d..7920157 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QuerySourceBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QuerySourceBuilder.java
@@ -17,8 +17,8 @@
 import java.io.IOException;
 
 /**
- * A trimmed down and further altered version of {@link
- * org.elasticsearch.action.support.QuerySourceBuilder} for this very package.
+ * A trimmed down and further altered version of org.elasticsearch.action.support.QuerySourceBuilder
+ * for this very package.
  */
 class QuerySourceBuilder {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/RangeQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/RangeQueryBuilder.java
index 6049b72..5487198 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/RangeQueryBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/RangeQueryBuilder.java
@@ -17,8 +17,8 @@
 import java.io.IOException;
 
 /**
- * A Query that matches documents within an range of terms. A trimmed down version of {@link
- * org.elasticsearch.index.query.RangeQueryBuilder} for this very package.
+ * A Query that matches documents within an range of terms. A trimmed down version of
+ * org.elasticsearch.index.query.RangeQueryBuilder for this very package.
  */
 public class RangeQueryBuilder extends QueryBuilder {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/RegexpQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/RegexpQueryBuilder.java
index f4d1a7e..e88e8ef 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/RegexpQueryBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/RegexpQueryBuilder.java
@@ -17,8 +17,8 @@
 import java.io.IOException;
 
 /**
- * A Query that does fuzzy matching for a specific value. A trimmed down version of {@link
- * org.elasticsearch.index.query.RegexpQueryBuilder} for this very package.
+ * A Query that does fuzzy matching for a specific value. A trimmed down version of
+ * org.elasticsearch.index.query.RegexpQueryBuilder for this very package.
  */
 class RegexpQueryBuilder extends QueryBuilder {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/SearchSourceBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/SearchSourceBuilder.java
index 770839d..3df2a7c 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/SearchSourceBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/SearchSourceBuilder.java
@@ -19,8 +19,7 @@
 
 /**
  * A search source builder allowing to easily build search source. A trimmed down and further
- * altered version of {@link org.elasticsearch.search.builder.SearchSourceBuilder} for this very
- * package.
+ * altered version of org.elasticsearch.search.builder.SearchSourceBuilder for this very package.
  */
 public class SearchSourceBuilder {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/TermQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/TermQueryBuilder.java
index ed02af3..e290006 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/TermQueryBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/TermQueryBuilder.java
@@ -17,8 +17,8 @@
 import java.io.IOException;
 
 /**
- * A Query that matches documents containing a term. A trimmed down version of {@link
- * org.elasticsearch.index.query.TermQueryBuilder} for this very package.
+ * A Query that matches documents containing a term. A trimmed down version of
+ * org.elasticsearch.index.query.TermQueryBuilder for this very package.
  */
 class TermQueryBuilder extends QueryBuilder {
 
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java
index 4fad323..3c1d114 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/XContentBuilder.java
@@ -27,8 +27,8 @@
 import java.util.Date;
 
 /**
- * A trimmed down and further altered version of {@link
- * org.elasticsearch.common.xcontent.XContentBuilder} for this very package.
+ * A trimmed down and further altered version of org.elasticsearch.common.xcontent.XContentBuilder
+ * for this very package.
  */
 public final class XContentBuilder implements Closeable {
 
@@ -38,7 +38,7 @@
 
   /**
    * Constructs a new builder. Make sure to call {@link #close()} when the builder is done with.
-   * Inspired from {@link org.elasticsearch.common.xcontent.json.JsonXContent} static block.
+   * Inspired from org.elasticsearch.common.xcontent.json.JsonXContent static block.
    */
   public XContentBuilder() throws IOException {
     JsonFactory jsonFactory = new JsonFactory();