opendev/gerrit
Code Issues Proposed changes

ElasticIndexVersionDiscovery: Convert to Java stream API

Browse Source 
Change-Id: Icc0e99f5c0712c5a672848ec2352bf4e9abcf159
This commit is contained in:
David Pursehouse
2018-05-30 13:11:24 +09:00
parent 63e278fe44
commit c99a18c65d
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java
View File

@@ -14,16 +14,14 @@
package com.google.gerrit.elasticsearch; package com.google.gerrit.elasticsearch;
import com.google.gson.JsonElement; import static java.util.stream.Collectors.toList;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map.Entry;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
@@ -42,16 +40,14 @@ class ElasticIndexVersionDiscovery {
String name = prefix + indexName + "_"; String name = prefix + indexName + "_";
Response response = client.performRequest(HttpGet.METHOD_NAME, name + "*/_aliases"); Response response = client.performRequest(HttpGet.METHOD_NAME, name + "*/_aliases");
int statusCode = response.getStatusLine().getStatusCode(); if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
if (statusCode == HttpStatus.SC_OK) { return new JsonParser()
String content = AbstractElasticIndex.getContent(response); .parse(AbstractElasticIndex.getContent(response))
JsonObject object = new JsonParser().parse(content).getAsJsonObject(); .getAsJsonObject()
.entrySet()
List<String> versions = new ArrayList<>(object.size()); .stream()
for (Entry<String, JsonElement> entry : object.entrySet()) { .map(e -> e.getKey().replace(name, ""))
versions.add(entry.getKey().replace(name, "")); .collect(toList());
}
return versions;
} }
return Collections.emptyList(); return Collections.emptyList();
} }