opendev/gerrit
Code Issues Proposed changes

Define ElasticQueryBuilder in AbstractElasticIndex instead of in each sub class

Browse Source 
Change-Id: Iba6e853d086181a8a2a45bc922fbc0f663a0689b
This commit is contained in:
David Pursehouse
2017-01-15 17:39:43 +09:00
parent 207b1ca532
commit 0578dd2160
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
View File

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

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
View File

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

3
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
View File

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

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
View File

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