aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-10-15 15:29:15 +0200
committerJon Bratseth <bratseth@oath.com>2018-10-15 15:29:15 +0200
commitcca05eed1e416e207b9902bb78a147a9ec9ebdc8 (patch)
tree677e949a35acb6a886cd6eaacdd3b74abcf788b0 /container-search/src
parent2c7a55d649027e725b753d530fa02845ca8bce97 (diff)
Avoid deprecated method
Diffstat (limited to 'container-search/src')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/IndexFacts.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/Pong.java3
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java2
3 files changed, 3 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java b/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java
index 4da84394435..8343040be79 100644
--- a/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java
+++ b/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java
@@ -48,7 +48,7 @@ public class IndexFacts {
* @deprecated do not use
*/
// TODO: Make this package private in Vespa 7
- @Deprecated
+ @Deprecated // OK
public static final String unionName = "unionOfAllKnown";
/** A search definition which contains the union of all settings. */
diff --git a/container-search/src/main/java/com/yahoo/prelude/Pong.java b/container-search/src/main/java/com/yahoo/prelude/Pong.java
index 017fceb2942..de2a1a4d8fb 100644
--- a/container-search/src/main/java/com/yahoo/prelude/Pong.java
+++ b/container-search/src/main/java/com/yahoo/prelude/Pong.java
@@ -53,7 +53,8 @@ public class Pong {
*
* @deprecated do not use
*/
- @Deprecated
+ // TODO: Remove on Vespa 7
+ @Deprecated // OK
public Optional<PongPacket> getPongPacket() { return pongPacket; }
/** Returns the number of active documents in the backend responding in this Pong, if available */
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
index 9c10078fdc0..d0d57e874aa 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
@@ -518,8 +518,6 @@ public class FastSearcherTestCase {
Chain<Searcher> chain = new Chain<>(fastSearcher);
Execution e = new Execution(chain, Execution.Context.createContextStub());
Pong pong = e.ping(new Ping());
- assertTrue(pong.getPongPacket().isPresent());
- assertEquals(127, pong.getPongPacket().get().getDocstamp());
backend.shutdown();
server.dispatch.socket.close();
server.dispatch.connection.close();