summaryrefslogtreecommitdiff
path: root/core/src/test/java/org/elasticsearch/versioning
diff options
context:
space:
mode:
authorAlexander Lin <lin.alexander.2011@gmail.com>2016-07-29 11:21:43 -0700
committerNik Everett <nik9000@gmail.com>2016-07-29 14:21:43 -0400
commit119026b4fb645a7cccd0df64ccd9e91b8285827b (patch)
tree0e8d62b3e8ed55c79bcaa9af9eaef41077df6d57 /core/src/test/java/org/elasticsearch/versioning
parentc9790a12572485630954d46558b1e2f188225a25 (diff)
Remove isCreated and isFound from the Java API
This is cleanup work from #19566, where @nik9000 suggested trying to nuke the isCreated and isFound methods. I've combined nuking the two methods with removing UpdateHelper.Operation in favor of DocWriteResponse.Operation here. Closes #19631.
Diffstat (limited to 'core/src/test/java/org/elasticsearch/versioning')
-rw-r--r--core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java23
1 files changed, 12 insertions, 11 deletions
diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java
index 74b910bf2b..9964551238 100644
--- a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java
+++ b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java
@@ -20,6 +20,7 @@ package org.elasticsearch.versioning;
import org.apache.lucene.util.TestUtil;
import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.action.DocWriteResponse;
import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.action.delete.DeleteResponse;
import org.elasticsearch.action.index.IndexRequest;
@@ -58,7 +59,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
// Note - external version doesn't throw version conflicts on deletes of non existent records. This is different from internal versioning
DeleteResponse deleteResponse = client().prepareDelete("test", "type", "1").setVersion(17).setVersionType(VersionType.EXTERNAL).execute().actionGet();
- assertThat(deleteResponse.isFound(), equalTo(false));
+ assertEquals(DocWriteResponse.Operation.NOOP, deleteResponse.getOperation());
// this should conflict with the delete command transaction which told us that the object was deleted at version 17.
assertThrows(
@@ -97,7 +98,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
// deleting with a lower version works.
long v = randomIntBetween(12, 14);
DeleteResponse deleteResponse = client().prepareDelete("test", "type", "1").setVersion(v).setVersionType(VersionType.FORCE).get();
- assertThat(deleteResponse.isFound(), equalTo(true));
+ assertEquals(DocWriteResponse.Operation.DELETE, deleteResponse.getOperation());
assertThat(deleteResponse.getVersion(), equalTo(v));
}
@@ -132,7 +133,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
// Delete with a higher or equal version deletes all versions up to the given one.
long v = randomIntBetween(14, 17);
DeleteResponse deleteResponse = client().prepareDelete("test", "type", "1").setVersion(v).setVersionType(VersionType.EXTERNAL_GTE).execute().actionGet();
- assertThat(deleteResponse.isFound(), equalTo(true));
+ assertEquals(DocWriteResponse.Operation.DELETE, deleteResponse.getOperation());
assertThat(deleteResponse.getVersion(), equalTo(v));
// Deleting with a lower version keeps on failing after a delete.
@@ -143,7 +144,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
// But delete with a higher version is OK.
deleteResponse = client().prepareDelete("test", "type", "1").setVersion(18).setVersionType(VersionType.EXTERNAL_GTE).execute().actionGet();
- assertThat(deleteResponse.isFound(), equalTo(false));
+ assertEquals(DocWriteResponse.Operation.NOOP, deleteResponse.getOperation());
assertThat(deleteResponse.getVersion(), equalTo(18L));
}
@@ -174,7 +175,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
// Delete with a higher version deletes all versions up to the given one.
DeleteResponse deleteResponse = client().prepareDelete("test", "type", "1").setVersion(17).setVersionType(VersionType.EXTERNAL).execute().actionGet();
- assertThat(deleteResponse.isFound(), equalTo(true));
+ assertEquals(DocWriteResponse.Operation.DELETE, deleteResponse.getOperation());
assertThat(deleteResponse.getVersion(), equalTo(17L));
// Deleting with a lower version keeps on failing after a delete.
@@ -185,7 +186,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
// But delete with a higher version is OK.
deleteResponse = client().prepareDelete("test", "type", "1").setVersion(18).setVersionType(VersionType.EXTERNAL).execute().actionGet();
- assertThat(deleteResponse.isFound(), equalTo(false));
+ assertEquals(DocWriteResponse.Operation.NOOP, deleteResponse.getOperation());
assertThat(deleteResponse.getVersion(), equalTo(18L));
@@ -195,7 +196,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
deleteResponse = client().prepareDelete("test", "type", "1").setVersion(20).setVersionType(VersionType.EXTERNAL).execute().actionGet();
- assertThat(deleteResponse.isFound(), equalTo(true));
+ assertEquals(DocWriteResponse.Operation.DELETE, deleteResponse.getOperation());
assertThat(deleteResponse.getVersion(), equalTo(20L));
// Make sure that the next delete will be GC. Note we do it on the index settings so it will be cleaned up
@@ -280,7 +281,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
}
DeleteResponse deleteResponse = client().prepareDelete("test", "type", "1").setVersion(2).execute().actionGet();
- assertThat(deleteResponse.isFound(), equalTo(true));
+ assertEquals(DocWriteResponse.Operation.DELETE, deleteResponse.getOperation());
assertThat(deleteResponse.getVersion(), equalTo(3L));
assertThrows(client().prepareDelete("test", "type", "1").setVersion(2).execute(), VersionConflictEngineException.class);
@@ -289,7 +290,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
// This is intricate - the object was deleted but a delete transaction was with the right version. We add another one
// and thus the transaction is increased.
deleteResponse = client().prepareDelete("test", "type", "1").setVersion(3).execute().actionGet();
- assertThat(deleteResponse.isFound(), equalTo(false));
+ assertEquals(DocWriteResponse.Operation.NOOP, deleteResponse.getOperation());
assertThat(deleteResponse.getVersion(), equalTo(4L));
}
@@ -478,7 +479,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
sb.append(" version=");
sb.append(deleteResponse.getVersion());
sb.append(" found=");
- sb.append(deleteResponse.isFound());
+ sb.append(deleteResponse.getOperation() == DocWriteResponse.Operation.DELETE);
} else if (response instanceof IndexResponse) {
IndexResponse indexResponse = (IndexResponse) response;
sb.append(" index=");
@@ -490,7 +491,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
sb.append(" version=");
sb.append(indexResponse.getVersion());
sb.append(" created=");
- sb.append(indexResponse.isCreated());
+ sb.append(indexResponse.getOperation() == DocWriteResponse.Operation.CREATE);
} else {
sb.append(" response: " + response);
}