diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-05-05 09:17:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-05 09:17:48 +0200 |
commit | b4a2e26f7edc3ab49ec4d799e74ac46be67ce0a4 (patch) | |
tree | e04568ce589ee11bc5eeb564d3900f0f6196cc2f /container-search | |
parent | 7f8c345dc82161b59a579c5786bc8f1cede452cb (diff) | |
parent | 8bad2af2fb2792ecfd6ba18bf45a02a915c7e278 (diff) |
Merge pull request #22454 from vespa-engine/bjorncs/annotations
Bjorncs/annotations [run-systemtest]
Diffstat (limited to 'container-search')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java | 4 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java index 025b567ce80..3eadf29489e 100644 --- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java +++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java @@ -1,11 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.handler; -import com.google.inject.Inject; +import ai.vespa.cloud.ZoneInfo; import com.yahoo.collections.Tuple2; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.component.Vtag; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.chain.Chain; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.QrSearchersConfig; @@ -55,7 +56,6 @@ import com.yahoo.statistics.Statistics; import com.yahoo.vespa.configdefinition.SpecialtokensConfig; import com.yahoo.yolean.Exceptions; import com.yahoo.yolean.trace.TraceNode; -import ai.vespa.cloud.ZoneInfo; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java index 47298cf645a..7bd66445512 100644 --- a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java +++ b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.schema; -import com.google.inject.Inject; import com.yahoo.api.annotations.Beta; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.QrSearchersConfig; import com.yahoo.search.Query; import com.yahoo.search.config.IndexInfoConfig; |