aboutsummaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-12-08 16:29:22 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-12-08 16:29:22 +0100
commitbf9d4b9ab1151de895f7e3375717d6e0ef1918e7 (patch)
tree7e131eab25d8c186605075c8327a328ca62e1f88 /container-search
parent4f11c490da2bee48a40e80cfbbfda9914457043c (diff)
Rename method 'future' => 'completeFuture'
Diffstat (limited to 'container-search')
-rw-r--r--container-search/abi-spec.json2
-rw-r--r--container-search/src/main/java/com/yahoo/search/result/HitGroup.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 28d1d2c217b..f7176b0982a 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -7705,7 +7705,7 @@
"public java.util.Set getFilled()",
"public com.yahoo.processing.response.IncomingData incoming()",
"public com.google.common.util.concurrent.ListenableFuture complete()",
- "public java.util.concurrent.CompletableFuture future()",
+ "public java.util.concurrent.CompletableFuture completeFuture()",
"public void addDataListener(java.lang.Runnable)",
"public void close()",
"public bridge synthetic com.yahoo.search.result.Hit clone()",
diff --git a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
index b3704c379fe..6d09bf66175 100644
--- a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
+++ b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
@@ -973,7 +973,7 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
return CompletableFutures.toGuavaListenableFuture(completedFuture);
}
- @Override public CompletableFuture<DataList<Hit>> future() { return completedFuture; }
+ @Override public CompletableFuture<DataList<Hit>> completeFuture() { return completedFuture; }
@Override
public void addDataListener(Runnable runnable) {