| commit | f2be2d6cd1e1b72c73a0c52157d06d235b57685a | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Tue Jun 12 21:45:48 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jun 12 21:45:48 2018 +0000 |
| tree | 9a8a84da503302f84fc5a97c74842409ca9307b6 | |
| parent | 941e75d65a0beb1b7179f1ec079f067dacdf7cbb [diff] | |
| parent | 554391d669da7436ef5cbd234873f771e85ad5a0 [diff] |
Merge "ElasticIndexVersionManager: remove unneeded type" into stable-2.14
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticConfiguration.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticConfiguration.java index 84dae7f..4184ec0 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticConfiguration.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticConfiguration.java
@@ -80,11 +80,11 @@ } } - public Config getConfig() { + Config getConfig() { return cfg; } - public String getIndexName(String name, int schemaVersion) { + String getIndexName(String name, int schemaVersion) { return String.format("%s%s_%04d", prefix, name, schemaVersion); }
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java index 5281ebe..54b4ca9 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java
@@ -34,7 +34,7 @@ public class ElasticQueryBuilder { - protected <T> QueryBuilder toQueryBuilder(Predicate<T> p) throws QueryParseException { + <T> QueryBuilder toQueryBuilder(Predicate<T> p) throws QueryParseException { if (p instanceof AndPredicate) { return and(p); } else if (p instanceof OrPredicate) {