diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-19 15:55:59 +0100 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:30 +0100 |
commit | cdde1e9a15fc90bd1dad41d74d720325b1a3d1fd (patch) | |
tree | 9c755982943fd8cbe5a20ae1f6c88cfbb27abeda /container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java | |
parent | b743451d1ff4d3cc2846fccc819c1fa82156db97 (diff) |
Revert "Merge pull request #7974 from vespa-engine/revert-7973-bratseth/search-container-deprecations"
This reverts commit 5767288d80e85940e675f7dd157f2b6c1d2ceeb5, reversing
changes made to 37de7ac33454363489156e06597bffb3422756dc.
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java b/container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java index 49529936901..f57a5f4ab1e 100644 --- a/container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java +++ b/container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java @@ -1,8 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.query; -import com.yahoo.container.Server; - import java.util.concurrent.atomic.AtomicLong; /** @@ -27,17 +25,6 @@ public class UniqueRequestId { /** * Creates a session id which is unique across the cluster this runtime is a member of each time this is called. * Calling this causes synchronization. - * - * @deprecated use nextId(serverId) instead - */ - @Deprecated - public static UniqueRequestId next() { - return new UniqueRequestId(Server.get().getServerDiscriminator(), System.currentTimeMillis(), sequenceCounter.getAndIncrement()); - } - - /** - * Creates a session id which is unique across the cluster this runtime is a member of each time this is called. - * Calling this causes synchronization. */ public static UniqueRequestId next(String serverId) { return new UniqueRequestId(serverId, System.currentTimeMillis(), sequenceCounter.getAndIncrement()); |