Remove Sever

2 files changed, 0 insertions, 16 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
index beb79acb893..3606e01ffe5 100644
--- a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
@@ -3,7 +3,6 @@ package com.yahoo.prelude.statistics;
 
 import com.yahoo.component.chain.dependencies.Before;
 import com.yahoo.concurrent.CopyOnWriteHashMap;
-import com.yahoo.container.Server;
 import com.yahoo.container.protect.Error;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.log.LogLevel;
@@ -18,9 +17,7 @@ import com.yahoo.search.result.ErrorHit;
 import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.search.searchchain.PhaseNames;
-import com.yahoo.statistics.Callback;
 import com.yahoo.statistics.Counter;
-import com.yahoo.statistics.Handle;
 import com.yahoo.statistics.Value;
 
 import java.util.HashMap;
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());