Revert "Merge pull request #7974 from vespa-engine/revert-7973-bratseth/search-container-deprecations"

This reverts commit 5767288d80e85940e675f7dd157f2b6c1d2ceeb5, reversing
changes made to 37de7ac33454363489156e06597bffb3422756dc.

7 files changed, 4 insertions, 36 deletions

diff --git a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java
index a3b8e4f29a2..7dabb52a233 100644
--- a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java
+++ b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java
@@ -76,7 +76,7 @@ public class GetDocSumsPacket extends Packet {
         boolean useQueryCache = query.getRanking().getQueryCache();
         // If feature cache is used we need to include the sessionId as key.
         if (useQueryCache) { // TODO: Move this decision (and the key) to ranking
-            query.getRanking().getProperties().put(sessionIdKey, query.getSessionId(false).toString());
+            query.getRanking().getProperties().put(sessionIdKey, query.getSessionId().toString());
         }
 
         // set the default features
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
index 7def8e744a6..d6e87e58fd8 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
@@ -372,7 +372,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
             s.append(" ranking.queryCache=true");
         }
         if (query.getGroupingSessionCache() || query.getRanking().getQueryCache()) {
-            s.append(" sessionId=").append(query.getSessionId(false));
+            s.append(" sessionId=").append(query.getSessionId());
         }
 
         List<Grouping> grouping = GroupingExecutor.getGroupingList(query);
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.java b/container-search/src/main/java/com/yahoo/search/Query.java
index b4adca2cef1..73335037b94 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -982,22 +982,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
      */
      public HttpRequest getHttpRequest() { return httpRequest; }
 
-    /**
-     * Returns the unique and stable session id of this query.
-     *
-     * @param create if true this is created if not already set
-     * @return the session id of this query, or null if not set and create is false
-     * @deprecated use getSessionId() or getSessionId(serverId) instead
-     */
-    @Deprecated
-    public SessionId getSessionId(boolean create) {
-        if ( ! create) return getSessionId();
-
-        if (requestId == null)
-            requestId = UniqueRequestId.next();
-        return new SessionId(requestId, getRanking().getProfile());
-    }
-
     /** Returns the session id of this query, or null if none is assigned */
     public SessionId getSessionId() {
         if (requestId == null) return null;
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/RpcFillInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/RpcFillInvoker.java
index fb72e8c77c9..578c447dfbe 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/RpcFillInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/RpcFillInvoker.java
@@ -110,7 +110,7 @@ public class RpcFillInvoker extends FillInvoker {
         Query query = result.getQuery();
         String rankProfile = query.getRanking().getProfile();
         byte[] serializedSlime = BinaryFormat
-                .encode(toSlime(rankProfile, summaryClass, query.getModel().getDocumentDb(), query.getSessionId(false), hits));
+                .encode(toSlime(rankProfile, summaryClass, query.getModel().getDocumentDb(), query.getSessionId(), hits));
         double timeoutSeconds = ((double) query.getTimeLeft() - 3.0) / 1000.0;
         Compressor.Compression compressionResult = resourcePool.compressor().compress(compression, serializedSlime);
         resourcePool.client().getDocsums(hits, node, compressionResult.type(), serializedSlime.length, compressionResult.data(),
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java
index b28e648be78..7c2e774f68b 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/GroupingExecutor.java
@@ -217,7 +217,7 @@ public class GroupingExecutor extends Searcher {
             baseRoot = origRoot.clone();
         }
         if (query.isTraceable(3) && query.getGroupingSessionCache()) {
-            query.trace("Grouping in " + (lastPass + 1) + " passes. SessionId='" + query.getSessionId(false) + "'.", 3);
+            query.trace("Grouping in " + (lastPass + 1) + " passes. SessionId='" + query.getSessionId() + "'.", 3);
         }
         for (int pass = 0; pass <= lastPass; ++pass) {
             boolean firstPass = (pass == 0);
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());