opendev/gerrit
Code Issues Proposed changes

Merge "Fix: Default values for Elastic index.* config values"

Browse Source
This commit is contained in:
David Pursehouse
2017-04-24 08:45:54 +00:00
committed by Gerrit Code Review
parent 1b4a73c9dc 4985edf52f
commit 70236ba603
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import static java.util.stream.Collectors.toList;
import static org.apache.commons.codec.binary.Base64.decodeBase64; import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
@@ -86,9 +87,9 @@ abstract class AbstractElasticIndex<K, V> implements Index<K, V> {
this.schema = schema; this.schema = schema;
this.gson = new GsonBuilder().setFieldNamingPolicy(LOWER_CASE_WITH_UNDERSCORES).create(); this.gson = new GsonBuilder().setFieldNamingPolicy(LOWER_CASE_WITH_UNDERSCORES).create();
this.queryBuilder = new ElasticQueryBuilder(); this.queryBuilder = new ElasticQueryBuilder();
String protocol = getRequiredConfigOption(cfg, "protocol"); String protocol = MoreObjects.firstNonNull(cfg.getString("index", null, "protocol"), "http");
String hostname = getRequiredConfigOption(cfg, "hostname"); String hostname = MoreObjects.firstNonNull(cfg.getString("index", null, "hostname"), "localhost");
String port = getRequiredConfigOption(cfg, "port"); String port = String.valueOf(cfg.getInt("index", null, "port", 9200));
this.indexName = this.indexName =
String.format( String.format(
@@ -207,12 +208,6 @@ abstract class AbstractElasticIndex<K, V> implements Index<K, V> {
return builder.endObject().string(); return builder.endObject().string();
} }
private String getRequiredConfigOption(Config cfg, String name) {
String option = cfg.getString("index", null, name);
checkState(!Strings.isNullOrEmpty(option), "index." + name + " must be supplied");
return option;
}
private String buildUrl(String protocol, String hostname, String port) { private String buildUrl(String protocol, String hostname, String port) {
try { try {
return new URL(protocol, hostname, Integer.parseInt(port), "").toString(); return new URL(protocol, hostname, Integer.parseInt(port), "").toString();