summaryrefslogtreecommitdiffstats
path: root/documentapi
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2020-09-21 12:37:40 +0200
committerGitHub <noreply@github.com>2020-09-21 12:37:40 +0200
commit7b03effca945dea607ed7a3c3debebda303992ab (patch)
treed83a49d4af8dcdc4c1f6cb9c73d5f169e4369cb6 /documentapi
parentb8e79b130ce75292ca398afda54eef76aa932a16 (diff)
Revert "Jonmv/async document v1"
Diffstat (limited to 'documentapi')
-rw-r--r--documentapi/abi-spec.json2
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java6
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/RemoveResponse.java6
-rw-r--r--documentapi/src/main/java/com/yahoo/documentapi/UpdateResponse.java6
4 files changed, 5 insertions, 15 deletions
diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json
index 6f5e6d66e2a..a28ce1ee6db 100644
--- a/documentapi/abi-spec.json
+++ b/documentapi/abi-spec.json
@@ -354,7 +354,6 @@
"methods": [
"public void <init>(long, boolean)",
"public boolean wasFound()",
- "public boolean isSuccess()",
"public int hashCode()",
"public boolean equals(java.lang.Object)",
"public java.lang.String toString()"
@@ -562,7 +561,6 @@
"methods": [
"public void <init>(long, boolean)",
"public boolean wasFound()",
- "public boolean isSuccess()",
"public int hashCode()",
"public boolean equals(java.lang.Object)",
"public java.lang.String toString()"
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java
index 7a9818ba4fd..308eafcd596 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java
@@ -27,9 +27,9 @@ import com.yahoo.config.subscription.ConfigSubscriber;
* <p>This class is the factory for creating the four session types mentioned above.</p>
*
* <p>There may be multiple implementations of the document api classes. If
- * default configuration is sufficient, simply inject a {@code DocumentAccess} to
- * obtain a running document access. If you instead create a concrete implementation, note that
- * there are running threads within an access object, so you must shut it down when done.</p>
+ * default configuration is sufficient, use the {@link #createDefault} method to
+ * return a running document access. Note that there are running threads within
+ * an access object, so you must shut it down when done.</p>
*
* <p>An implementation of the Document Api may support just a subset of the
* access types defined in this interface. For example, some document
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/RemoveResponse.java b/documentapi/src/main/java/com/yahoo/documentapi/RemoveResponse.java
index 2a7c6f45d95..502588a3d5f 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/RemoveResponse.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/RemoveResponse.java
@@ -12,7 +12,7 @@ public class RemoveResponse extends Response {
private final boolean wasFound;
public RemoveResponse(long requestId, boolean wasFound) {
- super(requestId, null, wasFound ? Outcome.SUCCESS : Outcome.NOT_FOUND);
+ super(requestId);
this.wasFound = wasFound;
}
@@ -21,10 +21,6 @@ public class RemoveResponse extends Response {
}
@Override
- // TODO: fix this when/if NOT_FOUND is no longer a success.
- public boolean isSuccess() { return super.isSuccess() || outcome() == Outcome.NOT_FOUND; }
-
- @Override
public int hashCode() {
return super.hashCode() + Boolean.valueOf(wasFound).hashCode();
}
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/UpdateResponse.java b/documentapi/src/main/java/com/yahoo/documentapi/UpdateResponse.java
index aca34a92a30..96bf58c1e64 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/UpdateResponse.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/UpdateResponse.java
@@ -12,7 +12,7 @@ public class UpdateResponse extends Response {
private final boolean wasFound;
public UpdateResponse(long requestId, boolean wasFound) {
- super(requestId, null, wasFound ? Outcome.SUCCESS : Outcome.NOT_FOUND);
+ super(requestId);
this.wasFound = wasFound;
}
@@ -21,10 +21,6 @@ public class UpdateResponse extends Response {
}
@Override
- // TODO: fix this when/if NOT_FOUND is no longer a success.
- public boolean isSuccess() { return super.isSuccess() || outcome() == Outcome.NOT_FOUND; }
-
- @Override
public int hashCode() {
return super.hashCode() + Boolean.valueOf(wasFound).hashCode();
}