commit ed49b6d0c94cb06c4fb655f26b8e03ce77562f4c
author David Pursehouse <dpursehouse@collab.net> Sun Jun 10 19:57:22 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Sun Jun 10 19:57:25 2018 +0900
tree 322387fcb832c95464f94b88868d95b08aa5defd
parent aab6d47e2511060282dd889a4853f7cdf050f09e

AbstractElasticIndex: Make type field protected

Make the field protected so it can be reused in the derived classes
instead of being redefined.

Change-Id: Ib8438a93528953540d6c32b52901fdfdfee90721

gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java

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 cbc3937..7880ffc 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
@@ -81,8 +81,8 @@
   private final Schema<V> schema;
   private final SitePaths sitePaths;
   private final String indexNameRaw;
-  private final String type;
 
+  protected final String type;
   protected final ElasticRestClientProvider client;
   protected final String indexName;
   protected final Gson gson;

gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java

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 6ea24dd..5f48bb0 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
@@ -72,7 +72,6 @@
   private final AccountMapping mapping;
   private final Provider<AccountCache> accountCache;
   private final Schema<AccountState> schema;
-  private final String type;
 
   @AssistedInject
   ElasticAccountIndex(
@@ -85,7 +84,6 @@
     this.accountCache = accountCache;
     this.mapping = new AccountMapping(schema, client.adapter());
     this.schema = schema;
-    this.type = client.adapter().getType(ACCOUNTS);
   }
 
   @Override

gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java

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 9a1b399..e9dce0d 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
@@ -104,7 +104,6 @@
   private final ChangeData.Factory changeDataFactory;
   private final FillArgs fillArgs;
   private final Schema<ChangeData> schema;
-  private final String type;
 
   @AssistedInject
   ElasticChangeIndex(
@@ -121,7 +120,6 @@
     this.fillArgs = fillArgs;
     this.schema = schema;
     this.mapping = new ChangeMapping(schema, client.adapter());
-    this.type = client.adapter().getType(CHANGES);
   }
 
   @Override

gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java

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 ff5827a..f797b57 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
@@ -69,7 +69,6 @@
   private final GroupMapping mapping;
   private final Provider<GroupCache> groupCache;
   private final Schema<AccountGroup> schema;
-  private final String type;
 
   @AssistedInject
   ElasticGroupIndex(
@@ -82,7 +81,6 @@
     this.groupCache = groupCache;
     this.mapping = new GroupMapping(schema, client.adapter());
     this.schema = schema;
-    this.type = client.adapter().getType(GROUPS);
   }
 
   @Override