Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
AbstractElasticIndex: Make type field protected
Change-Id: Ic532bd52e2e7dc832b4e306164a3f7bff1eb39aa
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 eefcc09..4996847 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;
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 466614a..459f9a1 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
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 1a20906..eea6e42 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 Provider<ReviewDb> db;
private final ChangeData.Factory changeDataFactory;
private final Schema<ChangeData> schema;
- private final String type;
@Inject
ElasticChangeIndex(
@@ -119,7 +118,6 @@
this.changeDataFactory = changeDataFactory;
this.schema = schema;
this.mapping = new ChangeMapping(schema, client.adapter());
- this.type = client.adapter().getType(CHANGES);
}
@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 00caeae..b601779 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
@@ -71,7 +71,6 @@
private final GroupMapping mapping;
private final Provider<GroupCache> groupCache;
private final Schema<InternalGroup> schema;
- private final String type;
@AssistedInject
ElasticGroupIndex(
@@ -84,7 +83,6 @@
this.groupCache = groupCache;
this.mapping = new GroupMapping(schema, client.adapter());
this.schema = schema;
- this.type = client.adapter().getType(GROUPS);
}
@Override
