Define ElasticQueryBuilder in AbstractElasticIndex instead of in each sub class Change-Id: Iba6e853d086181a8a2a45bc922fbc0f663a0689b

diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
index e952b38..f5cc273 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java

@@ -74,6 +74,7 @@
   protected final String indexName;
   protected final JestHttpClient client;
   protected final Gson gson;
+  protected final ElasticQueryBuilder queryBuilder;
 
   AbstractElasticIndex(@GerritServerConfig Config cfg,
       FillArgs fillArgs,
@@ -85,6 +86,7 @@
     this.schema = schema;
     this.gson = new GsonBuilder()
         .setFieldNamingPolicy(LOWER_CASE_WITH_UNDERSCORES).create();
+    this.queryBuilder = new ElasticQueryBuilder();
     String protocol = getRequiredConfigOption(cfg, "protocol");
     String hostname = getRequiredConfigOption(cfg, "hostname");
     String port = getRequiredConfigOption(cfg, "port");

diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
index cf6ad82..3e91fb4 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java

@@ -79,7 +79,6 @@
 
   private final AccountMapping mapping;
   private final Provider<AccountCache> accountCache;
-  private final ElasticQueryBuilder queryBuilder;
 
   @AssistedInject
   ElasticAccountIndex(
@@ -91,7 +90,6 @@
     super(cfg, null, sitePaths, schema, ACCOUNTS_PREFIX);
     this.accountCache = accountCache;
     this.mapping = new AccountMapping(schema);
-    this.queryBuilder = new ElasticQueryBuilder();
   }
 
   @Override

diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
index 923e355..96cd1c4 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java

@@ -101,7 +101,6 @@
 
   private final ChangeMapping mapping;
   private final Provider<ReviewDb> db;
-  private final ElasticQueryBuilder queryBuilder;
   private final ChangeData.Factory changeDataFactory;
 
   @AssistedInject
@@ -116,8 +115,6 @@
     this.db = db;
     this.changeDataFactory = changeDataFactory;
     mapping = new ChangeMapping(schema);
-
-    this.queryBuilder = new ElasticQueryBuilder();
   }
 
   @Override

diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
index 786b06e..f9c96d1 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java

@@ -77,7 +77,6 @@
 
   private final GroupMapping mapping;
   private final Provider<GroupCache> groupCache;
-  private final ElasticQueryBuilder queryBuilder;
 
   @AssistedInject
   ElasticGroupIndex(
@@ -89,7 +88,6 @@
     super(cfg, null, sitePaths, schema, GROUPS_PREFIX);
     this.groupCache = groupCache;
     this.mapping = new GroupMapping(schema);
-    this.queryBuilder = new ElasticQueryBuilder();
   }
 
   @Override