Refactor provisioning of refresh parameter
Refresh parameters map is never changing. Move the instantiation to the
ctor and use this instance.
Change-Id: If5ac7ce119b92cbf7571b7f42dc9f773e1f2fffa
diff --git a/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
index a5d0435..6c93219 100644
--- a/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
+++ b/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
@@ -64,7 +64,6 @@
import java.net.URLEncoder;
import java.sql.Timestamp;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -129,6 +128,7 @@
private final Schema<V> schema;
private final SitePaths sitePaths;
private final String indexNameRaw;
+ private final Map<String, String> refreshParam;
protected final ElasticRestClientProvider client;
protected final String indexName;
@@ -149,6 +149,7 @@
this.indexName = config.getIndexName(indexName, schema.getVersion());
this.indexNameRaw = indexName;
this.client = client;
+ this.refreshParam = Map.of("refresh", "true");
}
@Override
@@ -174,7 +175,7 @@
@Override
public void delete(K id) {
String uri = getURI(BULK);
- Response response = postRequest(uri, getDeleteActions(id), getRefreshParam());
+ Response response = postRequestWithRefreshParam(uri, getDeleteActions(id));
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode != HttpStatus.SC_OK) {
throw new StorageException(
@@ -282,12 +283,6 @@
array.add(arrayElement);
}
- protected Map<String, String> getRefreshParam() {
- Map<String, String> params = new HashMap<>();
- params.put("refresh", "true");
- return params;
- }
-
protected String getSearch(SearchSourceBuilder searchSource, JsonArray sortArray) {
JsonObject search = new JsonParser().parse(searchSource.toString()).getAsJsonObject();
search.add("sort", sortArray);
@@ -311,8 +306,8 @@
}
}
- protected Response postRequest(String uri, Object payload, Map<String, String> params) {
- return performRequest("POST", uri, payload, params);
+ protected Response postRequestWithRefreshParam(String uri, Object payload) {
+ return performRequest("POST", uri, payload, refreshParam);
}
private String concatJsonString(String target, String addition) {
diff --git a/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
index 8967789..6d30c41 100644
--- a/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
+++ b/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
@@ -78,7 +78,7 @@
.add(new UpdateRequest<>(schema, as, ImmutableSet.of()));
String uri = getURI(BULK);
- Response response = postRequest(uri, bulk, getRefreshParam());
+ Response response = postRequestWithRefreshParam(uri, bulk);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode != HttpStatus.SC_OK) {
throw new StorageException(
diff --git a/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java b/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
index 7d4e0c7..70b2889 100644
--- a/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
+++ b/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
@@ -98,7 +98,7 @@
new IndexRequest(getId(cd), indexName).add(new UpdateRequest<>(schema, cd, skipFields));
String uri = getURI(BULK);
- Response response = postRequest(uri, bulk, getRefreshParam());
+ Response response = postRequestWithRefreshParam(uri, bulk);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode != HttpStatus.SC_OK) {
throw new StorageException(
diff --git a/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
index 781ed43..d45e58e 100644
--- a/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
+++ b/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
@@ -78,7 +78,7 @@
.add(new UpdateRequest<>(schema, group, ImmutableSet.of()));
String uri = getURI(BULK);
- Response response = postRequest(uri, bulk, getRefreshParam());
+ Response response = postRequestWithRefreshParam(uri, bulk);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode != HttpStatus.SC_OK) {
throw new StorageException(
diff --git a/src/main/java/com/google/gerrit/elasticsearch/ElasticProjectIndex.java b/src/main/java/com/google/gerrit/elasticsearch/ElasticProjectIndex.java
index b8bfc38..3433147 100644
--- a/src/main/java/com/google/gerrit/elasticsearch/ElasticProjectIndex.java
+++ b/src/main/java/com/google/gerrit/elasticsearch/ElasticProjectIndex.java
@@ -80,7 +80,7 @@
.add(new UpdateRequest<>(schema, projectState, ImmutableSet.of()));
String uri = getURI(BULK);
- Response response = postRequest(uri, bulk, getRefreshParam());
+ Response response = postRequestWithRefreshParam(uri, bulk);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode != HttpStatus.SC_OK) {
throw new StorageException(
