Revert "Add zone info to query profile context"

1 files changed, 6 insertions, 25 deletions

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 786a0d0e04f..ddb8a392730 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -1,9 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search;
 
-import ai.vespa.cloud.Environment;
-import ai.vespa.cloud.Zone;
-import ai.vespa.cloud.ZoneInfo;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.yahoo.collections.Tuple2;
@@ -337,30 +334,22 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
     public Query(HttpRequest request, Map<String, String> requestMap, CompiledQueryProfile queryProfile) {
         super(new QueryPropertyAliases(propertyAliases));
         this.httpRequest = request;
-        init(requestMap, queryProfile, Embedder.throwsOnUse, ZoneInfo.defaultInfo());
+        init(requestMap, queryProfile, Embedder.throwsOnUse);
     }
 
     // TODO: Deprecate most constructors above here
 
     private Query(Builder builder) {
-        this(builder.getRequest(),
-             builder.getRequestMap(),
-             builder.getQueryProfile(),
-             builder.getEmbedder(),
-             builder.getZoneInfo());
+        this(builder.getRequest(), builder.getRequestMap(), builder.getQueryProfile(), builder.getEmbedder());
     }
 
-    private Query(HttpRequest request, Map<String, String> requestMap, CompiledQueryProfile queryProfile, Embedder embedder,
-                  ZoneInfo zoneInfo) {
+    private Query(HttpRequest request, Map<String, String> requestMap, CompiledQueryProfile queryProfile, Embedder embedder) {
         super(new QueryPropertyAliases(propertyAliases));
         this.httpRequest = request;
-        init(requestMap, queryProfile, embedder, zoneInfo);
+        init(requestMap, queryProfile, embedder);
     }
 
-    private void init(Map<String, String> requestMap,
-                      CompiledQueryProfile queryProfile,
-                      Embedder embedder,
-                      ZoneInfo zoneInfo) {
+    private void init(Map<String, String> requestMap, CompiledQueryProfile queryProfile, Embedder embedder) {
         startTime = httpRequest.getJDiscRequest().creationTime(TimeUnit.MILLISECONDS);
         if (queryProfile != null) {
             // Move all request parameters to the query profile just to validate that the parameter settings are legal
@@ -372,7 +361,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
             // Create the full chain
             properties().chain(new QueryProperties(this, queryProfile.getRegistry(), embedder)).
                          chain(new ModelObjectMap()).
-                         chain(new RequestContextProperties(requestMap, zoneInfo)).
+                         chain(new RequestContextProperties(requestMap)).
                          chain(queryProfileProperties).
                          chain(new DefaultProperties());
 
@@ -1142,7 +1131,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
         private Map<String, String> requestMap = null;
         private CompiledQueryProfile queryProfile = null;
         private Embedder embedder = Embedder.throwsOnUse;
-        private ZoneInfo zoneInfo = ZoneInfo.defaultInfo();
 
         public Builder setRequest(String query) {
             request = HttpRequest.createTestRequest(query, com.yahoo.jdisc.http.HttpRequest.Method.GET);
@@ -1187,13 +1175,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
 
         public Embedder getEmbedder() { return embedder; }
 
-        public Builder setZoneInfo(ZoneInfo zoneInfo) {
-            this.zoneInfo = zoneInfo;
-            return this;
-        }
-
-        public ZoneInfo getZoneInfo() { return zoneInfo; }
-
         /** Creates a new query from this builder. No properties are required to before calling this. */
         public Query build() { return new Query(this); }