AbstractElasticIndex: Rename getActions to getDeleteActions
The getActions method is only ever called from the delete(K) method to
add the actions for deleting an item. It's only needed because in the
change index implementation it is necessary to add multiple actions.
Rename it to getDeleteActions which is more aligned with its purpose.
Also clean up the parameter names in these methods. Instead of naming
them all 'c', which is leftover from when we only had the change index,
rename them to 'id' in the abstract class, and to 'a' and 'g' in the
account and group index implementations.
Change-Id: Ib1dde44f12147a5396b3296666aafefcd9e4846b
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
index 6f8fa06..d3e6043 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
@@ -116,13 +116,13 @@
}
@Override
- public void delete(K c) throws IOException {
+ public void delete(K id) throws IOException {
String uri = getURI(indexNameRaw, BULK);
- Response response = postRequest(addActions(c), uri, getRefreshParam());
+ Response response = postRequest(getDeleteActions(id), uri, getRefreshParam());
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode != HttpStatus.SC_OK) {
throw new IOException(
- String.format("Failed to delete %s from index %s: %s", c, indexName, statusCode));
+ String.format("Failed to delete %s from index %s: %s", id, indexName, statusCode));
}
}
@@ -150,15 +150,14 @@
}
}
- protected abstract String addActions(K c);
+ protected abstract String getDeleteActions(K id);
protected abstract String getMappings();
protected abstract String getId(V v);
- protected String delete(String type, K c) {
- String id = c.toString();
- return new DeleteRequest(id, indexNameRaw, type).toString();
+ protected String delete(String type, K id) {
+ return new DeleteRequest(id.toString(), indexNameRaw, type).toString();
}
protected void addNamedElement(String name, JsonObject element, JsonArray array) {
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
index c5ab967..178014c 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java
@@ -110,8 +110,8 @@
}
@Override
- protected String addActions(Account.Id c) {
- return delete(ACCOUNTS, c);
+ protected String getDeleteActions(Account.Id a) {
+ return delete(ACCOUNTS, a);
}
@Override
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
index 6882ab0..bf1d615 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java
@@ -167,7 +167,7 @@
}
@Override
- protected String addActions(Id c) {
+ protected String getDeleteActions(Id c) {
return delete(OPEN_CHANGES, c) + delete(CLOSED_CHANGES, c);
}
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
index 78fbf3c..86997cd 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java
@@ -107,8 +107,8 @@
}
@Override
- protected String addActions(AccountGroup.UUID c) {
- return delete(GROUPS, c);
+ protected String getDeleteActions(AccountGroup.UUID g) {
+ return delete(GROUPS, g);
}
@Override
