diff options
author | Arnstein Ressem <aressem@gmail.com> | 2021-12-10 15:38:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-10 15:38:21 +0100 |
commit | 08555794357171dbd299d80ed3e8d353c7b79e9f (patch) | |
tree | b5dd60f1938f743c9798e401f3b29b30aad830a2 /container-core | |
parent | 8ff6429daf9a695f2fa5d45a8033c75fdadfcfe2 (diff) |
Revert "Add zone info to query profile context"
Diffstat (limited to 'container-core')
3 files changed, 0 insertions, 24 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index 910781f4e7d..7e4198bad0d 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -240,12 +240,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>hosted-zone-api</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java index 3ae28c2816d..99637e08b77 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java @@ -142,7 +142,6 @@ public class HandlersConfigurerTestWrapper { // Needed by e.g. SearchHandler bind(Linguistics.class).to(SimpleLinguistics.class).in(Scopes.SINGLETON); bind(Embedder.class).to(Embedder.FailingEmbedder.class).in(Scopes.SINGLETON); - bind(ai.vespa.cloud.ZoneInfo.class).to(MockZoneInfo.class); bind(ContainerThreadPool.class).to(SimpleContainerThreadpool.class); bind(Metric.class).to(MockMetric.class); } diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java deleted file mode 100644 index 11c14f8e581..00000000000 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.core.config.testutil; - -import ai.vespa.cloud.ZoneInfo; - -/** - * A ZoneInfo subclass which can be created (for injection) with an emopty constructor - * - * @author bratseth - */ -public class MockZoneInfo extends ZoneInfo { - - public MockZoneInfo() { - super(ZoneInfo.defaultInfo().application(), ZoneInfo.defaultInfo().zone()); - } - -} |