From 69de25896c94431f894b9d8dda56e2f540bd7eb9 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 6 Jun 2022 18:36:08 +0200 Subject: Remove vespa-http-client on Vespa 8 --- .../src/main/resources/gui/_includes/search-api-reference.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'container-search-gui') diff --git a/container-search-gui/src/main/resources/gui/_includes/search-api-reference.html b/container-search-gui/src/main/resources/gui/_includes/search-api-reference.html index e7d9004e109..086ff293b14 100644 --- a/container-search-gui/src/main/resources/gui/_includes/search-api-reference.html +++ b/container-search-gui/src/main/resources/gui/_includes/search-api-reference.html @@ -184,7 +184,7 @@ -
  • Vespa Feeding Client API
    • +
  • Vespa Feeding Client API
    • -- cgit v1.2.3 From 23d34618733d9c67270ebbfe01aac72750a47241 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Wed, 8 Jun 2022 01:22:39 +0200 Subject: Set project version to 8-SNAPSHOT --- abi-check-plugin/pom.xml | 4 ++-- annotations/pom.xml | 4 ++-- application-model/pom.xml | 4 ++-- application-preprocessor/pom.xml | 4 ++-- application/pom.xml | 4 ++-- athenz-identity-provider-service/pom.xml | 2 +- bundle-plugin-test/integration-test/pom.xml | 4 ++-- bundle-plugin-test/pom.xml | 4 ++-- .../test-bundles/artifact-version-for-exports-dep/pom.xml | 4 ++-- bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml | 4 ++-- bundle-plugin-test/test-bundles/main/pom.xml | 4 ++-- bundle-plugin-test/test-bundles/pom.xml | 4 ++-- bundle-plugin/pom.xml | 4 ++-- client/pom.xml | 4 ++-- cloud-tenant-base-dependencies-enforcer/pom.xml | 4 ++-- cloud-tenant-base/pom.xml | 4 ++-- cloud-tenant-cd/pom.xml | 2 +- clustercontroller-apps/pom.xml | 4 ++-- clustercontroller-core/pom.xml | 4 ++-- clustercontroller-reindexer/pom.xml | 2 +- clustercontroller-utils/pom.xml | 4 ++-- component/pom.xml | 4 ++-- config-application-package/pom.xml | 4 ++-- config-bundle/pom.xml | 4 ++-- config-class-plugin/pom.xml | 4 ++-- config-lib/pom.xml | 4 ++-- config-model-api/pom.xml | 4 ++-- config-model-fat/pom.xml | 4 ++-- config-model/pom.xml | 4 ++-- config-provisioning/pom.xml | 2 +- config-proxy/pom.xml | 4 ++-- config/pom.xml | 4 ++-- config_test/pom.xml | 2 +- configdefinitions/pom.xml | 4 ++-- configgen/pom.xml | 4 ++-- configserver-flags/pom.xml | 4 ++-- configserver/pom.xml | 4 ++-- container-apache-http-client-bundle/pom.xml | 4 ++-- container-core/pom.xml | 4 ++-- container-dependencies-enforcer/pom.xml | 4 ++-- container-dependency-versions/pom.xml | 2 +- container-dev/pom.xml | 4 ++-- container-disc/pom.xml | 4 ++-- container-documentapi/pom.xml | 4 ++-- container-integration-test/pom.xml | 4 ++-- container-messagebus/pom.xml | 4 ++-- container-search-and-docproc/pom.xml | 4 ++-- container-search-gui/pom.xml | 4 ++-- container-search/pom.xml | 4 ++-- container-test/pom.xml | 4 ++-- container/pom.xml | 4 ++-- controller-api/pom.xml | 4 ++-- controller-server/pom.xml | 4 ++-- defaults/pom.xml | 4 ++-- docproc/pom.xml | 4 ++-- docprocs/pom.xml | 4 ++-- document/pom.xml | 4 ++-- documentapi-dependencies/pom.xml | 4 ++-- documentapi/pom.xml | 4 ++-- documentgen-test/pom.xml | 4 ++-- fat-model-dependencies/pom.xml | 4 ++-- fileacquirer/pom.xml | 4 ++-- filedistribution/pom.xml | 4 ++-- flags/pom.xml | 4 ++-- fsa/pom.xml | 4 ++-- hosted-api/pom.xml | 2 +- hosted-tenant-base/pom.xml | 2 +- hosted-zone-api/pom.xml | 2 +- http-client/pom.xml | 2 +- http-utils/pom.xml | 4 ++-- indexinglanguage/pom.xml | 4 ++-- integration/intellij/pom.xml | 2 +- jaxrs_utils/pom.xml | 4 ++-- jdisc-cloud-aws/pom.xml | 4 ++-- jdisc-security-filters/pom.xml | 4 ++-- jdisc_core/pom.xml | 4 ++-- jdisc_core_test/integration_test/pom.xml | 4 ++-- jdisc_core_test/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-a/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-b-priv/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-ca/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-dj/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-ej-priv/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-f-more/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-g-act/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-h-log/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-a/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-b/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-ca/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-dc/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-eab/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-fac/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-gg/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-hi/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-ih/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-j-priv/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-l1-dup/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-l1/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-l2/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-ml-dup/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-ml/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-nac/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-oa-path/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-p-jar/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-q-frag/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-rq/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-s-act/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-tp/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-us/pom.xml | 4 ++-- jdisc_core_test/test_bundles/my-bundle-activator/pom.xml | 4 ++-- jdisc_core_test/test_bundles/my-guice-module/pom.xml | 4 ++-- jdisc_core_test/test_bundles/my-server-provider/pom.xml | 4 ++-- jdisc_core_test/test_bundles/pom.xml | 4 ++-- jdisc_jetty/pom.xml | 4 ++-- jrt/pom.xml | 4 ++-- linguistics-components/pom.xml | 4 ++-- linguistics/pom.xml | 4 ++-- logd/pom.xml | 4 ++-- logserver/pom.xml | 4 ++-- maven-plugins/pom.xml | 4 ++-- messagebus/pom.xml | 4 ++-- metrics-proxy/pom.xml | 4 ++-- metrics/pom.xml | 4 ++-- model-evaluation/pom.xml | 4 ++-- model-integration/pom.xml | 4 ++-- node-admin/pom.xml | 4 ++-- node-repository/pom.xml | 4 ++-- orchestrator-restapi/pom.xml | 4 ++-- orchestrator/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 2 +- predicate-search-core/pom.xml | 4 ++-- predicate-search/pom.xml | 4 ++-- provided-dependencies/pom.xml | 4 ++-- routing-generator/pom.xml | 4 ++-- searchcore/pom.xml | 4 ++-- searchlib/pom.xml | 4 ++-- searchsummary/pom.xml | 4 ++-- security-tools/pom.xml | 4 ++-- security-utils/pom.xml | 4 ++-- service-monitor/pom.xml | 4 ++-- socket_test/pom.xml | 4 ++-- standalone-container/pom.xml | 4 ++-- storage/pom.xml | 4 ++-- streamingvisitors/pom.xml | 4 ++-- tenant-base/pom.xml | 2 +- tenant-cd-api/pom.xml | 2 +- tenant-cd-commons/pom.xml | 2 +- testutil/pom.xml | 4 ++-- vdslib/pom.xml | 4 ++-- vespa-3party-bundles/pom.xml | 4 ++-- vespa-application-maven-plugin/pom.xml | 4 ++-- vespa-athenz/pom.xml | 4 ++-- vespa-documentgen-plugin/pom.xml | 4 ++-- vespa-feed-client-api/pom.xml | 4 ++-- vespa-feed-client-cli/pom.xml | 4 ++-- vespa-feed-client/pom.xml | 4 ++-- vespa-hadoop/pom.xml | 4 ++-- vespa-maven-plugin/pom.xml | 2 +- vespa-osgi-testrunner/pom.xml | 2 +- vespa-testrunner-components/pom.xml | 2 +- vespa_feed_perf/pom.xml | 4 ++-- vespaclient-container-plugin/pom.xml | 4 ++-- vespaclient-core/pom.xml | 4 ++-- vespaclient-java/pom.xml | 4 ++-- vespajlib/pom.xml | 4 ++-- vespalog/pom.xml | 4 ++-- yolean/pom.xml | 4 ++-- zkfacade/pom.xml | 4 ++-- zookeeper-client-common/pom.xml | 4 ++-- zookeeper-command-line-client/pom.xml | 4 ++-- zookeeper-server/pom.xml | 4 ++-- zookeeper-server/zookeeper-server-3.7.1/pom.xml | 4 ++-- zookeeper-server/zookeeper-server-common/pom.xml | 4 ++-- zookeeper-server/zookeeper-server/pom.xml | 4 ++-- 176 files changed, 334 insertions(+), 334 deletions(-) (limited to 'container-search-gui') diff --git a/abi-check-plugin/pom.xml b/abi-check-plugin/pom.xml index 8d782b1d426..d24765a5f88 100644 --- a/abi-check-plugin/pom.xml +++ b/abi-check-plugin/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml abi-check-plugin - 7-SNAPSHOT + 8-SNAPSHOT maven-plugin ${project.artifactId} Maven Plugin for ensuring ABI stability. diff --git a/annotations/pom.xml b/annotations/pom.xml index 358188f71c2..e3f5455c88b 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml annotations bundle - 7-SNAPSHOT + 8-SNAPSHOT annotations Public API annotations diff --git a/application-model/pom.xml b/application-model/pom.xml index 7eac247e249..2143f3a5ffd 100644 --- a/application-model/pom.xml +++ b/application-model/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml application-model container-plugin - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Model classes for Vespa application entities such as host name, application id etc. diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index 644903e79dd..f8b521140f7 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml application-preprocessor jar - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/application/pom.xml b/application/pom.xml index ceb8653cd1c..b0036b3ca3e 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml application jar - 7-SNAPSHOT + 8-SNAPSHOT Runs an application directly from services.xml diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index 08521216736..d5e6b85f571 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -10,7 +10,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/bundle-plugin-test/integration-test/pom.xml b/bundle-plugin-test/integration-test/pom.xml index 5f9192b064b..a97d30fbaec 100644 --- a/bundle-plugin-test/integration-test/pom.xml +++ b/bundle-plugin-test/integration-test/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa.bundle-plugin bundle-plugin-test - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml integration-test - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index 0500e69acb3..16dd1238f53 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa.bundle-plugin bundle-plugin-test - 7-SNAPSHOT + 8-SNAPSHOT pom integration-test diff --git a/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml b/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml index e4ef18d179d..6d8095c2153 100644 --- a/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml +++ b/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml @@ -8,7 +8,7 @@ com.yahoo.vespa.bundle-plugin test-bundles - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml artifact-version-for-exports-dep @@ -16,7 +16,7 @@ But version is set to the release version by build scripts before building. Then, the dependent bundle will not find the artifact. Skipping this step for a sub-module seems impossible with the maven-versions-plugin, and cumbersome with factorylib. --> - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml b/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml index ede831adfbc..289d2f67eb0 100644 --- a/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml +++ b/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa.bundle-plugin test-bundles - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml artifact-version-for-exports - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/bundle-plugin-test/test-bundles/main/pom.xml b/bundle-plugin-test/test-bundles/main/pom.xml index 8153d46bcb7..b5f8f7b9a6a 100644 --- a/bundle-plugin-test/test-bundles/main/pom.xml +++ b/bundle-plugin-test/test-bundles/main/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa.bundle-plugin test-bundles - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml main - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/bundle-plugin-test/test-bundles/pom.xml b/bundle-plugin-test/test-bundles/pom.xml index faddeafc76d..3af10826adc 100644 --- a/bundle-plugin-test/test-bundles/pom.xml +++ b/bundle-plugin-test/test-bundles/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa.bundle-plugin bundle-plugin-test - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml test-bundles - 7-SNAPSHOT + 8-SNAPSHOT pom diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 7993dfecafd..be5d2d59de2 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml bundle-plugin - 7-SNAPSHOT + 8-SNAPSHOT maven-plugin ${project.artifactId} Maven Plugin for creating OSGi bundles for the JDisc Container. diff --git a/client/pom.xml b/client/pom.xml index 190b0a4a73f..065cb2c4317 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -8,13 +8,13 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml client jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index ace3ba946e9..116ba1ba403 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa cloud-tenant-base - 7-SNAPSHOT + 8-SNAPSHOT ../cloud-tenant-base/pom.xml cloud-tenant-base-dependencies-enforcer - 7-SNAPSHOT + 8-SNAPSHOT pom diff --git a/cloud-tenant-base/pom.xml b/cloud-tenant-base/pom.xml index bb4171bd096..64ed23b6c33 100644 --- a/cloud-tenant-base/pom.xml +++ b/cloud-tenant-base/pom.xml @@ -7,7 +7,7 @@ cloud-tenant-base Vespa Cloud tenant base - 7-SNAPSHOT + 8-SNAPSHOT Parent POM for all Vespa Cloud applications. https://github.com/vespa-engine pom @@ -15,7 +15,7 @@ hosted-tenant-base com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../hosted-tenant-base/pom.xml diff --git a/cloud-tenant-cd/pom.xml b/cloud-tenant-cd/pom.xml index ec23337f82b..baccbab54f5 100644 --- a/cloud-tenant-cd/pom.xml +++ b/cloud-tenant-cd/pom.xml @@ -13,7 +13,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent diff --git a/clustercontroller-apps/pom.xml b/clustercontroller-apps/pom.xml index 4b90f3c6ca9..fa0f5c064ad 100644 --- a/clustercontroller-apps/pom.xml +++ b/clustercontroller-apps/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml clustercontroller-apps - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 7a3ccaf61f4..243b69bf1e2 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml clustercontroller-core - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/clustercontroller-reindexer/pom.xml b/clustercontroller-reindexer/pom.xml index f39922e0379..42e746c1bae 100644 --- a/clustercontroller-reindexer/pom.xml +++ b/clustercontroller-reindexer/pom.xml @@ -6,7 +6,7 @@ parent com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/clustercontroller-utils/pom.xml b/clustercontroller-utils/pom.xml index bf97dbd79ae..03a368ed667 100644 --- a/clustercontroller-utils/pom.xml +++ b/clustercontroller-utils/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml clustercontroller-utils - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/component/pom.xml b/component/pom.xml index 40837457b17..a4330957069 100755 --- a/component/pom.xml +++ b/component/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml component container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index 869e161f57d..3d471f1c94b 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-application-package container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index e8409bc1bbe..50205f9fe71 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-bundle container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index 50471514cc0..26dac276ea2 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-class-plugin maven-plugin - 7-SNAPSHOT + 8-SNAPSHOT config-class-plugin (Vespa ConfigGen Plugin) diff --git a/config-lib/pom.xml b/config-lib/pom.xml index 7c13bd22227..ea72afb568d 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-lib container-plugin - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index 3e83a6dfddf..1d28965fa3c 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-model-api - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index 96cafd4ec0f..44880d052b6 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-model-fat bundle - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/config-model/pom.xml b/config-model/pom.xml index 7e705cfa0aa..13af9d38263 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-model container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml index c7616b2187a..119931465bf 100644 --- a/config-provisioning/pom.xml +++ b/config-provisioning/pom.xml @@ -5,7 +5,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 95cbac62dda..4272cf6617e 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-proxy jar - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/config/pom.xml b/config/pom.xml index f7098bfa6ce..f787a7b0b49 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/config_test/pom.xml b/config_test/pom.xml index b87ac3aed7c..dc35b53510b 100644 --- a/config_test/pom.xml +++ b/config_test/pom.xml @@ -6,7 +6,7 @@ com.yahoo.vespa config_test container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 0f4f1ddbad3..47cc106c789 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml configdefinitions container-plugin - 7-SNAPSHOT + 8-SNAPSHOT configdefinitions diff --git a/configgen/pom.xml b/configgen/pom.xml index ad8e1672dad..11d6a195bc6 100644 --- a/configgen/pom.xml +++ b/configgen/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml configgen jar - 7-SNAPSHOT + 8-SNAPSHOT configgen Config java code generation from config definition files for Java Vespa components. diff --git a/configserver-flags/pom.xml b/configserver-flags/pom.xml index 51eee97455f..a2a90483e75 100644 --- a/configserver-flags/pom.xml +++ b/configserver-flags/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml configserver-flags - 7-SNAPSHOT + 8-SNAPSHOT container-plugin Config Server Flags. diff --git a/configserver/pom.xml b/configserver/pom.xml index a307772376a..86289a46d19 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml configserver container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 9be054570e0..036a378da3a 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-search-and-docproc - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/container-search-gui/pom.xml b/container-search-gui/pom.xml index 3f6f7f48921..d0c6706189d 100644 --- a/container-search-gui/pom.xml +++ b/container-search-gui/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-search-gui container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.google.inject diff --git a/container-search/pom.xml b/container-search/pom.xml index adf4e7d9269..e29445f5564 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-search jar - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/container-test/pom.xml b/container-test/pom.xml index c8ead0089d1..91519da6dd3 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -10,11 +10,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-test - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/container/pom.xml b/container/pom.xml index 0b6bef77282..b2a3a1baef8 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -10,11 +10,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/controller-api/pom.xml b/controller-api/pom.xml index 580809c4181..f7057c93561 100644 --- a/controller-api/pom.xml +++ b/controller-api/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml controller-api container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/controller-server/pom.xml b/controller-server/pom.xml index ff7367e03b2..773d63202b6 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml controller-server container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/defaults/pom.xml b/defaults/pom.xml index 86872b6d700..ffafc683fd6 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -7,13 +7,13 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa defaults container-plugin - 7-SNAPSHOT + 8-SNAPSHOT defaults Library with the defaults for Vespa. diff --git a/docproc/pom.xml b/docproc/pom.xml index d758606f8b7..e7d8d6e3a3e 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml docproc jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/docprocs/pom.xml b/docprocs/pom.xml index 7ad13ce83e1..42ae75e36f1 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml docprocs container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/document/pom.xml b/document/pom.xml index 06488d799eb..5db432d2447 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml document - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/documentapi-dependencies/pom.xml b/documentapi-dependencies/pom.xml index 7a977a36842..25552700528 100644 --- a/documentapi-dependencies/pom.xml +++ b/documentapi-dependencies/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml documentapi-dependencies pom - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/documentapi/pom.xml b/documentapi/pom.xml index 7d91e246cfe..9b690f345ae 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml documentapi jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index c9c62316464..1898872c1a0 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml documentgen-test jar - 7-SNAPSHOT + 8-SNAPSHOT documentgen_test Tests for vespa-documentgen-plugin diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml index 5c489662842..180a39778a8 100644 --- a/fat-model-dependencies/pom.xml +++ b/fat-model-dependencies/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml fat-model-dependencies pom - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/fileacquirer/pom.xml b/fileacquirer/pom.xml index 1a85849fd98..ed02667b2a0 100644 --- a/fileacquirer/pom.xml +++ b/fileacquirer/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml fileacquirer - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 9dca254cebe..7916698b62c 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml filedistribution - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/flags/pom.xml b/flags/pom.xml index e853f869228..6eaecc35c47 100644 --- a/flags/pom.xml +++ b/flags/pom.xml @@ -8,13 +8,13 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml flags container-plugin - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Feature flags diff --git a/fsa/pom.xml b/fsa/pom.xml index db863ba5522..5d18bdb666c 100644 --- a/fsa/pom.xml +++ b/fsa/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml fsa container-plugin - 7-SNAPSHOT + 8-SNAPSHOT This is the FSA library and tools, an implementation of finite state automata (FSA) and related algorithms. diff --git a/hosted-api/pom.xml b/hosted-api/pom.xml index a9d8e7eee46..6f7c6186ece 100644 --- a/hosted-api/pom.xml +++ b/hosted-api/pom.xml @@ -8,7 +8,7 @@ parent com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml hosted-api diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 6eaeb508322..7e68f2e1acb 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -7,7 +7,7 @@ com.yahoo.vespa hosted-tenant-base - 7-SNAPSHOT + 8-SNAPSHOT Base pom for all tenant base poms Parent POM for all Vespa base poms. https://github.com/vespa-engine diff --git a/hosted-zone-api/pom.xml b/hosted-zone-api/pom.xml index ea3b035618b..87012df8479 100644 --- a/hosted-zone-api/pom.xml +++ b/hosted-zone-api/pom.xml @@ -5,7 +5,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml hosted-zone-api diff --git a/http-client/pom.xml b/http-client/pom.xml index 75e9bdc27cb..49512c09a72 100644 --- a/http-client/pom.xml +++ b/http-client/pom.xml @@ -8,7 +8,7 @@ parent com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-plugin diff --git a/http-utils/pom.xml b/http-utils/pom.xml index 4a84fb820eb..52dac0cfeea 100644 --- a/http-utils/pom.xml +++ b/http-utils/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml http-utils jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index 48fa89c428e..040a13efc91 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml indexinglanguage jar - 7-SNAPSHOT + 8-SNAPSHOT indexinglanguage Interpreter for the Indexing Language diff --git a/integration/intellij/pom.xml b/integration/intellij/pom.xml index dfc44ab9dc2..d7146a60f7a 100644 --- a/integration/intellij/pom.xml +++ b/integration/intellij/pom.xml @@ -5,7 +5,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-intellij diff --git a/jaxrs_utils/pom.xml b/jaxrs_utils/pom.xml index 492bc095a57..cb7839bc73d 100644 --- a/jaxrs_utils/pom.xml +++ b/jaxrs_utils/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jaxrs_utils - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml index 41259a7fb42..5ae3e056309 100644 --- a/jdisc-cloud-aws/pom.xml +++ b/jdisc-cloud-aws/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jdisc-cloud-aws - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/jdisc-security-filters/pom.xml b/jdisc-security-filters/pom.xml index d27055d592e..dcfb61de3cc 100644 --- a/jdisc-security-filters/pom.xml +++ b/jdisc-security-filters/pom.xml @@ -7,12 +7,12 @@ 4.0.0 jdisc-security-filters container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 8d09ea1198f..3ab469983c5 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jdisc_core - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/jdisc_core_test/integration_test/pom.xml b/jdisc_core_test/integration_test/pom.xml index 7aadee990c6..cee12f1b26a 100644 --- a/jdisc_core_test/integration_test/pom.xml +++ b/jdisc_core_test/integration_test/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core integration-test-parent - 7-SNAPSHOT + 8-SNAPSHOT integration_test - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/jdisc_core_test/pom.xml b/jdisc_core_test/pom.xml index 4216c25266e..0cf340e907a 100644 --- a/jdisc_core_test/pom.xml +++ b/jdisc_core_test/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa.jdisc_core integration-test-parent - 7-SNAPSHOT + 8-SNAPSHOT pom ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-a/pom.xml b/jdisc_core_test/test_bundles/app-a/pom.xml index 9b8304284ae..b13b4b699c7 100644 --- a/jdisc_core_test/test_bundles/app-a/pom.xml +++ b/jdisc_core_test/test_bundles/app-a/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-a - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-b-priv/pom.xml b/jdisc_core_test/test_bundles/app-b-priv/pom.xml index 3b595562718..852f70441cc 100644 --- a/jdisc_core_test/test_bundles/app-b-priv/pom.xml +++ b/jdisc_core_test/test_bundles/app-b-priv/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-b-priv - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-ca/pom.xml b/jdisc_core_test/test_bundles/app-ca/pom.xml index 6126af80de0..ce2d977c2a5 100644 --- a/jdisc_core_test/test_bundles/app-ca/pom.xml +++ b/jdisc_core_test/test_bundles/app-ca/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-ca - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-dj/pom.xml b/jdisc_core_test/test_bundles/app-dj/pom.xml index e17020bdd0c..9f6bae624dc 100644 --- a/jdisc_core_test/test_bundles/app-dj/pom.xml +++ b/jdisc_core_test/test_bundles/app-dj/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-dj - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-ej-priv/pom.xml b/jdisc_core_test/test_bundles/app-ej-priv/pom.xml index 7d55bfbe895..fb05e6bca86 100644 --- a/jdisc_core_test/test_bundles/app-ej-priv/pom.xml +++ b/jdisc_core_test/test_bundles/app-ej-priv/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-ej-priv - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-f-more/pom.xml b/jdisc_core_test/test_bundles/app-f-more/pom.xml index a488b333092..00fd8977c06 100644 --- a/jdisc_core_test/test_bundles/app-f-more/pom.xml +++ b/jdisc_core_test/test_bundles/app-f-more/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-f-more - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-g-act/pom.xml b/jdisc_core_test/test_bundles/app-g-act/pom.xml index a8389b8ce33..ea849ad295d 100644 --- a/jdisc_core_test/test_bundles/app-g-act/pom.xml +++ b/jdisc_core_test/test_bundles/app-g-act/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-g-act - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-h-log/pom.xml b/jdisc_core_test/test_bundles/app-h-log/pom.xml index 99a82c5e9b1..e1e0c2e8de3 100644 --- a/jdisc_core_test/test_bundles/app-h-log/pom.xml +++ b/jdisc_core_test/test_bundles/app-h-log/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-h-log - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-a/pom.xml b/jdisc_core_test/test_bundles/cert-a/pom.xml index 68986875b56..17decc78ffd 100644 --- a/jdisc_core_test/test_bundles/cert-a/pom.xml +++ b/jdisc_core_test/test_bundles/cert-a/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-a - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-b/pom.xml b/jdisc_core_test/test_bundles/cert-b/pom.xml index 287d914cebc..587826a64b1 100644 --- a/jdisc_core_test/test_bundles/cert-b/pom.xml +++ b/jdisc_core_test/test_bundles/cert-b/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-b - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-ca/pom.xml b/jdisc_core_test/test_bundles/cert-ca/pom.xml index 32b9b1e58f9..37621a927ef 100644 --- a/jdisc_core_test/test_bundles/cert-ca/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ca/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-ca - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-dc/pom.xml b/jdisc_core_test/test_bundles/cert-dc/pom.xml index 77bb210fc87..114ab11d96d 100644 --- a/jdisc_core_test/test_bundles/cert-dc/pom.xml +++ b/jdisc_core_test/test_bundles/cert-dc/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-dc - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-eab/pom.xml b/jdisc_core_test/test_bundles/cert-eab/pom.xml index 7870603defe..09f432f42dc 100644 --- a/jdisc_core_test/test_bundles/cert-eab/pom.xml +++ b/jdisc_core_test/test_bundles/cert-eab/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-eab - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-fac/pom.xml b/jdisc_core_test/test_bundles/cert-fac/pom.xml index 9bc7c947862..b7beb071edc 100644 --- a/jdisc_core_test/test_bundles/cert-fac/pom.xml +++ b/jdisc_core_test/test_bundles/cert-fac/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-fac - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-gg/pom.xml b/jdisc_core_test/test_bundles/cert-gg/pom.xml index 09c90f2c146..7ecfca57bcc 100644 --- a/jdisc_core_test/test_bundles/cert-gg/pom.xml +++ b/jdisc_core_test/test_bundles/cert-gg/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-gg - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-hi/pom.xml b/jdisc_core_test/test_bundles/cert-hi/pom.xml index b4d66abca2c..82e5d9f1d81 100644 --- a/jdisc_core_test/test_bundles/cert-hi/pom.xml +++ b/jdisc_core_test/test_bundles/cert-hi/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-hi - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-ih/pom.xml b/jdisc_core_test/test_bundles/cert-ih/pom.xml index 5797fdd145b..0d546f96965 100644 --- a/jdisc_core_test/test_bundles/cert-ih/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ih/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-ih - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-j-priv/pom.xml b/jdisc_core_test/test_bundles/cert-j-priv/pom.xml index 65383b2cddb..0d818144820 100644 --- a/jdisc_core_test/test_bundles/cert-j-priv/pom.xml +++ b/jdisc_core_test/test_bundles/cert-j-priv/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-j-priv - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml index e9ad347905b..b810c0fb19f 100644 --- a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml +++ b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-k-pkgs - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-l1-dup/pom.xml b/jdisc_core_test/test_bundles/cert-l1-dup/pom.xml index 3eef44629ab..f48fd1e66f6 100644 --- a/jdisc_core_test/test_bundles/cert-l1-dup/pom.xml +++ b/jdisc_core_test/test_bundles/cert-l1-dup/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-l1-dup - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-l1/pom.xml b/jdisc_core_test/test_bundles/cert-l1/pom.xml index e89eeae449e..afee36532d4 100644 --- a/jdisc_core_test/test_bundles/cert-l1/pom.xml +++ b/jdisc_core_test/test_bundles/cert-l1/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-l1 - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-l2/pom.xml b/jdisc_core_test/test_bundles/cert-l2/pom.xml index b00e1ecaec2..31fe9b1a6f2 100644 --- a/jdisc_core_test/test_bundles/cert-l2/pom.xml +++ b/jdisc_core_test/test_bundles/cert-l2/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-l2 - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-ml-dup/pom.xml b/jdisc_core_test/test_bundles/cert-ml-dup/pom.xml index 021d14a1336..703c1ff73cb 100644 --- a/jdisc_core_test/test_bundles/cert-ml-dup/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ml-dup/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-ml-dup - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-ml/pom.xml b/jdisc_core_test/test_bundles/cert-ml/pom.xml index f3e9013ce97..30e12cc35aa 100644 --- a/jdisc_core_test/test_bundles/cert-ml/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ml/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-ml - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-nac/pom.xml b/jdisc_core_test/test_bundles/cert-nac/pom.xml index fe88e4cdd4f..73e4e62887e 100644 --- a/jdisc_core_test/test_bundles/cert-nac/pom.xml +++ b/jdisc_core_test/test_bundles/cert-nac/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-nac - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-oa-path/pom.xml b/jdisc_core_test/test_bundles/cert-oa-path/pom.xml index cdc16200b11..621822f76eb 100644 --- a/jdisc_core_test/test_bundles/cert-oa-path/pom.xml +++ b/jdisc_core_test/test_bundles/cert-oa-path/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-oa-path - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-p-jar/pom.xml b/jdisc_core_test/test_bundles/cert-p-jar/pom.xml index 1d6fe7bba4c..817bb7d3451 100644 --- a/jdisc_core_test/test_bundles/cert-p-jar/pom.xml +++ b/jdisc_core_test/test_bundles/cert-p-jar/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-p-jar - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-q-frag/pom.xml b/jdisc_core_test/test_bundles/cert-q-frag/pom.xml index 563e4eb60d4..b57d04be877 100644 --- a/jdisc_core_test/test_bundles/cert-q-frag/pom.xml +++ b/jdisc_core_test/test_bundles/cert-q-frag/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-q-frag - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-rq/pom.xml b/jdisc_core_test/test_bundles/cert-rq/pom.xml index 0070ddadeca..6162cdd6075 100644 --- a/jdisc_core_test/test_bundles/cert-rq/pom.xml +++ b/jdisc_core_test/test_bundles/cert-rq/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-rq - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-s-act/pom.xml b/jdisc_core_test/test_bundles/cert-s-act/pom.xml index ed34708dc8a..e7350f70665 100644 --- a/jdisc_core_test/test_bundles/cert-s-act/pom.xml +++ b/jdisc_core_test/test_bundles/cert-s-act/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-s-act - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-tp/pom.xml b/jdisc_core_test/test_bundles/cert-tp/pom.xml index b657f36c695..6618b22efdd 100644 --- a/jdisc_core_test/test_bundles/cert-tp/pom.xml +++ b/jdisc_core_test/test_bundles/cert-tp/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-tp - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-us/pom.xml b/jdisc_core_test/test_bundles/cert-us/pom.xml index 731b5af098f..b4306daa5e8 100644 --- a/jdisc_core_test/test_bundles/cert-us/pom.xml +++ b/jdisc_core_test/test_bundles/cert-us/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-us - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml b/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml index 5daef993b4a..deb8ddb80fc 100644 --- a/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml +++ b/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT my-bundle-activator - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/my-guice-module/pom.xml b/jdisc_core_test/test_bundles/my-guice-module/pom.xml index 296ca98acb8..be8f22f3c40 100644 --- a/jdisc_core_test/test_bundles/my-guice-module/pom.xml +++ b/jdisc_core_test/test_bundles/my-guice-module/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT my-guice-module - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/my-server-provider/pom.xml b/jdisc_core_test/test_bundles/my-server-provider/pom.xml index 3fc2ed2a755..b5b78191010 100644 --- a/jdisc_core_test/test_bundles/my-server-provider/pom.xml +++ b/jdisc_core_test/test_bundles/my-server-provider/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT my-server-provider - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/pom.xml b/jdisc_core_test/test_bundles/pom.xml index ff3c14ee354..63f31c1963b 100644 --- a/jdisc_core_test/test_bundles/pom.xml +++ b/jdisc_core_test/test_bundles/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core integration-test-parent - 7-SNAPSHOT + 8-SNAPSHOT test_bundles - 7-SNAPSHOT + 8-SNAPSHOT pom ${project.artifactId} diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml index 76140f67416..dc3976098fa 100644 --- a/jdisc_jetty/pom.xml +++ b/jdisc_jetty/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jdisc_jetty - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/jrt/pom.xml b/jrt/pom.xml index fea45602e58..c4fb87d24c4 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jrt container-plugin - 7-SNAPSHOT + 8-SNAPSHOT jrt diff --git a/linguistics-components/pom.xml b/linguistics-components/pom.xml index aa68f6590cb..eae50c778b5 100644 --- a/linguistics-components/pom.xml +++ b/linguistics-components/pom.xml @@ -7,12 +7,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml linguistics-components container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.google.protobuf diff --git a/linguistics/pom.xml b/linguistics/pom.xml index d0314622fcf..763dff1d653 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -7,12 +7,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml linguistics container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/logd/pom.xml b/logd/pom.xml index 2baf77e5aa3..4eae0afc77b 100644 --- a/logd/pom.xml +++ b/logd/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml logd - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/logserver/pom.xml b/logserver/pom.xml index 2d5eecd01ce..61b777ad86b 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml logserver jar - 7-SNAPSHOT + 8-SNAPSHOT logserver Log server. diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 806015c3100..6f8b44540e2 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -5,13 +5,13 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa maven-plugins pom - 7-SNAPSHOT + 8-SNAPSHOT Parent artifact for Vespa maven plugins. http://yahoo.github.io/vespa diff --git a/messagebus/pom.xml b/messagebus/pom.xml index d26e9b32909..512c001e3ff 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml messagebus - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml index b68b329b603..bbb1c14dfe7 100644 --- a/metrics-proxy/pom.xml +++ b/metrics-proxy/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml metrics-proxy container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/metrics/pom.xml b/metrics/pom.xml index b0482e26697..2cf5ccc57d1 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml metrics jar - 7-SNAPSHOT + 8-SNAPSHOT metrics diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml index 4da293a1aab..9188ff9af80 100644 --- a/model-evaluation/pom.xml +++ b/model-evaluation/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml model-evaluation - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/model-integration/pom.xml b/model-integration/pom.xml index d064a3ff709..7d3ab3f7a5f 100644 --- a/model-integration/pom.xml +++ b/model-integration/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml model-integration - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/node-admin/pom.xml b/node-admin/pom.xml index ff1e159de0d..ae7e6ac2bce 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml node-admin - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/node-repository/pom.xml b/node-repository/pom.xml index 60aa0a83107..52be67024d0 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml node-repository - 7-SNAPSHOT + 8-SNAPSHOT container-plugin Keeps track of node assignment in a multi-application setup. diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml index da40a1a50a1..156e9367760 100644 --- a/orchestrator-restapi/pom.xml +++ b/orchestrator-restapi/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml orchestrator-restapi - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index 3d9c45c9ff6..3f8d2bb83db 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml orchestrator - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/parent/pom.xml b/parent/pom.xml index 976a74ec152..9709c55d8c6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -4,7 +4,7 @@ 4.0.0 parent pom - 7-SNAPSHOT + 8-SNAPSHOT parent Parent artifact for all Vespa maven projects. https://github.com/vespa-engine @@ -12,7 +12,7 @@ com.yahoo.vespa container-dependency-versions - 7-SNAPSHOT + 8-SNAPSHOT ../container-dependency-versions/pom.xml diff --git a/pom.xml b/pom.xml index 7900cdac08e..3a41ee3b1ec 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.yahoo.vespa vespa pom - 7-SNAPSHOT + 8-SNAPSHOT Aggregator pom for vespa. https://github.com/vespa-engine diff --git a/predicate-search-core/pom.xml b/predicate-search-core/pom.xml index 733501122bf..4951b3d40f1 100644 --- a/predicate-search-core/pom.xml +++ b/predicate-search-core/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml predicate-search-core - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/predicate-search/pom.xml b/predicate-search/pom.xml index 83efe9d9754..75c9350707c 100644 --- a/predicate-search/pom.xml +++ b/predicate-search/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml predicate-search - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 562db6d4f1f..da7cc007053 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml provided-dependencies jar - 7-SNAPSHOT + 8-SNAPSHOT Dependencies that are installed and should not be included in artifacts with dependencies. diff --git a/routing-generator/pom.xml b/routing-generator/pom.xml index 09a5b206a08..ee5e511c045 100644 --- a/routing-generator/pom.xml +++ b/routing-generator/pom.xml @@ -6,14 +6,14 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa routing-generator container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/searchcore/pom.xml b/searchcore/pom.xml index 27b0e55c781..46b576921cf 100644 --- a/searchcore/pom.xml +++ b/searchcore/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml searchcore jar - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} diff --git a/searchlib/pom.xml b/searchlib/pom.xml index 69bc88b18f3..e1e61c954b9 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml searchlib container-plugin - 7-SNAPSHOT + 8-SNAPSHOT searchlib Search library functions. diff --git a/searchsummary/pom.xml b/searchsummary/pom.xml index 2cfe3ef632f..d7501d19618 100644 --- a/searchsummary/pom.xml +++ b/searchsummary/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml searchsummary - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/security-tools/pom.xml b/security-tools/pom.xml index 424b5002d1d..7f248c185a2 100644 --- a/security-tools/pom.xml +++ b/security-tools/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml security-tools jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/security-utils/pom.xml b/security-utils/pom.xml index ac856dff6c3..d4b4bc8d0f6 100644 --- a/security-utils/pom.xml +++ b/security-utils/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml security-utils bundle - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index 067ea451e35..6a46838a0ce 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml service-monitor container-plugin - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Service monitor component for hosted vespa. diff --git a/socket_test/pom.xml b/socket_test/pom.xml index 8e8797564fe..f68b04d01c8 100644 --- a/socket_test/pom.xml +++ b/socket_test/pom.xml @@ -7,11 +7,11 @@ 4.0.0 com.yahoo.vespa socket_test - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jar diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index ffdfaf469a2..86cad2ad012 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml standalone-container - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/storage/pom.xml b/storage/pom.xml index 74854da2f3f..3d057b7b928 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml storage - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/streamingvisitors/pom.xml b/streamingvisitors/pom.xml index 2cc777be593..dfc5e7a0b10 100644 --- a/streamingvisitors/pom.xml +++ b/streamingvisitors/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vsm - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index 3a15b9be142..1d0d8b6f426 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -7,7 +7,7 @@ com.yahoo.vespa tenant-base - 7-SNAPSHOT + 8-SNAPSHOT Hosted Vespa tenant base Parent POM for all hosted Vespa applications. https://github.com/vespa-engine diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml index a43c7f96a47..f8411cc74d1 100644 --- a/tenant-cd-api/pom.xml +++ b/tenant-cd-api/pom.xml @@ -15,7 +15,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent diff --git a/tenant-cd-commons/pom.xml b/tenant-cd-commons/pom.xml index 0ada43bca0b..92347a96f31 100644 --- a/tenant-cd-commons/pom.xml +++ b/tenant-cd-commons/pom.xml @@ -12,7 +12,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent diff --git a/testutil/pom.xml b/testutil/pom.xml index 9df445e8d9f..5c6aa1881f7 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml testutil jar - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Library of useful Hamcrest matchers. diff --git a/vdslib/pom.xml b/vdslib/pom.xml index 0a6eae7ec3e..b4825c63ae9 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vdslib container-plugin - 7-SNAPSHOT + 8-SNAPSHOT vdslib diff --git a/vespa-3party-bundles/pom.xml b/vespa-3party-bundles/pom.xml index efa4edf89b4..b1ed6457c94 100644 --- a/vespa-3party-bundles/pom.xml +++ b/vespa-3party-bundles/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-3party-bundles - 7-SNAPSHOT + 8-SNAPSHOT pom diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 99248fb0907..d2d960f6112 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-application-maven-plugin - 7-SNAPSHOT + 8-SNAPSHOT maven-plugin Maven Plugin for assembling a vespa application package diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 5a7cb97205e..580910799c1 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -7,12 +7,12 @@ 4.0.0 vespa-athenz container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml index f3d94fa809d..f3357d64e27 100644 --- a/vespa-documentgen-plugin/pom.xml +++ b/vespa-documentgen-plugin/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-documentgen-plugin maven-plugin - 7-SNAPSHOT + 8-SNAPSHOT Vespa DocumentGen Plugin diff --git a/vespa-feed-client-api/pom.xml b/vespa-feed-client-api/pom.xml index 64b71ae6fb1..5509c339eee 100644 --- a/vespa-feed-client-api/pom.xml +++ b/vespa-feed-client-api/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-feed-client-api jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/vespa-feed-client-cli/pom.xml b/vespa-feed-client-cli/pom.xml index 04f9e308cfa..46679906fc4 100644 --- a/vespa-feed-client-cli/pom.xml +++ b/vespa-feed-client-cli/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-feed-client-cli jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/vespa-feed-client/pom.xml b/vespa-feed-client/pom.xml index a7c4ab0a13c..536637bdce2 100644 --- a/vespa-feed-client/pom.xml +++ b/vespa-feed-client/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-feed-client jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index 1dde2d58610..8060a2d67a1 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-hadoop - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Integration tools between Vespa and Hadoop diff --git a/vespa-maven-plugin/pom.xml b/vespa-maven-plugin/pom.xml index 5984c6a1324..8f46e5ff35f 100644 --- a/vespa-maven-plugin/pom.xml +++ b/vespa-maven-plugin/pom.xml @@ -7,7 +7,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-maven-plugin diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml index 03de830e658..c79a8ca7de7 100644 --- a/vespa-osgi-testrunner/pom.xml +++ b/vespa-osgi-testrunner/pom.xml @@ -6,7 +6,7 @@ parent com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/vespa-testrunner-components/pom.xml b/vespa-testrunner-components/pom.xml index 4b4b0cfa92c..332a0eaa82d 100644 --- a/vespa-testrunner-components/pom.xml +++ b/vespa-testrunner-components/pom.xml @@ -11,7 +11,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml index 31fae41a357..a570cb69c36 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -12,11 +12,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa_feed_perf - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index d7b36e39c94..5c3a04beeb8 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespaclient-container-plugin - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/vespaclient-core/pom.xml b/vespaclient-core/pom.xml index 8f2865a22cf..5afc2b57868 100644 --- a/vespaclient-core/pom.xml +++ b/vespaclient-core/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespaclient-core - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 2d80d441438..8323890ca2b 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespaclient-java - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index ed6ae3678f4..c4d100aa10c 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespajlib container-plugin - 7-SNAPSHOT + 8-SNAPSHOT Library for use in Java components of Vespa. Shared code which do not fit anywhere else. diff --git a/vespalog/pom.xml b/vespalog/pom.xml index 4ced763f13f..c18a319adac 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespalog - 7-SNAPSHOT + 8-SNAPSHOT Vespa Log container-plugin diff --git a/yolean/pom.xml b/yolean/pom.xml index 68313e3e1a8..a767e6dfcdd 100644 --- a/yolean/pom.xml +++ b/yolean/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml yolean - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index a25f4a01e55..0360b9ce91f 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml zkfacade container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/zookeeper-client-common/pom.xml b/zookeeper-client-common/pom.xml index 7e23e0cb1c8..5eafd040e79 100644 --- a/zookeeper-client-common/pom.xml +++ b/zookeeper-client-common/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml zookeeper-client-common jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml index 5dfc5ab22be..a0c268e0f95 100644 --- a/zookeeper-command-line-client/pom.xml +++ b/zookeeper-command-line-client/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml zookeeper-command-line-client - 7-SNAPSHOT + 8-SNAPSHOT org.apache.zookeeper diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index 06bb3a131af..b9cc4478bc2 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml zookeeper-server-parent pom - 7-SNAPSHOT + 8-SNAPSHOT zookeeper-server-common zookeeper-server diff --git a/zookeeper-server/zookeeper-server-3.7.1/pom.xml b/zookeeper-server/zookeeper-server-3.7.1/pom.xml index ed677ef8601..ea0e61075f1 100644 --- a/zookeeper-server/zookeeper-server-3.7.1/pom.xml +++ b/zookeeper-server/zookeeper-server-3.7.1/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa zookeeper-server-parent - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml zookeeper-server-3.7.1 container-plugin - 7-SNAPSHOT + 8-SNAPSHOT 3.7.1 diff --git a/zookeeper-server/zookeeper-server-common/pom.xml b/zookeeper-server/zookeeper-server-common/pom.xml index 82494e7bd14..db377fa8e8f 100644 --- a/zookeeper-server/zookeeper-server-common/pom.xml +++ b/zookeeper-server/zookeeper-server-common/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa zookeeper-server-parent - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml zookeeper-server-common container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/zookeeper-server/zookeeper-server/pom.xml b/zookeeper-server/zookeeper-server/pom.xml index 01cd666d5ab..72cb21b2362 100644 --- a/zookeeper-server/zookeeper-server/pom.xml +++ b/zookeeper-server/zookeeper-server/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa zookeeper-server-parent - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml zookeeper-server-3.7.0 container-plugin - 7-SNAPSHOT + 8-SNAPSHOT 3.7.0 -- cgit v1.2.3 From 8092e52a95652d4c2e6e3bc3a57e3d72f414d2b9 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 9 Jun 2022 12:58:22 +0200 Subject: Use Inject annotation from 'annotations' --- .../java/com/yahoo/application/container/docprocs/MockDocproc.java | 2 +- .../main/java/com/yahoo/config/model/MapConfigModelRegistry.java | 2 +- .../src/main/java/com/yahoo/vespa/model/VespaModelFactory.java | 2 +- .../src/test/java/com/yahoo/config/model/graph/GraphMock.java | 2 +- .../java/com/yahoo/container/core/config/HandlersConfigurerDi.java | 2 +- .../yahoo/container/core/documentapi/DocumentAccessProvider.java | 2 +- .../java/com/yahoo/container/handler/AccessLogRequestHandler.java | 2 +- .../src/main/java/com/yahoo/container/handler/ClustersStatus.java | 2 +- .../com/yahoo/container/handler/FilterBackingRequestHandler.java | 2 +- .../src/main/java/com/yahoo/container/handler/LogHandler.java | 2 +- .../main/java/com/yahoo/container/handler/ThreadPoolProvider.java | 2 +- .../src/main/java/com/yahoo/container/handler/VipStatus.java | 2 +- .../src/main/java/com/yahoo/container/handler/VipStatusHandler.java | 2 +- .../java/com/yahoo/container/handler/metrics/MetricsV2Handler.java | 2 +- .../com/yahoo/container/handler/metrics/PrometheusV1Handler.java | 2 +- .../yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java | 2 +- .../main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java | 2 +- .../java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java | 2 +- .../main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java | 2 +- .../java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java | 2 +- .../src/main/java/com/yahoo/container/jdisc/state/StateHandler.java | 2 +- .../src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java | 2 +- .../src/main/java/com/yahoo/container/logging/AccessLog.java | 2 +- .../main/java/com/yahoo/container/logging/FileConnectionLog.java | 2 +- .../java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 2 +- .../src/main/java/com/yahoo/jdisc/http/server/jetty/Janitor.java | 2 +- .../java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java | 2 +- .../yahoo/jdisc/http/ssl/impl/DefaultSslContextFactoryProvider.java | 2 +- .../java/com/yahoo/language/provider/DefaultEmbedderProvider.java | 2 +- .../com/yahoo/language/provider/DefaultLinguisticsProvider.java | 2 +- .../com/yahoo/processing/handler/AbstractProcessingHandler.java | 2 +- .../main/java/com/yahoo/processing/handler/ProcessingHandler.java | 2 +- .../container/handler/observability/ApplicationStatusHandler.java | 2 +- .../src/main/java/com/yahoo/search/query/gui/GUIHandler.java | 2 +- .../java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java | 2 +- docprocs/pom.xml | 6 ++++++ .../main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java | 2 +- document/src/main/java/com/yahoo/document/DocumentTypeManager.java | 2 +- testutil/pom.xml | 6 ++++++ testutil/src/main/java/com/yahoo/test/ManualClock.java | 2 +- 40 files changed, 50 insertions(+), 38 deletions(-) (limited to 'container-search-gui') diff --git a/application/src/test/java/com/yahoo/application/container/docprocs/MockDocproc.java b/application/src/test/java/com/yahoo/application/container/docprocs/MockDocproc.java index 3950b98ef58..44f6970c78b 100644 --- a/application/src/test/java/com/yahoo/application/container/docprocs/MockDocproc.java +++ b/application/src/test/java/com/yahoo/application/container/docprocs/MockDocproc.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.application.container.docprocs; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.application.MockApplicationConfig; import com.yahoo.docproc.DocumentProcessor; import com.yahoo.docproc.Processing; diff --git a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java index e04608951f6..e07ba637f4f 100644 --- a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java +++ b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.config.model.builder.xml.ConfigModelBuilder; import com.yahoo.config.model.builder.xml.ConfigModelId; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java index 25e2a7593b0..39e9617b12c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java @@ -2,7 +2,7 @@ package com.yahoo.vespa.model; import ai.vespa.rankingexpression.importer.configmodelview.MlModelImporter; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.Version; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.config.application.api.ApplicationPackage; diff --git a/config-model/src/test/java/com/yahoo/config/model/graph/GraphMock.java b/config-model/src/test/java/com/yahoo/config/model/graph/GraphMock.java index d61eb1c99a5..6f6e8685a20 100644 --- a/config-model/src/test/java/com/yahoo/config/model/graph/GraphMock.java +++ b/config-model/src/test/java/com/yahoo/config/model/graph/GraphMock.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model.graph; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.config.model.ConfigModel; import com.yahoo.config.model.ConfigModelContext; import com.yahoo.config.model.builder.xml.ConfigModelBuilder; diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index 8aee2d43187..363ff26eea9 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -2,9 +2,9 @@ package com.yahoo.container.core.config; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Injector; import com.yahoo.component.AbstractComponent; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.concurrent.ThreadFactoryFactory; import com.yahoo.config.FileReference; diff --git a/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java b/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java index 9da16744eec..4212874c1a8 100644 --- a/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java +++ b/container-core/src/main/java/com/yahoo/container/core/documentapi/DocumentAccessProvider.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.core.documentapi; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; diff --git a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java index 86f8e04268b..d2e5ba6d3cf 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java b/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java index 13839dd82c1..52b372638c8 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java +++ b/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; import java.util.HashMap; diff --git a/container-core/src/main/java/com/yahoo/container/handler/FilterBackingRequestHandler.java b/container-core/src/main/java/com/yahoo/container/handler/FilterBackingRequestHandler.java index 2353c7c0826..94c07916d4c 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/FilterBackingRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/FilterBackingRequestHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; diff --git a/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java b/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java index f699027f42f..d151eb6862d 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.core.LogHandlerConfig; import com.yahoo.container.jdisc.AsyncHttpResponse; import com.yahoo.container.jdisc.ContentChannelOutputStream; diff --git a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java index 1818a3d97b4..b1aa0a095db 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java +++ b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.container.handler.threadpool.ContainerThreadPool; diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java index 8e8b674c888..2238abc584e 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java +++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.QrSearchersConfig; import com.yahoo.container.core.VipStatusConfig; import com.yahoo.container.jdisc.state.StateMonitor; diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java index 490876dbf76..8cfa1cf8b7b 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatusHandler.java @@ -12,7 +12,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.core.VipStatusConfig; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java index 0a71489a605..b3a2205cc0a 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java @@ -2,7 +2,7 @@ package com.yahoo.container.handler.metrics; import ai.vespa.util.http.hc5.VespaHttpClientBuilder; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.restapi.Path; import com.yahoo.yolean.Exceptions; diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java index 6ea35138606..3333b3e3090 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java @@ -2,7 +2,7 @@ package com.yahoo.container.handler.metrics; import ai.vespa.util.http.hc5.VespaHttpClientBuilder; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.restapi.Path; import com.yahoo.restapi.StringResponse; diff --git a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java index 73845c13fe8..83e9e496411 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java +++ b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.handler.threadpool; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.concurrent.ThreadFactoryFactory; import com.yahoo.container.protect.ProcessTerminator; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java index fa4ed9a4afa..d608977a7ff 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.handler.Timing; import com.yahoo.container.logging.AccessLog; import com.yahoo.container.logging.AccessLogEntry; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index cdd3fbbabd5..11355dee24f 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.logging.AccessLogEntry; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Request; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java index ab4c66dd1c5..d4cf6324721 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Request; import com.yahoo.jdisc.ResourceReference; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java index 7dca0959051..b949edefb31 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.collections.Tuple2; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.jdisc.Request; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java index 11e2d970344..cfd2244bd70 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.collections.Tuple2; import com.yahoo.component.Vtag; import com.yahoo.component.provider.ComponentRegistry; diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java index 97aa6ffce18..7dc91477b6e 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc.state; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.container.jdisc.config.HealthMonitorConfig; diff --git a/container-core/src/main/java/com/yahoo/container/logging/AccessLog.java b/container-core/src/main/java/com/yahoo/container/logging/AccessLog.java index 5a6b3832f27..259790373a5 100644 --- a/container-core/src/main/java/com/yahoo/container/logging/AccessLog.java +++ b/container-core/src/main/java/com/yahoo/container/logging/AccessLog.java @@ -2,7 +2,7 @@ package com.yahoo.container.logging; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.provider.ComponentRegistry; /** diff --git a/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java b/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java index 57b4783153d..08de2ab2260 100644 --- a/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java +++ b/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java @@ -2,7 +2,7 @@ package com.yahoo.container.logging; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; /** diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java index cb027da821a..a9385060010 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.server.jetty; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.jdisc.http.SslProvider; diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/Janitor.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/Janitor.java index cd33bf78902..333305cf604 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/Janitor.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/Janitor.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.server.jetty; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.concurrent.DaemonThreadFactory; diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java index 335f5d20ad5..96c5bac335b 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java @@ -54,7 +54,7 @@ public class JettyHttpServer extends AbstractServerProvider { private final List listenedPorts = new ArrayList<>(); private final ServerMetricReporter metricsReporter; - @Inject + @Inject // ServerProvider implementors must use com.google.inject.Inject public JettyHttpServer(CurrentContainer container, Metric metric, ServerConfig serverConfig, diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/DefaultSslContextFactoryProvider.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/DefaultSslContextFactoryProvider.java index c8cf5195c4c..608b97c6a36 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/DefaultSslContextFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/DefaultSslContextFactoryProvider.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.ssl.impl; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.jdisc.http.SslProvider; diff --git a/container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java index 63a03398017..d0a6ac106a2 100644 --- a/container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java +++ b/container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.language.provider; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.language.process.Embedder; diff --git a/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java index a38f39559f5..160e483972b 100644 --- a/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java +++ b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java @@ -3,7 +3,7 @@ package com.yahoo.language.provider; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.language.Linguistics; import com.yahoo.language.opennlp.OpenNlpLinguistics; diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java index 7b5187bdae2..2c15c994bb7 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.processing.handler; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.component.chain.Chain; diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java index c652c1f8ba4..dc23eb12d61 100644 --- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java +++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.processing.handler; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.core.ChainsConfig; import com.yahoo.container.logging.AccessLog; diff --git a/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java index 46fd7358288..09b5a6ff85e 100644 --- a/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java +++ b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.component.ComponentId; import com.yahoo.component.Vtag; diff --git a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java index bbce02ed97a..8c8b65a4a5a 100644 --- a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java +++ b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java @@ -4,7 +4,7 @@ package com.yahoo.search.query.gui; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.QrSearchersConfig; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java index 9eda0b12069..6a970223ab2 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc.jdisc; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.chain.Chain; import com.yahoo.component.chain.model.ChainsModel; import com.yahoo.component.provider.ComponentRegistry; diff --git a/docprocs/pom.xml b/docprocs/pom.xml index 42ae75e36f1..e001d83a00f 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -30,6 +30,12 @@ ${project.version} provided + + com.yahoo.vespa + annotations + ${project.version} + provided + junit junit diff --git a/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java b/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java index 87c78445b13..7fc2ed022dd 100644 --- a/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java +++ b/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java @@ -3,7 +3,7 @@ package com.yahoo.docprocs.indexing; import java.util.ArrayList; import java.util.List; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.component.chain.dependencies.After; import com.yahoo.component.chain.dependencies.Before; import com.yahoo.component.chain.dependencies.Provides; diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java index ee9366285a9..b5c9e54939e 100644 --- a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java +++ b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.document; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.document.annotation.AnnotationType; import com.yahoo.document.annotation.AnnotationTypeRegistry; diff --git a/testutil/pom.xml b/testutil/pom.xml index 5c6aa1881f7..f3bc9cb2212 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -26,6 +26,12 @@ provided no_aop + + com.yahoo.vespa + annotations + ${project.version} + provided + org.hamcrest hamcrest-core diff --git a/testutil/src/main/java/com/yahoo/test/ManualClock.java b/testutil/src/main/java/com/yahoo/test/ManualClock.java index f5fe1ea466a..d946101412d 100644 --- a/testutil/src/main/java/com/yahoo/test/ManualClock.java +++ b/testutil/src/main/java/com/yahoo/test/ManualClock.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.test; -import com.google.inject.Inject; +import com.yahoo.component.annotation.Inject; import java.time.Clock; import java.time.Instant; import java.time.LocalDateTime; -- cgit v1.2.3 From 8d8b96b3620f4de369bed60a9c19b6a5fc8b0e95 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 14 Jun 2022 15:21:29 +0200 Subject: Refactor: Pull tracing into its own class --- .../com/yahoo/search/query/gui/GUIHandler.java | 11 +- container-search/abi-spec.json | 41 +++- .../com/yahoo/prelude/cluster/ClusterSearcher.java | 4 +- .../com/yahoo/prelude/fastsearch/FastSearcher.java | 2 +- .../prelude/fastsearch/VespaBackEndSearcher.java | 8 +- .../com/yahoo/prelude/query/parser/AllParser.java | 6 +- .../querytransform/LiteralBoostSearcher.java | 2 +- .../querytransform/NormalizingSearcher.java | 4 +- .../java/com/yahoo/prelude/semantics/RuleBase.java | 6 +- .../yahoo/prelude/semantics/SemanticSearcher.java | 2 +- .../src/main/java/com/yahoo/search/Query.java | 173 ++++----------- .../src/main/java/com/yahoo/search/Result.java | 2 +- .../src/main/java/com/yahoo/search/Searcher.java | 2 +- .../com/yahoo/search/cluster/ClusterSearcher.java | 4 +- .../search/dispatch/rpc/ProtobufSerialization.java | 6 +- .../search/federation/FederationSearcher.java | 4 +- .../search/grouping/vespa/GroupingExecutor.java | 4 +- .../result/PageTemplatesXmlRenderer.java | 2 +- .../main/java/com/yahoo/search/query/Model.java | 2 +- .../main/java/com/yahoo/search/query/Trace.java | 234 +++++++++++++++++++++ .../yahoo/search/query/context/QueryContext.java | 2 +- .../yahoo/search/query/profile/QueryProfile.java | 12 +- .../search/query/properties/QueryProperties.java | 20 +- .../search/querytransform/BooleanSearcher.java | 8 +- .../com/yahoo/search/rendering/JsonRenderer.java | 2 +- .../com/yahoo/search/rendering/XmlRenderer.java | 2 +- .../com/yahoo/search/searchchain/Execution.java | 4 +- .../streamingvisitors/VdsStreamingSearcher.java | 14 +- .../yahoo/vespa/streamingvisitors/VdsVisitor.java | 2 +- .../test/NormalizingSearcherTestCase.java | 2 +- .../searcher/test/JSONDebugSearcherTestCase.java | 68 +++--- .../dispatch/InterleavedSearchInvokerTest.java | 2 +- .../profile/config/test/XmlReadingTestCase.java | 84 ++++---- .../query/profile/config/test/validxml/root.xml | 2 +- .../search/searchchain/test/TraceTestCase.java | 19 +- .../java/com/yahoo/search/test/QueryTestCase.java | 6 +- .../VdsStreamingSearcherTestCase.java | 4 +- 37 files changed, 479 insertions(+), 293 deletions(-) create mode 100644 container-search/src/main/java/com/yahoo/search/query/Trace.java (limited to 'container-search-gui') diff --git a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java index 8c8b65a4a5a..901045bdb1f 100644 --- a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java +++ b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java @@ -17,6 +17,7 @@ import com.yahoo.search.config.IndexInfoConfig; import com.yahoo.search.query.Model; import com.yahoo.search.query.Presentation; import com.yahoo.search.query.Ranking; +import com.yahoo.search.query.Trace; import com.yahoo.search.query.ranking.Diversity; import com.yahoo.search.query.ranking.MatchPhase; import com.yahoo.search.query.restapi.ErrorResponse; @@ -192,11 +193,11 @@ public class GUIHandler extends ThreadedHttpRequestHandler { json.set("childMap", childMap); ArrayNode levelZeroParameters = jsonMapper.createArrayNode().add(MinimalQueryInserter.YQL.toString()).add(Query.HITS.toString()).add(Query.OFFSET.toString()) - .add("queryProfile").add(Query.NO_CACHE.toString()).add(Query.GROUPING_SESSION_CACHE.toString()) - .add(Query.SEARCH_CHAIN.toString()).add(Query.TIMEOUT.toString()).add("trace").add("tracelevel") - .add(Query.TRACE_LEVEL.toString()).add(Query.EXPLAIN_LEVEL.toString()).add("explainlevel").add(Model.MODEL).add(Ranking.RANKING).add("collapse").add("collapsesize").add("collapsefield") - .add(Presentation.PRESENTATION).add("pos").add("streaming").add("rules").add(RecallSearcher.recallName.toString()).add("user") - .add("metrics").add(""); + .add("queryProfile").add(Query.NO_CACHE.toString()).add(Query.GROUPING_SESSION_CACHE.toString()) + .add(Query.SEARCH_CHAIN.toString()).add(Query.TIMEOUT.toString()).add("trace").add("tracelevel") + .add(Trace.LEVEL).add(Query.EXPLAIN_LEVEL.toString()).add("explainlevel").add(Model.MODEL).add(Ranking.RANKING).add("collapse").add("collapsesize").add("collapsefield") + .add(Presentation.PRESENTATION).add("pos").add("streaming").add("rules").add(RecallSearcher.recallName.toString()).add("user") + .add("metrics").add(""); json.set("levelZeroParameters", levelZeroParameters); return jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(json); diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index 7fe1702be8f..a5725a6c6e7 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -1983,6 +1983,7 @@ "public com.yahoo.search.query.Select getSelect()", "public com.yahoo.search.query.Ranking getRanking()", "public com.yahoo.search.query.Model getModel()", + "public com.yahoo.search.query.Trace getTrace()", "public com.yahoo.container.jdisc.HttpRequest getHttpRequest()", "public com.yahoo.search.query.SessionId getSessionId()", "public com.yahoo.search.query.SessionId getSessionId(java.lang.String)", @@ -1993,15 +1994,16 @@ "public bridge synthetic java.lang.Object clone()" ], "fields": [ + "public com.yahoo.search.query.Trace trace", "public static final com.yahoo.processing.request.CompoundName OFFSET", "public static final com.yahoo.processing.request.CompoundName HITS", "public static final com.yahoo.processing.request.CompoundName QUERY_PROFILE", "public static final com.yahoo.processing.request.CompoundName SEARCH_CHAIN", - "public static final com.yahoo.processing.request.CompoundName TRACE_LEVEL", "public static final com.yahoo.processing.request.CompoundName EXPLAIN_LEVEL", "public static final com.yahoo.processing.request.CompoundName NO_CACHE", "public static final com.yahoo.processing.request.CompoundName GROUPING_SESSION_CACHE", "public static final com.yahoo.processing.request.CompoundName TIMEOUT", + "public static final com.yahoo.processing.request.CompoundName TRACE_LEVEL", "public static final java.util.List nativeProperties" ] }, @@ -5613,6 +5615,43 @@ "public static final java.lang.String LOWERCASE" ] }, + "com.yahoo.search.query.Trace": { + "superClass": "java.lang.Object", + "interfaces": [ + "java.lang.Cloneable" + ], + "attributes": [ + "public" + ], + "methods": [ + "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()", + "public void (com.yahoo.search.Query)", + "public int getLevel()", + "public void setLevel(int)", + "public boolean isTraceable(int)", + "public boolean getTimestamps()", + "public void setTimestamps(boolean)", + "public boolean getQuery()", + "public void setQuery(boolean)", + "public void trace(java.lang.String, int)", + "public void trace(java.lang.Object, int)", + "public void trace(java.lang.String, boolean, int)", + "public varargs void trace(boolean, int, java.lang.Object[])", + "public void traceProperties()", + "public com.yahoo.search.query.Trace cloneFor(com.yahoo.search.Query)", + "public boolean equals(java.lang.Object)", + "public int hashCode()", + "public com.yahoo.search.query.Trace clone()", + "public java.lang.String toString()", + "public bridge synthetic java.lang.Object clone()" + ], + "fields": [ + "public static final java.lang.String TRACE", + "public static final java.lang.String LEVEL", + "public static final java.lang.String TIMESTAMPS", + "public static final java.lang.String QUERY" + ] + }, "com.yahoo.search.query.UniqueRequestId": { "superClass": "java.lang.Object", "interfaces": [], diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java index 496e057a243..729aebf2fc2 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java @@ -204,7 +204,7 @@ public class ClusterSearcher extends Searcher { private void validateQueryTimeout(Query query) { if (query.getTimeout() <= maxQueryTimeout) return; - if (query.isTraceable(2)) { + if (query.getTrace().isTraceable(2)) { query.trace("Query timeout (" + query.getTimeout() + " ms) > max query timeout (" + maxQueryTimeout + " ms). Setting timeout to " + maxQueryTimeout + " ms.", 2); } @@ -215,7 +215,7 @@ public class ClusterSearcher extends Searcher { if ( ! query.getRanking().getQueryCache() ) return; if (query.getTimeout() <= maxQueryCacheTimeout) return; - if (query.isTraceable(2)) { + if (query.getTrace().isTraceable(2)) { query.trace("Query timeout (" + query.getTimeout() + " ms) > max query cache timeout (" + maxQueryCacheTimeout + " ms). Disabling query cache.", 2); } diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java index 33ad8d8c9a8..edd11974f8c 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java @@ -106,7 +106,7 @@ public class FastSearcher extends VespaBackEndSearcher { return new Result(query,ErrorMessage.createTimeout(e.getMessage())); } catch (IOException e) { Result result = new Result(query); - if (query.getTraceLevel() >= 1) + if (query.getTrace().getLevel() >= 1) query.trace(getName() + " error response: " + result, false, 1); result.hits().addError(ErrorMessage.createBackendCommunicationError(getName() + " failed: "+ e.getMessage())); return result; 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 584249fa1f3..e184037bc90 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 @@ -190,7 +190,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { Result result = doSearch2(query, execution); - if (query.getTraceLevel() >= 1) + if (query.getTrace().getLevel() >= 1) query.trace(getName() + " dispatch response: " + result, false, 1); result.trace(getName()); return result; @@ -243,7 +243,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { } void traceQuery(String sourceName, String type, Query query, int offset, int hits, int level, Optional quotedSummaryClass) { - if ((query.getTraceLevel() 0) addTopLevelRankTerms(newRankTerms, query); - if (query.getTraceLevel() >= 2 && newRankTerms.getItemCount() > 0) + if (query.getTrace().getLevel() >= 2 && newRankTerms.getItemCount() > 0) query.trace("Added rank terms for possible literal field matches.", true, 2); } diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/NormalizingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/NormalizingSearcher.java index a847a84e134..b7fd1069a6b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/querytransform/NormalizingSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/NormalizingSearcher.java @@ -53,11 +53,11 @@ public class NormalizingSearcher extends Searcher { } protected void normalize(Query query, IndexFacts.Session indexFacts) { - String oldQuery = (query.getTraceLevel() >= 2) ? query.getModel().getQueryTree().getRoot().toString() : null; + String oldQuery = (query.getTrace().getLevel() >= 2) ? query.getModel().getQueryTree().getRoot().toString() : null; normalizeBody(query, indexFacts); - if (query.getTraceLevel() >= 2 && ! query.getModel().getQueryTree().getRoot().toString().equals(oldQuery)) + if (query.getTrace().getLevel() >= 2 && ! query.getModel().getQueryTree().getRoot().toString().equals(oldQuery)) query.trace(getFunctionName(), true, 2); } diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java index 4980b035876..5a168d42779 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/RuleBase.java @@ -312,14 +312,14 @@ public class RuleBase { * If there is an error, this query is destroyed (unusable) */ public String analyze(Query query, int traceLevel) { - int queryTraceLevel = query.getTraceLevel(); + int queryTraceLevel = query.getTrace().getLevel(); if (traceLevel > 0 && queryTraceLevel == 0) - query.setTraceLevel(1); + query.getTrace().setLevel(1); matchAutomata(query, traceLevel); String error = analyzer.evaluate(query, traceLevel); - query.setTraceLevel(queryTraceLevel); + query.getTrace().setLevel(queryTraceLevel); return error; } diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java b/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java index e25f00bdc80..42a2b4f4e9b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/semantics/SemanticSearcher.java @@ -84,7 +84,7 @@ public class SemanticSearcher extends Searcher { if (query.properties().getBoolean(rulesOff)) return execution.search(query); - int traceLevel = query.properties().getInteger(tracelevelRules, query.getTraceLevel() - 2); + int traceLevel = query.properties().getInteger(tracelevelRules, query.getTrace().getLevel() - 2); if (traceLevel < 0) traceLevel = 0; RuleBase ruleBase = resolveRuleBase(query); if (ruleBase == null) 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 dcbda80ecab..e4f62f83e99 100644 --- a/container-search/src/main/java/com/yahoo/search/Query.java +++ b/container-search/src/main/java/com/yahoo/search/Query.java @@ -12,10 +12,10 @@ import com.yahoo.search.schema.SchemaInfo; import com.yahoo.search.dispatch.Dispatcher; import com.yahoo.search.federation.FederationSearcher; import com.yahoo.search.query.Model; +import com.yahoo.search.query.Trace; import com.yahoo.search.query.ParameterParser; import com.yahoo.search.query.Presentation; import com.yahoo.search.query.Properties; -import com.yahoo.search.query.QueryTree; import com.yahoo.search.query.Ranking; import com.yahoo.search.query.Select; import com.yahoo.search.query.SessionId; @@ -50,14 +50,11 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; /** * A search query containing all the information required to produce a Result. @@ -72,7 +69,7 @@ import java.util.logging.Logger; * * *

    - * The properties has three sources + * The properties have three sources *

      *
    1. They may be set in some Searcher component already executed for this Query - the properties acts as * a blackboard for communicating arbitrary objects between Searcher components. @@ -130,6 +127,9 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { } + /** The time this query was created */ + private long startTime; + //-------------- Query properties treated as fields in Query --------------- /** The offset from the most relevant hits found from this query */ @@ -138,9 +138,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { /** The number of hits to return */ private int hits = 10; - /** The query context level, 0 means no tracing */ - private int traceLevel = 0; - /** The query explain level, 0 means no explaining */ private int explainLevel = 0; @@ -181,12 +178,8 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { /** The selection of where-clause and grouping */ private Select select = new Select(this); - //---------------- Tracing ---------------------------------------------------- - - private static final Logger log = Logger.getLogger(Query.class.getName()); - - /** The time this query was created */ - private long startTime; + /** How this query should be traced */ + public Trace trace = new Trace(this); //---------------- Static property handling ------------------------------------ @@ -195,12 +188,15 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { public static final CompoundName QUERY_PROFILE = new CompoundName("queryProfile"); public static final CompoundName SEARCH_CHAIN = new CompoundName("searchChain"); - public static final CompoundName TRACE_LEVEL = new CompoundName("traceLevel"); + public static final CompoundName EXPLAIN_LEVEL = new CompoundName("explainLevel"); public static final CompoundName NO_CACHE = new CompoundName("noCache"); public static final CompoundName GROUPING_SESSION_CACHE = new CompoundName("groupingSessionCache"); public static final CompoundName TIMEOUT = new CompoundName("timeout"); + /** @deprecated use Trace.LEVEL */ + @Deprecated // TODO: Remove on Vespa 9 + public static final CompoundName TRACE_LEVEL = new CompoundName("traceLevel"); private static final QueryProfileType argumentType; static { @@ -213,7 +209,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { argumentType.addField(new FieldDescription(HITS.toString(), "integer", "hits count")); argumentType.addField(new FieldDescription(QUERY_PROFILE.toString(), "string")); argumentType.addField(new FieldDescription(SEARCH_CHAIN.toString(), "string")); - argumentType.addField(new FieldDescription(TRACE_LEVEL.toString(), "integer", "tracelevel")); argumentType.addField(new FieldDescription(EXPLAIN_LEVEL.toString(), "integer", "explainlevel")); argumentType.addField(new FieldDescription(NO_CACHE.toString(), "boolean", "nocache")); argumentType.addField(new FieldDescription(GROUPING_SESSION_CACHE.toString(), "boolean", "groupingSessionCache")); @@ -225,6 +220,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { argumentType.addField(new FieldDescription(Dispatcher.DISPATCH, new QueryProfileFieldType(Dispatcher.getArgumentType()))); argumentType.addField(new FieldDescription(Ranking.RANKING, new QueryProfileFieldType(Ranking.getArgumentType()))); argumentType.addField(new FieldDescription(Presentation.PRESENTATION, new QueryProfileFieldType(Presentation.getArgumentType()))); + argumentType.addField(new FieldDescription(Trace.TRACE, new QueryProfileFieldType(Trace.getArgumentType()))); argumentType.freeze(); } public static QueryProfileType getArgumentType() { return argumentType; } @@ -260,6 +256,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { registry.register(Select.getArgumentType().unfrozen()); registry.register(Ranking.getArgumentType().unfrozen()); registry.register(Presentation.getArgumentType().unfrozen()); + registry.register(Trace.getArgumentType().unfrozen()); registry.register(DefaultProperties.argumentType.unfrozen()); } @@ -403,7 +400,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { } properties().setParentQuery(this); - traceProperties(); + trace.traceProperties(); } public Query(Query query) { @@ -477,59 +474,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { @Override public Properties properties() { return (Properties)super.properties(); } - /** - * Traces how properties was resolved and from where. Done after the fact to avoid special handling - * of tracelevel, which is the property deciding whether this needs to be done - */ - private void traceProperties() { - if (traceLevel == 0) return; - CompiledQueryProfile profile = null; - QueryProfileProperties profileProperties = properties().getInstance(QueryProfileProperties.class); - if (profileProperties != null) - profile = profileProperties.getQueryProfile(); - - if (profile == null) - trace("No query profile is used", false, 1); - else - trace("Using " + profile.toString(), false, 1); - - if (traceLevel < 4) return; - StringBuilder b = new StringBuilder("Resolved properties:\n"); - Set mentioned = new HashSet<>(); - for (Map.Entry requestProperty : requestProperties().entrySet() ) { - Object resolvedValue = properties().get(requestProperty.getKey(), requestProperties()); - if (resolvedValue == null && requestProperty.getKey().equals("queryProfile")) - resolvedValue = requestProperty.getValue(); - - b.append(requestProperty.getKey()); - b.append(": "); - b.append(resolvedValue); // (may be null) - b.append(" ("); - - if (profile != null && ! profile.isOverridable(new CompoundName(requestProperty.getKey()), requestProperties())) - b.append("from query profile - unoverridable, ignoring request value"); - else - b.append("from request"); - b.append(")\n"); - mentioned.add(requestProperty.getKey()); - } - if (profile != null) { - appendQueryProfileProperties(profile, mentioned, b); - } - trace(b.toString(),false,4); - } - - private Map requestProperties() { - return httpRequest.propertyMap(); - } - - private void appendQueryProfileProperties(CompiledQueryProfile profile, Set mentioned, StringBuilder b) { - for (var property : profile.listValuesWithSources(CompoundName.empty, requestProperties(), properties()).entrySet()) { - if ( ! mentioned.contains(property.getKey())) - b.append(property.getKey()).append(": ").append(property.getValue()).append("\n"); - } - } - /** * Validates this query * @@ -602,8 +546,12 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { /** * Sets the context level of this query, 0 means no tracing * Higher numbers means increasingly more tracing + * + * @deprecated use getTrace().setLevel(level) */ - public void setTraceLevel(int traceLevel) { this.traceLevel = traceLevel; } + @Deprecated // TODO: Remove on Vespa 9 + public void setTraceLevel(int traceLevel) { trace.setLevel(traceLevel); } + /** * Sets the explain level of this query, 0 means no tracing * Higher numbers means increasingly more explaining @@ -613,8 +561,11 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { /** * Returns the context level of this query, 0 means no tracing * Higher numbers means increasingly more tracing + * + * @deprecated use getTrace().setLevel(level) */ - public int getTraceLevel() { return traceLevel; } + @Deprecated // TODO: Remove on Vespa 9 + public int getTraceLevel() { return trace.getLevel(); } /** * Returns the explain level of this query, 0 means no tracing @@ -625,9 +576,11 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { /** * Returns the context level of this query, 0 means no tracing * Higher numbers means increasingly more tracing + * + * @deprecated use getTrace().isTraceable(level) */ - public final boolean isTraceable(int level) { return traceLevel >= level; } - + @Deprecated // TODO: Remove on Vespa 9 + public final boolean isTraceable(int level) { return trace.isTraceable(level); } /** Returns whether this query should never be served from a cache. Default is false */ public boolean getNoCache() { return noCache; } @@ -711,65 +664,24 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { return model.getQueryTree().encode(buffer); } - /** - * Adds a context message to this query and to the info log, - * if the context level of the query is sufficiently high. - * The context information will be carried over to the result at creation. - * The message parameter will be included with XML escaping. - * - * @param message the message to add - * @param traceLevel the context level of the message, this method will do nothing - * if the traceLevel of the query is lower than this value - */ + /** Calls getTrace().trace(message, traceLevel). */ public void trace(String message, int traceLevel) { - trace(message, false, traceLevel); + trace.trace(message, traceLevel); } + /** Calls getTrace().trace(message, traceLevel). */ public void trace(Object message, int traceLevel) { - if ( ! isTraceable(traceLevel)) return; - getContext(true).trace(message, 0); + trace.trace(message, traceLevel); } - /** - * Adds a trace message to this query - * if the trace level of the query is sufficiently high. - * - * @param message the message to add - * @param includeQuery true to append the query root stringValue at the end of the message - * @param traceLevel the context level of the message, this method will do nothing - * if the traceLevel of the query is lower than this value - */ + /** Calls getTrace().trace(message, includeQuery, traceLevel). */ public void trace(String message, boolean includeQuery, int traceLevel) { - if ( ! isTraceable(traceLevel)) return; - - if (includeQuery) - message += ": [" + queryTreeText() + "]"; - - log.log(Level.FINE,message); - - // Pass 0 as traceLevel as the trace level check is already done above, - // and it is not propagated to trace until execution has started - // (it is done in the execution.search method) - getContext(true).trace(message, 0); + trace.trace(message, includeQuery, traceLevel); } - /** - * Adds a trace message to this query - * if the trace level of the query is sufficiently high. - * - * @param includeQuery true to append the query root stringValue at the end of the message - * @param traceLevel the context level of the message, this method will do nothing - * if the traceLevel of the query is lower than this value - * @param messages the messages whose toStrings will be concatenated into the trace message. - * Concatenation will only happen if the trace level is sufficiently high. - */ + /** Calls getTrace().trace(message, traceLevel, messages). */ public void trace(boolean includeQuery, int traceLevel, Object... messages) { - if ( ! isTraceable(traceLevel)) return; - - StringBuilder concatenated = new StringBuilder(); - for (Object message : messages) - concatenated.append(message); - trace(concatenated.toString(), includeQuery, traceLevel); + trace.trace(includeQuery, traceLevel, messages); } /** @@ -810,17 +722,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { query.context = context; } - private String queryTreeText() { - QueryTree root = getModel().getQueryTree(); - - if (getTraceLevel() < 2) - return root.toString(); - if (getTraceLevel() < 6) - return yqlRepresentation(); - else - return "\n" + yqlRepresentation() + "\n" + new TextualQueryRepresentation(root.getRoot()) + "\n"; - } - /** * Serialize this query as YQL+. This method will never throw exceptions, * but instead return a human readable error message if a problem occurred while @@ -1000,6 +901,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { clone.model = model.cloneFor(clone); clone.select = select.cloneFor(clone); clone.ranking = ranking.cloneFor(clone); + clone.trace = trace.cloneFor(clone); clone.presentation = (Presentation) presentation.clone(); clone.context = getContext(true).cloneFor(clone); @@ -1029,6 +931,9 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { /** Returns the query representation model to be used for this query, never null */ public Model getModel() { return model; } + /** Returns the trace settings and facade API. */ + public Trace getTrace() { return trace; } + /** * Return the HTTP request which caused this query. This will never be null * when running with queries from the network. diff --git a/container-search/src/main/java/com/yahoo/search/Result.java b/container-search/src/main/java/com/yahoo/search/Result.java index b31a4fb6e24..1fd69f15012 100644 --- a/container-search/src/main/java/com/yahoo/search/Result.java +++ b/container-search/src/main/java/com/yahoo/search/Result.java @@ -245,7 +245,7 @@ public final class Result extends com.yahoo.processing.Response implements Clone * @param name the name of the searcher instance returning this result */ public void trace(String name) { - if (hits().getQuery().getTraceLevel() < 5) { + if (hits().getQuery().getTrace().getLevel() < 5) { return; } StringBuilder hitBuffer = new StringBuilder(name); diff --git a/container-search/src/main/java/com/yahoo/search/Searcher.java b/container-search/src/main/java/com/yahoo/search/Searcher.java index 473adfa17db..63dba2864f7 100644 --- a/container-search/src/main/java/com/yahoo/search/Searcher.java +++ b/container-search/src/main/java/com/yahoo/search/Searcher.java @@ -163,7 +163,7 @@ public abstract class Searcher extends Processor { } else { int fillRejectTraceAt = 3; - if (result.getQuery().getTraceLevel() >= fillRejectTraceAt) + if (result.getQuery().getTrace().getLevel() >= fillRejectTraceAt) result.getQuery().trace("Ignoring fill(" + summaryClass + "): " + ( result.hits().getFilled() == null ? "Hits are unfillable" : "Hits already filled" ) + ": result.hits().getFilled()=" + result.hits().getFilled(), fillRejectTraceAt); diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java index 71758666b99..4af6757db8c 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java @@ -162,7 +162,7 @@ public abstract class ClusterSearcher extends PingableSearcher implements Nod if (timedOut(query)) return new Result(query, ErrorMessage.createTimeout("No time left for searching")); - if (query.getTraceLevel() >= 8) + if (query.getTrace().getLevel() >= 8) query.trace("Trying " + connection, false, 8); result = robustSearch(query, execution, connection); @@ -170,7 +170,7 @@ public abstract class ClusterSearcher extends PingableSearcher implements Nod if ( ! shouldRetry(query, result)) return result; - if (query.getTraceLevel() >= 6) + if (query.getTrace().getLevel() >= 6) query.trace("Error from connection " + connection + " : " + result.hits().getError(), false, 6); if (result.hits().getError().getCode() == Error.TIMEOUT.code) diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java index 82c570a9975..256ea0185a0 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java @@ -89,7 +89,7 @@ public class ProtobufSerialization { } public static int getTraceLevelForBackend(Query query) { - int traceLevel = query.getTraceLevel(); + int traceLevel = query.getTrace().getLevel(); if (query.getModel().getExecution().trace().getForceTimestamps()) { traceLevel = Math.max(traceLevel, 5); // Backend produces timing information on level 4 and 5 } @@ -157,7 +157,7 @@ public class ProtobufSerialization { if (includeQueryData) { mergeQueryDataToDocsumRequest(query, builder); } - if (query.getTraceLevel() >= 3) { + if (query.getTrace().getLevel() >= 3) { query.trace((includeQueryData ? "ProtoBuf: Resending " : "Not resending ") + "query during document summary fetching", 3); } @@ -250,7 +250,7 @@ public class ProtobufSerialization { if ( ! slimeTrace.isEmpty()) { var traces = new Value.ArrayValue(); traces.add(new SlimeAdapter(BinaryFormat.decode(slimeTrace.toByteArray()).get())); - query.trace(traces, query.getTraceLevel()); + query.trace(traces, query.getTrace().getLevel()); } return result; } diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java index adf03340c6c..21b4d1d538f 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java @@ -487,7 +487,7 @@ public class FederationSearcher extends ForkingSearcher { private void traceTargets(Query query, Collection targets) { int traceFederationLevel = 2; - if ( ! query.isTraceable(traceFederationLevel)) return; + if ( ! query.getTrace().isTraceable(traceFederationLevel)) return; query.trace("Federating to " + targets, traceFederationLevel); } @@ -537,7 +537,7 @@ public class FederationSearcher extends ForkingSearcher { } } - if (query.getTraceLevel()>=4) + if (query.getTrace().getLevel()>=4) query.trace("Got " + group.getConcreteSize() + " hits from " + group.getId(),false, 4); mergedResults.hits().add(group); } 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 694aa76e5f8..2ba33f60ea1 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 @@ -219,7 +219,7 @@ public class GroupingExecutor extends Searcher { if (lastPass > 0) { baseRoot = origRoot.clone(); } - if (query.isTraceable(3) && query.getGroupingSessionCache()) { + if (query.getTrace().isTraceable(3) && query.getGroupingSessionCache()) { query.trace("Grouping in " + (lastPass + 1) + " passes. SessionId='" + query.getSessionId() + "'.", 3); } for (int pass = 0; pass <= lastPass; ++pass) { @@ -242,7 +242,7 @@ public class GroupingExecutor extends Searcher { // noinspection ConstantConditions passRoot = baseRoot.clone(); } - if (query.isTraceable(4) && query.getGroupingSessionCache()) { + if (query.getTrace().isTraceable(4) && query.getGroupingSessionCache()) { query.trace("Grouping with session cache '" + query.getGroupingSessionCache() + "' enabled for pass #" + pass + ".", 4); } if (origRoot != passRoot) { diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/result/PageTemplatesXmlRenderer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/result/PageTemplatesXmlRenderer.java index 6d69a2cb877..98789480a1e 100644 --- a/container-search/src/main/java/com/yahoo/search/pagetemplates/result/PageTemplatesXmlRenderer.java +++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/result/PageTemplatesXmlRenderer.java @@ -122,7 +122,7 @@ public class PageTemplatesXmlRenderer extends AsynchronousSectionedRenderer= 2) + if (parent.getTrace().getLevel() >= 2) parent.trace("Query parsed to: " + parent.yqlRepresentation(), 2); } catch (IllegalArgumentException e) { diff --git a/container-search/src/main/java/com/yahoo/search/query/Trace.java b/container-search/src/main/java/com/yahoo/search/query/Trace.java new file mode 100644 index 00000000000..873cda4415e --- /dev/null +++ b/container-search/src/main/java/com/yahoo/search/query/Trace.java @@ -0,0 +1,234 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.search.query; + +import com.yahoo.api.annotations.Beta; +import com.yahoo.prelude.query.textualrepresentation.TextualQueryRepresentation; +import com.yahoo.processing.request.CompoundName; +import com.yahoo.search.Query; +import com.yahoo.search.query.profile.QueryProfileProperties; +import com.yahoo.search.query.profile.compiled.CompiledQueryProfile; +import com.yahoo.search.query.profile.types.FieldDescription; +import com.yahoo.search.query.profile.types.QueryProfileType; + +import java.util.HashSet; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Trace settings and methods for tracing a query. + * The actual trace is a tree structure stored in the query execution. + * + * @author bratseth + */ +@Beta +public class Trace implements Cloneable { + + private static final Logger log = Logger.getLogger(Trace.class.getName()); + + /** The type representing the property arguments consumed by this */ + private static final QueryProfileType argumentType; + + public static final String TRACE = "trace"; + public static final String LEVEL = "level"; + public static final String TIMESTAMPS = "timestamps"; + public static final String QUERY = "query"; + + static { + argumentType = new QueryProfileType(TRACE); + argumentType.setStrict(true); + argumentType.setBuiltin(true); + argumentType.addField(new FieldDescription(LEVEL, "integer", "tracelevel traceLevel")); + argumentType.addField(new FieldDescription(TIMESTAMPS, "boolean")); + argumentType.addField(new FieldDescription(QUERY, "boolean")); + argumentType.freeze(); + } + + public static QueryProfileType getArgumentType() { return argumentType; } + + private Query parent; + + private int level = 0; + private boolean timestamps = false; + private boolean query = true; + + public Trace(Query parent) { + this.parent = Objects.requireNonNull(parent); + } + + /** Returns the level of detail we'll be tracing at in this query. The default level is 0; no tracing. */ + public int getLevel() { return level; } + public void setLevel(int level) { this.level = level; } + public boolean isTraceable(int level) { return level <= this.level; } + + /** Returns whether trace entries should have a timestamp. Default is false. */ + public boolean getTimestamps() { return timestamps; } + public void setTimestamps(boolean timestamps) { this.timestamps = timestamps; } + + /** Returns whether any trace entries should include the query. Default is true. */ + public boolean getQuery() { return query; } + public void setQuery(boolean query) { this.query = query; } + + /** + * Adds a context message to this query and to the info log, + * if the context level of the query is sufficiently high. + * The context information will be carried over to the result at creation. + * The message parameter will be included with XML escaping. + * + * @param message the message to add + * @param traceLevel the context level of the message, this method will do nothing + * if the traceLevel of the query is lower than this value + */ + public void trace(String message, int traceLevel) { + trace(message, false, traceLevel); + } + + public void trace(Object message, int traceLevel) { + if ( ! isTraceable(traceLevel)) return; + parent.getContext(true).trace(message, 0); + } + + /** + * Adds a trace message to this query + * if the trace level of the query is sufficiently high. + * + * @param message the message to add + * @param includeQuery true to append the query root stringValue at the end of the message + * @param traceLevel the context level of the message, this method will do nothing + * if the traceLevel of the query is lower than this value + */ + public void trace(String message, boolean includeQuery, int traceLevel) { + if ( ! isTraceable(traceLevel)) return; + + if (includeQuery && parent.properties().getBoolean(CompoundName.fromComponents("trace", "query"), true)) + message += ": [" + queryTreeText() + "]"; + + log.log(Level.FINE, message); + + // Pass 0 as traceLevel as the trace level check is already done above, + // and it is not propagated to trace until execution has started + // (it is done in the execution.search method) + parent.getContext(true).trace(message, 0); + } + + /** + * Adds a trace message to this query + * if the trace level of the query is sufficiently high. + * + * @param includeQuery true to append the query root stringValue at the end of the message + * @param traceLevel the context level of the message, this method will do nothing + * if the traceLevel of the query is lower than this value + * @param messages the messages whose toStrings will be concatenated into the trace message. + * Concatenation will only happen if the trace level is sufficiently high. + */ + public void trace(boolean includeQuery, int traceLevel, Object... messages) { + if ( ! isTraceable(traceLevel)) return; + + StringBuilder concatenated = new StringBuilder(); + for (Object message : messages) + concatenated.append(message); + trace(concatenated.toString(), includeQuery, traceLevel); + } + + /** + * Traces how properties was resolved and from where. Done after the fact to avoid special handling + * of tracelevel, which is the property deciding whether this needs to be done + */ + public void traceProperties() { + if (level == 0) return; + CompiledQueryProfile profile = null; + QueryProfileProperties profileProperties = parent.properties().getInstance(QueryProfileProperties.class); + if (profileProperties != null) + profile = profileProperties.getQueryProfile(); + + if (profile == null) + trace("No query profile is used", false, 1); + else + trace("Using " + profile.toString(), false, 1); + + if (level < 4) return; + StringBuilder b = new StringBuilder("Resolved properties:\n"); + Set mentioned = new HashSet<>(); + for (Map.Entry requestProperty : requestProperties().entrySet() ) { + Object resolvedValue = parent.properties().get(requestProperty.getKey(), requestProperties()); + if (resolvedValue == null && requestProperty.getKey().equals("queryProfile")) + resolvedValue = requestProperty.getValue(); + + b.append(requestProperty.getKey()); + b.append(": "); + b.append(resolvedValue); // (may be null) + b.append(" ("); + + if (profile != null && ! profile.isOverridable(new CompoundName(requestProperty.getKey()), requestProperties())) + b.append("from query profile - unoverridable, ignoring request value"); + else + b.append("from request"); + b.append(")\n"); + mentioned.add(requestProperty.getKey()); + } + if (profile != null) { + appendQueryProfileProperties(profile, mentioned, b); + } + trace(b.toString(),false,4); + } + + private void appendQueryProfileProperties(CompiledQueryProfile profile, Set mentioned, StringBuilder b) { + for (var property : profile.listValuesWithSources(CompoundName.empty, requestProperties(), parent.properties()).entrySet()) { + if ( ! mentioned.contains(property.getKey())) + b.append(property.getKey()).append(": ").append(property.getValue()).append("\n"); + } + } + + private Map requestProperties() { + return parent.getHttpRequest().propertyMap(); + } + + private String queryTreeText() { + QueryTree root = parent.getModel().getQueryTree(); + + if (level < 2) + return root.toString(); + if (level < 6) + return parent.yqlRepresentation(); + else + return "\n" + parent.yqlRepresentation() + "\n" + new TextualQueryRepresentation(root.getRoot()) + "\n"; + } + + public Trace cloneFor(Query parent) { + Trace trace = this.clone(); + trace.parent = parent; + return trace; + } + + @Override + public boolean equals(Object o) { + if (o == this ) return true; + if ( ! (o instanceof Trace)) return false; + Trace other = (Trace)o; + if (other.level != this.level) return false; + if (other.timestamps != this.timestamps) return false; + if (other.query != this.query) return false; + return true; + } + + @Override + public int hashCode() { return Objects.hash(level, timestamps, query); } + + @Override + public Trace clone() { + try { + return (Trace)super.clone(); + } + catch (CloneNotSupportedException e) { + throw new RuntimeException(e); + } + } + + @Override + public String toString() { + return "trace [level: " + level + ", timestamps: " + timestamps + ", query: " + query + "]"; + } + +} diff --git a/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java b/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java index 38f76c6ca49..c0ca5ac4731 100644 --- a/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java +++ b/container-search/src/main/java/com/yahoo/search/query/context/QueryContext.java @@ -87,7 +87,7 @@ public class QueryContext implements Cloneable { } public boolean render(Writer writer) throws java.io.IOException { - if (owner.getTraceLevel()!=0) { + if (owner.getTrace().getLevel()!=0) { XMLWriter xmlWriter=XMLWriter.from(writer); xmlWriter.openTag("meta").attribute("type",ID); TraceNode traceRoot=owner.getModel().getExecution().trace().traceNode().root(); diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfile.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfile.java index 989f12172b3..e3ab49f0e32 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfile.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfile.java @@ -344,7 +344,7 @@ public class QueryProfile extends FreezableSimpleComponent implements Cloneable * a primitive value, a substitutable string, a query profile, or null if not found. */ public final Object lookup(String name, Map context) { - return lookup(new CompoundName(name),true,DimensionBinding.createFrom(getDimensions(),context)); + return lookup(new CompoundName(name), true, DimensionBinding.createFrom(getDimensions(),context)); } /** Sets a value in this or any nested profile using null as context */ @@ -733,7 +733,7 @@ public class QueryProfile extends FreezableSimpleComponent implements Cloneable // ----------------- Private ---------------------------------------------------------------------------------- - private Boolean isDeclaredOverridable(CompoundName name,DimensionBinding dimensionBinding) { + private Boolean isDeclaredOverridable(CompoundName name, DimensionBinding dimensionBinding) { QueryProfile parent = lookupParentExact(name, true, dimensionBinding); if (parent.overridable == null) return null; return parent.overridable.get(name.last()); @@ -743,15 +743,15 @@ public class QueryProfile extends FreezableSimpleComponent implements Cloneable * Sets the overridability of a field in this profile, * this overrides the corresponding setting in the type (if any) */ - private void setOverridable(CompoundName fieldName, boolean overridable, DimensionBinding dimensionBinding) { - QueryProfile parent = lookupParentExact(fieldName, true, dimensionBinding); + private void setOverridable(CompoundName name, boolean overridable, DimensionBinding dimensionBinding) { + QueryProfile parent = lookupParentExact(name, true, dimensionBinding); if (dimensionBinding.isNull()) { if (parent.overridable == null) parent.overridable = new HashMap<>(); - parent.overridable.put(fieldName.last(), overridable); + parent.overridable.put(name.last(), overridable); } else { - variants.setOverridable(fieldName.last(), overridable, dimensionBinding.getValues()); + variants.setOverridable(name.last(), overridable, dimensionBinding.getValues()); } } diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java index 4cced8d7923..cc84cba327f 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java @@ -11,6 +11,7 @@ import com.yahoo.search.query.Presentation; import com.yahoo.search.query.Properties; import com.yahoo.search.query.Ranking; import com.yahoo.search.query.Select; +import com.yahoo.search.query.Trace; import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry; import com.yahoo.search.query.profile.types.ConversionContext; import com.yahoo.search.query.profile.types.FieldDescription; @@ -132,10 +133,15 @@ public class QueryProperties extends Properties { } else if (key.size() == 3 && key.get(1).equals(Presentation.FORMAT)) { if (key.last().equals(Presentation.TENSORS)) return query.getPresentation().getTensorShortForm(); } - } else if (key.size() == 1) { + } + else if (key.size() == 2 && key.first().equals(Trace.TRACE)) { + if (key.last().equals(Trace.LEVEL)) return query.getTrace().getLevel(); + if (key.last().equals(Trace.TIMESTAMPS)) return query.getTrace().getTimestamps(); + if (key.last().equals(Trace.QUERY)) return query.getTrace().getQuery(); + } + else if (key.size() == 1) { if (key.equals(Query.HITS)) return query.getHits(); if (key.equals(Query.OFFSET)) return query.getOffset(); - if (key.equals(Query.TRACE_LEVEL)) return query.getTraceLevel(); if (key.equals(Query.EXPLAIN_LEVEL)) return query.getExplainLevel(); if (key.equals(Query.TIMEOUT)) return query.getTimeout(); if (key.equals(Query.NO_CACHE)) return query.getNoCache(); @@ -301,6 +307,14 @@ public class QueryProperties extends Properties { else throwIllegalParameter(key.last(), Presentation.PRESENTATION); } + else if (key.size() == 2 && key.first().equals(Trace.TRACE)) { + if (key.last().equals(Trace.LEVEL)) + query.getTrace().setLevel(asInteger(value, 0)); + if (key.last().equals(Trace.TIMESTAMPS)) + query.getTrace().setTimestamps(asBoolean(value, false)); + if (key.last().equals(Trace.QUERY)) + query.getTrace().setQuery(asBoolean(value, true)); + } else if (key.first().equals(Select.SELECT)) { if (key.size() == 1) { query.getSelect().setGroupingExpressionString(asString(value, "")); @@ -322,8 +336,6 @@ public class QueryProperties extends Properties { query.setHits(asInteger(value,10)); else if (key.equals(Query.OFFSET)) query.setOffset(asInteger(value,0)); - else if (key.equals(Query.TRACE_LEVEL)) - query.setTraceLevel(asInteger(value,0)); else if (key.equals(Query.EXPLAIN_LEVEL)) query.setExplainLevel(asInteger(value,0)); else if (key.equals(Query.TIMEOUT)) diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java index d3bb1e7a81d..f43be20e0ac 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java @@ -39,7 +39,7 @@ public class BooleanSearcher extends Searcher { if (fieldName != null) { return search(query, execution, fieldName); } else { - if (query.isTraceable(5)) { + if (query.getTrace().isTraceable(5)) { query.trace("BooleanSearcher: Nothing added to query", false, 5); } } @@ -49,7 +49,7 @@ public class BooleanSearcher extends Searcher { private Result search(Query query, Execution execution, String fieldName) { String attributes = query.properties().getString(ATTRIBUTES); String rangeAttributes = query.properties().getString(RANGE_ATTRIBUTES); - if (query.isTraceable(5)) { + if (query.getTrace().isTraceable(5)) { query.trace("BooleanSearcher: fieldName(" + fieldName + "), attributes(" + attributes + "), rangeAttributes(" + rangeAttributes + ")", false, 5); } @@ -57,7 +57,7 @@ public class BooleanSearcher extends Searcher { if (attributes != null || rangeAttributes != null) { try { addPredicateTerm(query, fieldName, attributes, rangeAttributes); - if (query.isTraceable(4)) { + if (query.getTrace().isTraceable(4)) { query.trace("BooleanSearcher: Added boolean operator", true, 4); } } catch (TokenMgrException e) { @@ -68,7 +68,7 @@ public class BooleanSearcher extends Searcher { } } else { - if (query.isTraceable(5)) { + if (query.getTrace().isTraceable(5)) { query.trace("BooleanSearcher: Nothing added to query", false, 5); } } diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java index a9195aaafa7..430a397e6b9 100644 --- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java +++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java @@ -223,7 +223,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer { protected void renderTrace(Trace trace) throws IOException { if (!trace.traceNode().children().iterator().hasNext()) return; - if (getResult().getQuery().getTraceLevel() == 0) return; + if (getResult().getQuery().getTrace().getLevel() == 0) return; try { long basetime = trace.traceNode().timestamp(); diff --git a/container-search/src/main/java/com/yahoo/search/rendering/XmlRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/XmlRenderer.java index f93c70c0199..53e59d9deea 100644 --- a/container-search/src/main/java/com/yahoo/search/rendering/XmlRenderer.java +++ b/container-search/src/main/java/com/yahoo/search/rendering/XmlRenderer.java @@ -160,7 +160,7 @@ public final class XmlRenderer extends AsynchronousSectionedRenderer { @SuppressWarnings("UnusedParameters") public void queryContext(XMLWriter writer, QueryContext queryContext, Query owner) throws IOException { - if (owner.getTraceLevel()!=0) { + if (owner.getTrace().getLevel()!=0) { XMLWriter xmlWriter=XMLWriter.from(writer); xmlWriter.openTag("meta").attribute("type", QueryContext.ID); TraceNode traceRoot = owner.getModel().getExecution().trace().traceNode().root(); diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java index 02537e63a6b..988021a6da0 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java @@ -494,7 +494,7 @@ public class Execution extends com.yahoo.processing.execution.Execution { // Transfer state between query and execution as the execution constructors does not do that completely query.getModel().setExecution(this); - trace().setTraceLevel(query.getTraceLevel()); + trace().setTraceLevel(query.getTrace().getLevel()); return (Result)super.process(query); } @@ -504,7 +504,7 @@ public class Execution extends com.yahoo.processing.execution.Execution { super.onInvoking(request,processor); final int traceDependencies = 6; Query query = (Query) request; - if (query.getTraceLevel() >= traceDependencies) { + if (query.getTrace().getLevel() >= traceDependencies) { query.trace(processor.getId() + " " + processor.getDependencies(), traceDependencies); } } diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java index 7f4de2e43f5..51035e3e313 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java @@ -45,9 +45,9 @@ import java.util.logging.Logger; */ public class VdsStreamingSearcher extends VespaBackEndSearcher { - private static final CompoundName streamingUserid=new CompoundName("streaming.userid"); - private static final CompoundName streamingGroupname=new CompoundName("streaming.groupname"); - private static final CompoundName streamingSelection=new CompoundName("streaming.selection"); + private static final CompoundName streamingUserid = new CompoundName("streaming.userid"); + private static final CompoundName streamingGroupname = new CompoundName("streaming.groupname"); + private static final CompoundName streamingSelection = new CompoundName("streaming.selection"); static final String STREAMING_STATISTICS = "streaming.statistics"; private final VisitorFactory visitorFactory; @@ -142,13 +142,13 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { private boolean shouldTraceQuery(Query query) { // Only trace for explicit bucket subset queries, as otherwise we'd get a trace entry for every superbucket in the system. return (queryIsLocationConstrained(query) && - ((query.getTraceLevel() > 0) || tracingOptions.getSamplingStrategy().shouldSample())); + ((query.getTrace().getLevel() > 0) || tracingOptions.getSamplingStrategy().shouldSample())); } private int inferEffectiveQueryTraceLevel(Query query) { - return ((query.getTraceLevel() == 0) && shouldTraceQuery(query)) // Honor query's explicit trace level if present. + return ((query.getTrace().getLevel() == 0) && shouldTraceQuery(query)) // Honor query's explicit trace level if present. ? tracingOptions.getTraceLevelOverride() - : query.getTraceLevel(); + : query.getTrace().getLevel(); } @Override @@ -308,7 +308,7 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { } private static void lazyTrace(Query query, int level, Object... args) { - if (query.isTraceable(level)) { + if (query.getTrace().isTraceable(level)) { StringBuilder s = new StringBuilder(); for (Object arg : args) { s.append(arg); diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java index 22f77e6f19d..bd96f888b87 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java @@ -94,7 +94,7 @@ class VdsVisitor extends VisitorDataHandler implements Visitor { } else if (log.isLoggable(Level.FINE)) { implicitLevel = 7; } - return Math.max(query.getTraceLevel(), implicitLevel); + return Math.max(query.getTrace().getLevel(), implicitLevel); } private static String createSelectionString(String documentType, String selection) { diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java index 0694c1a7e55..7ab50118c6d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java @@ -84,7 +84,7 @@ public class NormalizingSearcherTestCase { @Test public void testPhraseQuery() { Query query = new Query("/search?query=" + enc("\"b\u00e9yonc\u00e8 beyonc\u00e9\"") + "&search=cluster1&restrict=type1"); - query.setTraceLevel(2); + query.getTrace().setLevel(2); createExecution().search(query); assertEquals("WEAKAND(100) \"beyonce beyonce\"", query.getModel().getQueryTree().getRoot().toString()); } diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/JSONDebugSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/JSONDebugSearcherTestCase.java index 2841ce5521a..6a230da4950 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/JSONDebugSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/JSONDebugSearcherTestCase.java @@ -14,36 +14,35 @@ import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchchain.testutil.DocumentSourceSearcher; import com.yahoo.yolean.trace.TraceNode; import com.yahoo.yolean.trace.TraceVisitor; -import org.junit.After; -import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * Visit the trace and check JSON payload is stored there when requested. * - * @author Steinar Knutsen + * @author Steinar Knutsen */ public class JSONDebugSearcherTestCase { private static final String NODUMPJSON = "?query=1&tracelevel=6"; private static final String DUMPJSON = "?query=1&dumpjson=jsonfield&tracelevel=6"; - private Chain searchChain; - private static class LookForJson extends TraceVisitor { - private static final String JSON_PAYLOAD = "{1: 2}"; - public boolean gotJson = false; - - @Override - public void visit(TraceNode node) { - if (node.payload() == null || node.payload().getClass() != String.class) { - return; - } - if (node.payload().toString().equals(JSONDebugSearcher.JSON_FIELD + JSON_PAYLOAD)) { - gotJson = true; - } - } + @Test + public void test() { + Chain searchChain = makeSearchChain("{1: 2}", new JSONDebugSearcher()); + Execution e = new Execution(searchChain, Execution.Context.createContextStub()); + e.search(new Query(NODUMPJSON)); + Trace t = e.trace(); + LookForJson visitor = new LookForJson(); + t.accept(visitor); + assertFalse(visitor.gotJson); + e = new Execution(searchChain, Execution.Context.createContextStub()); + e.search(new Query(DUMPJSON)); + t = e.trace(); + t.accept(visitor); + assertTrue(visitor.gotJson); } private Chain makeSearchChain(String content, Searcher dumper) { @@ -63,29 +62,20 @@ public class JSONDebugSearcherTestCase { docsource.addResult(q, r); } + private static class LookForJson extends TraceVisitor { - @Before - public void setUp() throws Exception { - searchChain = makeSearchChain("{1: 2}", new JSONDebugSearcher()); - } - - @After - public void tearDown() throws Exception { - } + private static final String JSON_PAYLOAD = "{1: 2}"; + public boolean gotJson = false; - @Test - public final void test() { - Execution e = new Execution(searchChain, Execution.Context.createContextStub()); - e.search(new Query(NODUMPJSON)); - Trace t = e.trace(); - LookForJson visitor = new LookForJson(); - t.accept(visitor); - assertEquals(false, visitor.gotJson); - e = new Execution(searchChain, Execution.Context.createContextStub()); - e.search(new Query(DUMPJSON)); - t = e.trace(); - t.accept(visitor); - assertEquals(true, visitor.gotJson); + @Override + public void visit(TraceNode node) { + if (node.payload() == null || node.payload().getClass() != String.class) { + return; + } + if (node.payload().toString().equals(JSONDebugSearcher.JSON_FIELD + JSON_PAYLOAD)) { + gotJson = true; + } + } } } diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java index 347276d680d..e07d38fbf10 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java @@ -488,7 +488,7 @@ public class InterleavedSearchInvokerTest { public TestQuery() { super(); setTimeout(5000); - setTraceLevel(5); + getTrace().setLevel(5); } @Override diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/XmlReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/XmlReadingTestCase.java index b1faac2036b..62bc89c8453 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/XmlReadingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/XmlReadingTestCase.java @@ -49,80 +49,82 @@ public class XmlReadingTestCase { @Test public void testValid() { - QueryProfileRegistry registry= + QueryProfileRegistry registry = new QueryProfileXMLReader().read("src/test/java/com/yahoo/search/query/profile/config/test/validxml"); - CompiledQueryProfileRegistry cRegistry= registry.compile(); + CompiledQueryProfileRegistry cRegistry = registry.compile(); QueryProfileType rootType = registry.getType("rootType"); - assertEquals(1,rootType.inherited().size()); - assertEquals("native",rootType.inherited().get(0).getId().getName()); + assertEquals(1, rootType.inherited().size()); + assertEquals("native", rootType.inherited().get(0).getId().getName()); assertTrue(rootType.isStrict()); assertTrue(rootType.getMatchAsPath()); - FieldDescription timeField=rootType.getField("time"); + FieldDescription timeField = rootType.getField("time"); assertTrue(timeField.isMandatory()); - assertEquals("long",timeField.getType().toInstanceDescription()); - FieldDescription userField=rootType.getField("user"); + assertEquals("long", timeField.getType().toInstanceDescription()); + FieldDescription userField = rootType.getField("user"); assertFalse(userField.isMandatory()); - assertEquals("reference to a query profile of type 'user'",userField.getType().toInstanceDescription()); + assertEquals("reference to a query profile of type 'user'", userField.getType().toInstanceDescription()); - QueryProfileType user=registry.getType("user"); - assertEquals(0,user.inherited().size()); + QueryProfileType user = registry.getType("user"); + assertEquals(0, user.inherited().size()); assertFalse(user.isStrict()); assertFalse(user.getMatchAsPath()); assertTrue(userField.isOverridable()); - FieldDescription ageField=user.getField("age"); + FieldDescription ageField = user.getField("age"); assertTrue(ageField.isMandatory()); - assertEquals("integer",ageField.getType().toInstanceDescription()); - FieldDescription robotField=user.getField("robot"); + assertEquals("integer", ageField.getType().toInstanceDescription()); + FieldDescription robotField = user.getField("robot"); assertFalse(robotField.isMandatory()); assertFalse(robotField.isOverridable()); - assertEquals("boolean",robotField.getType().toInstanceDescription()); + assertEquals("boolean", robotField.getType().toInstanceDescription()); - CompiledQueryProfile defaultProfile=cRegistry.getComponent("default"); + CompiledQueryProfile defaultProfile = cRegistry.getComponent("default"); assertNull(defaultProfile.getType()); - assertEquals("20",defaultProfile.get("hits")); + assertEquals("20", defaultProfile.get("hits")); assertFalse(defaultProfile.isOverridable(new CompoundName("hits"), null)); assertFalse(defaultProfile.isOverridable(new CompoundName("user.trusted"), null)); - assertEquals("false",defaultProfile.get("user.trusted")); + assertEquals("false", defaultProfile.get("user.trusted")); - CompiledQueryProfile referencingProfile=cRegistry.getComponent("referencingModelSettings"); + CompiledQueryProfile referencingProfile = cRegistry.getComponent("referencingModelSettings"); assertNull(referencingProfile.getType()); - assertEquals("some query",referencingProfile.get("model.queryString")); - assertEquals("aDefaultIndex",referencingProfile.get("model.defaultIndex")); + assertEquals("some query", referencingProfile.get("model.queryString")); + assertEquals("aDefaultIndex", referencingProfile.get("model.defaultIndex")); // Request parameters here should be ignored - HttpRequest request=HttpRequest.createTestRequest("?query=foo&user.trusted=true&default-index=title", Method.GET); - Query query=new Query(request, defaultProfile); - assertEquals("false",query.properties().get("user.trusted")); - assertEquals("default",query.getModel().getDefaultIndex()); - assertEquals("default",query.properties().get("default-index")); - - CompiledQueryProfile rootProfile=cRegistry.getComponent("root"); - assertEquals("rootType",rootProfile.getType().getId().getName()); - assertEquals(30,rootProfile.get("hits")); - assertEquals(3,rootProfile.get("traceLevel")); + HttpRequest request = HttpRequest.createTestRequest("?query=foo&user.trusted=true&default-index=title", Method.GET); + Query query = new Query(request, defaultProfile); + assertEquals("false", query.properties().get("user.trusted")); + assertEquals("default", query.getModel().getDefaultIndex()); + assertEquals("default", query.properties().get("default-index")); + + CompiledQueryProfile rootProfile = cRegistry.getComponent("root"); + assertEquals("rootType", rootProfile.getType().getId().getName()); + assertEquals(30, rootProfile.get("hits")); + //assertEquals(3, rootProfile.get("traceLevel")); assertTrue(rootProfile.isOverridable(new CompoundName("hits"), null)); + query = new Query(request, rootProfile); + assertEquals(3, query.getTrace().getLevel()); - QueryProfile someUser=registry.getComponent("someUser"); + QueryProfile someUser = registry.getComponent("someUser"); assertEquals("5",someUser.get("sub.test")); assertEquals(18,someUser.get("age")); // aliases - assertEquals(18,someUser.get("alder")); - assertEquals(18,someUser.get("anno")); - assertEquals(18,someUser.get("aLdER")); - assertEquals(18,someUser.get("ANNO")); + assertEquals(18, someUser.get("alder")); + assertEquals(18, someUser.get("anno")); + assertEquals(18, someUser.get("aLdER")); + assertEquals(18, someUser.get("ANNO")); assertNull(someUser.get("Age")); // Only aliases are case insensitive Map context = new HashMap<>(); context.put("x", "x1"); assertEquals(37, someUser.get("alder", context, null)); - assertEquals(37,someUser.get("anno", context, null)); - assertEquals(37,someUser.get("aLdER", context, null)); - assertEquals(37,someUser.get("ANNO", context, null)); - assertEquals("male",someUser.get("gender", context, null)); - assertEquals("male",someUser.get("sex", context, null)); - assertEquals("male",someUser.get("Sex", context, null)); + assertEquals(37, someUser.get("anno", context, null)); + assertEquals(37, someUser.get("aLdER", context, null)); + assertEquals(37, someUser.get("ANNO", context, null)); + assertEquals("male", someUser.get("gender", context, null)); + assertEquals("male", someUser.get("sex", context, null)); + assertEquals("male", someUser.get("Sex", context, null)); assertNull(someUser.get("Gender", context, null)); // Only aliases are case insensitive } diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/root.xml b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/root.xml index 82ff7afb186..e7a5f132aaf 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/root.xml +++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/validxml/root.xml @@ -4,6 +4,6 @@ 30 - 3 + 3 diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java index 90da5a5b746..f89e0d921d7 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/TraceTestCase.java @@ -118,7 +118,8 @@ public class TraceTestCase { private void assertTracing(boolean carryOverContext, boolean parallel) { Query query = new Query("?tracelevel=1"); - query.trace("Before execution",1); + assertEquals(1, query.getTrace().getLevel()); + query.trace("Before execution", 1); Chain forkingChain = new Chain<>(new Tracer("forker"), new Forker(carryOverContext, parallel, new Tracer("branch 1") , @@ -222,8 +223,8 @@ public class TraceTestCase { private static class TraceCollector extends TraceVisitor { - private List trace = new ArrayList<>(); - private StringBuilder indent = new StringBuilder(); + private final List trace = new ArrayList<>(); + private final StringBuilder indent = new StringBuilder(); @Override public void entering(TraceNode node) { @@ -249,7 +250,8 @@ public class TraceTestCase { private static class Tracer extends Searcher { - private String name; + private final String name; + private int counter = 0; public Tracer(String name) { @@ -262,17 +264,18 @@ public class TraceTestCase { query.trace("During " + name + ": " + (counter++),1); return execution.search(query); } + } private static class Forker extends Searcher { - private List branches; + private final List branches; /** If true, this is using the api as recommended, if false, it is not */ - private boolean carryOverContext; + private final boolean carryOverContext; /** If true, simulate parallel execution by cloning the query */ - private boolean parallel; + private final boolean parallel; public Forker(boolean carryOverContext, boolean parallel, Searcher ... branches) { this.carryOverContext = carryOverContext; @@ -280,7 +283,6 @@ public class TraceTestCase { this.branches = Arrays.asList(branches); } - @SuppressWarnings("deprecation") @Override public Result search(Query query, Execution execution) { Result result = execution.search(query); @@ -319,6 +321,7 @@ public class TraceTestCase { result.hits().add(hit1); return result; } + } } diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java index 5c5d9006d1a..47853b180db 100644 --- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java @@ -552,7 +552,7 @@ public class QueryTestCase { @Test public void testTracing() { Query q = new Query("?query=foo&type=all&traceLevel=2"); - assertEquals(2, q.getTraceLevel()); + assertEquals(2, q.getTrace().getLevel()); q.trace(true, 1, "trace1"); q.trace(false,2, "trace2"); q.trace(true, 3, "Ignored"); @@ -571,7 +571,7 @@ public class QueryTestCase { @Test public void testNullTracing() { Query q = new Query("?query=foo&traceLevel=2"); - assertEquals(2, q.getTraceLevel()); + assertEquals(2, q.getTrace().getLevel()); q.trace(false,2, "trace2 ", null); Set traces = new HashSet<>(); for (String trace : q.getContext(true).getTrace().traceNode().descendants(String.class)) @@ -583,7 +583,7 @@ public class QueryTestCase { public void testExplain() { Query q = new Query("?query=foo&explainLevel=2"); assertEquals(2, q.getExplainLevel()); - assertEquals(0, q.getTraceLevel()); + assertEquals(0, q.getTrace().getLevel()); } @Test diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java index 861be9a3ade..835235a593c 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java @@ -170,10 +170,10 @@ public class VdsStreamingSearcherTestCase { } else if (i == 1) { query.getPresentation().setSummary("summary"); } else if (i == 2) { - query.setTraceLevel(100); + query.getTrace().setLevel(100); } else if (i == 3) { query.getPresentation().setSummary("summary"); - query.setTraceLevel(100); + query.getTrace().setLevel(100); } queries[i] = query; } -- cgit v1.2.3 From 1a4e603b63216fd459b4b1a6e26e27d737f39c37 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 14 Jun 2022 15:55:57 +0200 Subject: Move explainLevel into query.trace --- .../com/yahoo/search/query/gui/GUIHandler.java | 6 ++- .../src/main/java/com/yahoo/search/Query.java | 43 +++++++--------------- .../search/dispatch/rpc/ProtobufSerialization.java | 4 +- .../main/java/com/yahoo/search/query/Trace.java | 12 +++++- .../search/query/properties/QueryProperties.java | 6 +-- .../java/com/yahoo/search/test/QueryTestCase.java | 2 +- 6 files changed, 33 insertions(+), 40 deletions(-) (limited to 'container-search-gui') diff --git a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java index 901045bdb1f..e370b1f19d3 100644 --- a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java +++ b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java @@ -194,8 +194,10 @@ public class GUIHandler extends ThreadedHttpRequestHandler { ArrayNode levelZeroParameters = jsonMapper.createArrayNode().add(MinimalQueryInserter.YQL.toString()).add(Query.HITS.toString()).add(Query.OFFSET.toString()) .add("queryProfile").add(Query.NO_CACHE.toString()).add(Query.GROUPING_SESSION_CACHE.toString()) - .add(Query.SEARCH_CHAIN.toString()).add(Query.TIMEOUT.toString()).add("trace").add("tracelevel") - .add(Trace.LEVEL).add(Query.EXPLAIN_LEVEL.toString()).add("explainlevel").add(Model.MODEL).add(Ranking.RANKING).add("collapse").add("collapsesize").add("collapsefield") + .add(Query.SEARCH_CHAIN.toString()).add(Query.TIMEOUT.toString()).add("trace") + .add("tracelevel").add("traceLevel") // TODO: Remove on Vespa 9 + .add("explainLevel").add("explainlevel") // TODO: Remove on Vespa 9 + .add(Model.MODEL).add(Ranking.RANKING).add("collapse").add("collapsesize").add("collapsefield") .add(Presentation.PRESENTATION).add("pos").add("streaming").add("rules").add(RecallSearcher.recallName.toString()).add("user") .add("metrics").add(""); json.set("levelZeroParameters", levelZeroParameters); 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 131fe8d151a..b50a7ccc2db 100644 --- a/container-search/src/main/java/com/yahoo/search/Query.java +++ b/container-search/src/main/java/com/yahoo/search/Query.java @@ -138,9 +138,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { /** The number of hits to return */ private int hits = 10; - /** The query explain level, 0 means no explaining */ - private int explainLevel = 0; - // The timeout to be used when dumping rank features private static final long dumpTimeout = (6 * 60 * 1000); // 6 minutes private static final long defaultTimeout = 500; @@ -189,7 +186,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { public static final CompoundName QUERY_PROFILE = new CompoundName("queryProfile"); public static final CompoundName SEARCH_CHAIN = new CompoundName("searchChain"); - public static final CompoundName EXPLAIN_LEVEL = new CompoundName("explainLevel"); public static final CompoundName NO_CACHE = new CompoundName("noCache"); public static final CompoundName GROUPING_SESSION_CACHE = new CompoundName("groupingSessionCache"); public static final CompoundName TIMEOUT = new CompoundName("timeout"); @@ -198,6 +194,10 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { @Deprecated // TODO: Remove on Vespa 9 public static final CompoundName TRACE_LEVEL = new CompoundName("traceLevel"); + /** @deprecated use Trace.EXPLAIN_LEVEL */ + @Deprecated // TODO: Remove on Vespa 9 + public static final CompoundName EXPLAIN_LEVEL = new CompoundName("explainLevel"); + private static final QueryProfileType argumentType; static { argumentType = new QueryProfileType("native"); @@ -209,7 +209,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { argumentType.addField(new FieldDescription(HITS.toString(), "integer", "hits count")); argumentType.addField(new FieldDescription(QUERY_PROFILE.toString(), "string")); argumentType.addField(new FieldDescription(SEARCH_CHAIN.toString(), "string")); - argumentType.addField(new FieldDescription(EXPLAIN_LEVEL.toString(), "integer", "explainlevel")); argumentType.addField(new FieldDescription(NO_CACHE.toString(), "boolean", "nocache")); argumentType.addField(new FieldDescription(GROUPING_SESSION_CACHE.toString(), "boolean", "groupingSessionCache")); argumentType.addField(new FieldDescription(TIMEOUT.toString(), "string", "timeout")); @@ -543,35 +542,21 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { */ public void resetTimeout() { this.startTime = System.currentTimeMillis(); } - /** - * Sets the context level of this query, 0 means no tracing - * Higher numbers means increasingly more tracing - * - * @deprecated use getTrace().setLevel(level) - */ + /** @deprecated use getTrace().setLevel(level) */ @Deprecated // TODO: Remove on Vespa 9 public void setTraceLevel(int traceLevel) { trace.setLevel(traceLevel); } - /** - * Sets the explain level of this query, 0 means no tracing - * Higher numbers means increasingly more explaining - */ - public void setExplainLevel(int explainLevel) { this.explainLevel = explainLevel; } + /** @deprecated use getTrace().setExplainLevel(level) */ + @Deprecated // TODO: Remove on Vespa 9 + public void setExplainLevel(int explainLevel) { trace.setExplainLevel(explainLevel); } - /** - * Returns the context level of this query, 0 means no tracing - * Higher numbers means increasingly more tracing - * - * @deprecated use getTrace().setLevel(level) - */ + /** @deprecated use getTrace().setLevel(level) */ @Deprecated // TODO: Remove on Vespa 9 public int getTraceLevel() { return trace.getLevel(); } - /** - * Returns the explain level of this query, 0 means no tracing - * Higher numbers means increasingly more explaining - */ - public int getExplainLevel() { return explainLevel; } + /** @deprecated use getTrace().getExplainLevel(level) */ + @Deprecated // TODO: Remove on Vespa 9 + public int getExplainLevel() { return getTrace().getExplainLevel(); } /** * Returns the context level of this query, 0 means no tracing @@ -701,7 +686,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { */ public void attachContext(Query query) throws IllegalStateException { query.getTrace().setLevel(getTrace().getLevel()); - query.setExplainLevel(getExplainLevel()); + query.getTrace().setExplainLevel(getTrace().getExplainLevel()); if (context == null) return; if (query.getContext(false) != null) { // If we added the other query's context info as a subnode in this @@ -901,8 +886,6 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { assert (clone.properties().getParentQuery() == clone); clone.setTimeout(getTimeout()); - clone.setTraceLevel(getTraceLevel()); - clone.setExplainLevel(getExplainLevel()); clone.setHits(getHits()); clone.setOffset(getOffset()); clone.setNoCache(getNoCache()); diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java index 256ea0185a0..8b2457606ab 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java @@ -93,8 +93,8 @@ public class ProtobufSerialization { if (query.getModel().getExecution().trace().getForceTimestamps()) { traceLevel = Math.max(traceLevel, 5); // Backend produces timing information on level 4 and 5 } - if (query.getExplainLevel() > 0) { - traceLevel = Math.max(traceLevel, query.getExplainLevel() + 5); + if (query.getTrace().getExplainLevel() > 0) { + traceLevel = Math.max(traceLevel, query.getTrace().getExplainLevel() + 5); } return traceLevel; } diff --git a/container-search/src/main/java/com/yahoo/search/query/Trace.java b/container-search/src/main/java/com/yahoo/search/query/Trace.java index 024e956e0ef..9f056b14c21 100644 --- a/container-search/src/main/java/com/yahoo/search/query/Trace.java +++ b/container-search/src/main/java/com/yahoo/search/query/Trace.java @@ -33,6 +33,7 @@ public class Trace implements Cloneable { public static final String TRACE = "trace"; public static final String LEVEL = "level"; + public static final String EXPLAIN_LEVEL = "explainLevel"; public static final String TIMESTAMPS = "timestamps"; public static final String QUERY = "query"; @@ -41,6 +42,7 @@ public class Trace implements Cloneable { argumentType.setStrict(true); argumentType.setBuiltin(true); argumentType.addField(new FieldDescription(LEVEL, "integer", "tracelevel traceLevel")); + argumentType.addField(new FieldDescription(EXPLAIN_LEVEL, "integer", "explainlevel explainLevel")); argumentType.addField(new FieldDescription(TIMESTAMPS, "boolean")); argumentType.addField(new FieldDescription(QUERY, "boolean")); argumentType.freeze(); @@ -51,6 +53,7 @@ public class Trace implements Cloneable { private Query parent; private int level = 0; + private int explainLevel = 0; private boolean timestamps = false; private boolean query = true; @@ -63,6 +66,10 @@ public class Trace implements Cloneable { public void setLevel(int level) { this.level = level; } public boolean isTraceable(int level) { return level <= this.level; } + /** Sets the explain level of this query, 0 means no tracing. Higher numbers means increasingly more explaining. */ + public void setExplainLevel(int explainLevel) { this.explainLevel = explainLevel; } + public int getExplainLevel() { return explainLevel; } + /** Returns whether trace entries should have a timestamp. Default is false. */ public boolean getTimestamps() { return timestamps; } public void setTimestamps(boolean timestamps) { this.timestamps = timestamps; } @@ -208,13 +215,14 @@ public class Trace implements Cloneable { if ( ! (o instanceof Trace)) return false; Trace other = (Trace)o; if (other.level != this.level) return false; + if (other.explainLevel != this.explainLevel) return false; if (other.timestamps != this.timestamps) return false; if (other.query != this.query) return false; return true; } @Override - public int hashCode() { return Objects.hash(level, timestamps, query); } + public int hashCode() { return Objects.hash(level, explainLevel, timestamps, query); } @Override public Trace clone() { @@ -228,7 +236,7 @@ public class Trace implements Cloneable { @Override public String toString() { - return "trace [level: " + level + ", timestamps: " + timestamps + ", query: " + query + "]"; + return "trace [level: " + level + ", explainLevel: " + explainLevel + ", timestamps: " + timestamps + ", query: " + query + "]"; } } diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java index cc84cba327f..f6e158cf04a 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java @@ -136,13 +136,13 @@ public class QueryProperties extends Properties { } else if (key.size() == 2 && key.first().equals(Trace.TRACE)) { if (key.last().equals(Trace.LEVEL)) return query.getTrace().getLevel(); + if (key.last().equals(Trace.EXPLAIN_LEVEL)) return query.getTrace().getExplainLevel(); if (key.last().equals(Trace.TIMESTAMPS)) return query.getTrace().getTimestamps(); if (key.last().equals(Trace.QUERY)) return query.getTrace().getQuery(); } else if (key.size() == 1) { if (key.equals(Query.HITS)) return query.getHits(); if (key.equals(Query.OFFSET)) return query.getOffset(); - if (key.equals(Query.EXPLAIN_LEVEL)) return query.getExplainLevel(); if (key.equals(Query.TIMEOUT)) return query.getTimeout(); if (key.equals(Query.NO_CACHE)) return query.getNoCache(); if (key.equals(Query.GROUPING_SESSION_CACHE)) return query.getGroupingSessionCache(); @@ -310,6 +310,8 @@ public class QueryProperties extends Properties { else if (key.size() == 2 && key.first().equals(Trace.TRACE)) { if (key.last().equals(Trace.LEVEL)) query.getTrace().setLevel(asInteger(value, 0)); + if (key.last().equals(Trace.EXPLAIN_LEVEL)) + query.getTrace().setExplainLevel(asInteger(value, 0)); if (key.last().equals(Trace.TIMESTAMPS)) query.getTrace().setTimestamps(asBoolean(value, false)); if (key.last().equals(Trace.QUERY)) @@ -336,8 +338,6 @@ public class QueryProperties extends Properties { query.setHits(asInteger(value,10)); else if (key.equals(Query.OFFSET)) query.setOffset(asInteger(value,0)); - else if (key.equals(Query.EXPLAIN_LEVEL)) - query.setExplainLevel(asInteger(value,0)); else if (key.equals(Query.TIMEOUT)) query.setTimeout(value.toString()); else if (key.equals(Query.NO_CACHE)) diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java index 47853b180db..7cd7e20b76f 100644 --- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java @@ -582,7 +582,7 @@ public class QueryTestCase { @Test public void testExplain() { Query q = new Query("?query=foo&explainLevel=2"); - assertEquals(2, q.getExplainLevel()); + assertEquals(2, q.getTrace().getExplainLevel()); assertEquals(0, q.getTrace().getLevel()); } -- cgit v1.2.3