diff options
| author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-05-16 13:20:56 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:22 +0200 |
| commit | 4639be4f03d58a0b8df7b1ecb573e7d344a53ed5 (patch) | |
| tree | 236d8b271e2e51c5e15df08bc19c4c97860ca16a | |
| parent | 1e03a00cd6f69cf63d942885e97ff7582778c7f5 (diff) | |
Remove top-level <clients> element and LoadType concept
Load types have not been properly supported for some time, so remove
the remaining API surfaces exposing them. Since load type config was
the last remaining use of <clients> in services.xml, remove that one
as well.
47 files changed, 40 insertions, 786 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java index 19805adc637..6a474b84161 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java +++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java @@ -22,7 +22,6 @@ import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.messagebus.MessagebusConfig; import com.yahoo.vespa.config.content.AllClustersBucketSpacesConfig; import com.yahoo.vespa.config.content.DistributionConfig; -import com.yahoo.vespa.config.content.LoadTypeConfig; import com.yahoo.vespa.configmodel.producers.DocumentManager; import com.yahoo.vespa.configmodel.producers.DocumentTypes; import com.yahoo.vespa.documentmodel.DocumentModel; @@ -33,7 +32,6 @@ import com.yahoo.vespa.model.PortsMeta; import com.yahoo.vespa.model.Service; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.admin.Admin; -import com.yahoo.vespa.model.clients.Clients; import com.yahoo.vespa.model.content.cluster.ContentCluster; import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer; import com.yahoo.vespa.model.routing.Routing; @@ -213,15 +211,6 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra } @Override - public void getConfig(LoadTypeConfig.Builder builder) { - VespaModel model = (VespaModel) getRoot(); - Clients clients = model.getClients(); - if (clients != null) { - clients.getConfig(builder); - } - } - - @Override public void getConfig(ClusterListConfig.Builder builder) { VespaModel model = (VespaModel) getRoot(); for (ContentCluster cluster : model.getContentClusters().values()) { diff --git a/config-model/src/main/java/com/yahoo/config/model/CommonConfigsProducer.java b/config-model/src/main/java/com/yahoo/config/model/CommonConfigsProducer.java index f8632a6b187..22e505b066c 100644 --- a/config-model/src/main/java/com/yahoo/config/model/CommonConfigsProducer.java +++ b/config-model/src/main/java/com/yahoo/config/model/CommonConfigsProducer.java @@ -4,7 +4,6 @@ package com.yahoo.config.model; import com.yahoo.cloud.config.ApplicationIdConfig; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.vespa.config.content.DistributionConfig; -import com.yahoo.vespa.config.content.LoadTypeConfig; import com.yahoo.cloud.config.log.LogdConfig; import com.yahoo.cloud.config.SlobroksConfig; import com.yahoo.cloud.config.ClusterListConfig; @@ -30,7 +29,6 @@ public interface CommonConfigsProducer extends DocumentmanagerConfig.Producer, LogdConfig.Producer, SlobroksConfig.Producer, ZookeepersConfig.Producer, - LoadTypeConfig.Producer, ClusterListConfig.Producer, DistributionConfig.Producer, AllClustersBucketSpacesConfig.Producer, diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java index 8985dac91aa..01b66057038 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java @@ -16,7 +16,6 @@ import com.yahoo.path.Path; import com.yahoo.text.XML; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.builder.VespaModelBuilder; -import com.yahoo.vespa.model.clients.Clients; import com.yahoo.vespa.model.content.Content; import com.yahoo.vespa.model.routing.Routing; import org.w3c.dom.Document; @@ -244,15 +243,6 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter return modelsOfModelClass; } - public Clients getClients() { - for (ConfigModel m : configModels) { - if (m instanceof Clients) { - return (Clients)m; - } - } - return null; - } - public Routing getRouting() { for (ConfigModel m : configModels) { if (m instanceof Routing) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaConfigModelRegistry.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaConfigModelRegistry.java index 03750dbaa6e..e942079a085 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaConfigModelRegistry.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaConfigModelRegistry.java @@ -5,7 +5,6 @@ import com.yahoo.config.model.ConfigModelRegistry; import com.yahoo.config.model.admin.AdminModel; import com.yahoo.config.model.builder.xml.ConfigModelBuilder; import com.yahoo.config.model.builder.xml.ConfigModelId; -import com.yahoo.vespa.model.builder.xml.dom.DomClientsBuilder; import com.yahoo.vespa.model.builder.xml.dom.DomRoutingBuilder; import com.yahoo.vespa.model.container.xml.ContainerModelBuilder; import com.yahoo.vespa.model.container.xml.ContainerModelBuilder.Networking; @@ -33,7 +32,6 @@ public class VespaConfigModelRegistry extends ConfigModelRegistry { builderList.add(new AdminModel.BuilderV2()); builderList.add(new AdminModel.BuilderV4()); builderList.add(new DomRoutingBuilder()); - builderList.add(new DomClientsBuilder()); builderList.add(new Content.Builder()); builderList.add(new ContainerModelBuilder(false, Networking.enable)); builderList.add(new GenericServicesBuilder()); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index a919c19d754..a587d4cb0f9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -45,7 +45,6 @@ import com.yahoo.vespa.model.InstanceResolver.PackagePrefix; import com.yahoo.vespa.model.admin.Admin; import com.yahoo.vespa.model.builder.VespaModelBuilder; import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder; -import com.yahoo.vespa.model.clients.Clients; import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.ContainerModel; import com.yahoo.vespa.model.container.search.QueryProfiles; @@ -619,10 +618,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri id2producer.put(configId, descendant); } - public Clients getClients() { - return configModelRepo.getClients(); - } - public List<SearchCluster> getSearchClusters() { return Content.getSearchClusters(configModelRepo()); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientsBuilder.java deleted file mode 100644 index fe22f818e32..00000000000 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomClientsBuilder.java +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.model.builder.xml.dom; - -import com.yahoo.config.model.ConfigModelContext; -import com.yahoo.config.model.builder.xml.ConfigModelId; -import com.yahoo.vespa.model.clients.Clients; -import org.w3c.dom.Element; - -import java.util.Arrays; -import java.util.List; - -/** - * Builds the Clients plugin - * - * @author hmusum - */ -public class DomClientsBuilder extends LegacyConfigModelBuilder<Clients> { - - public DomClientsBuilder() { - super(Clients.class); - } - - @Override - public List<ConfigModelId> handlesElements() { - return Arrays.asList(ConfigModelId.fromNameAndVersion("clients", "2.0")); - } - - @Override - public void doBuild(Clients clients, Element clientsE, ConfigModelContext modelContext) { - String version = clientsE.getAttribute("version"); - if (version.startsWith("2.")) { - DomV20ClientsBuilder parser = new DomV20ClientsBuilder(clients, version); - parser.build(clientsE); - } else { - throw new IllegalArgumentException("Version '" + version + "' of 'clients' not supported."); - } - } - -} diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java deleted file mode 100644 index 040291cfa71..00000000000 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.model.builder.xml.dom; - -import com.yahoo.text.XML; -import com.yahoo.vespa.model.clients.Clients; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -/** - * Builds the Clients plugin - * - * @author vegardh - */ -public class DomV20ClientsBuilder { - - // The parent docproc plugin to register data with. - private final Clients clients; - - DomV20ClientsBuilder(Clients clients, String version) { - if ( ! version.equals("2.0")) - throw new IllegalArgumentException("Version '" + version + "' of 'clients' not supported."); - this.clients = clients; - } - - public void build(Element spec) { - NodeList children = spec.getElementsByTagName("load-types"); - for (int i = 0; i < children.getLength(); i++) { - createLoadTypes((Element) children.item(i), clients); - } - } - - private void createLoadTypes(Element element, Clients clients) { - for (Element e : XML.getChildren(element, "type")) { - String priority = e.getAttribute("default-priority"); - clients.getLoadTypes().addType(e.getAttribute("name"), priority.length() > 0 ? priority : null); - } - } - -} diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java deleted file mode 100644 index 8b8b9e5f40d..00000000000 --- a/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.model.clients; - -import com.yahoo.vespa.config.content.LoadTypeConfig; -import com.yahoo.config.model.ConfigModel; -import com.yahoo.config.model.ConfigModelContext; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; - -/** - * This is the clients plugin for the Vespa model. It is responsible for creating - * all clients services. - * - * @author Gunnar Gauslaa Bergem - */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 -public class Clients extends ConfigModel { - - private static final long serialVersionUID = 1L; - private LoadTypeSet loadTypes = new LoadTypeSet(); - - public Clients(ConfigModelContext modelContext) { - super(modelContext); - } - - public LoadTypeSet getLoadTypes() { - return loadTypes; - } - - public void getConfig(LoadTypeConfig.Builder builder) { - for (LoadType t : loadTypes.getNameMap().values()) { - if (t != LoadType.DEFAULT) { - builder.type(getLoadTypeConfig(t)); - } - } - } - - private LoadTypeConfig.Type.Builder getLoadTypeConfig(LoadType loadType) { - LoadTypeConfig.Type.Builder builder = new LoadTypeConfig.Type.Builder(); - builder.name(loadType.getName()); - builder.id(loadType.getId()); - builder.priority(loadType.getPriority().toString()); - return builder; - } - -} diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java index d32fa8f2902..d6ed6f4f7dd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.content; import com.yahoo.config.model.api.ModelContext; import com.yahoo.metrics.MetricsmanagerConfig; -import com.yahoo.vespa.config.content.LoadTypeConfig; import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig; import com.yahoo.vespa.config.content.core.StorServerConfig; import com.yahoo.vespa.config.content.core.StorStatusConfig; @@ -16,7 +15,7 @@ import com.yahoo.vespa.model.application.validation.RestartConfigs; * Common class for config producers for storage and distributor nodes. */ @RestartConfigs({StorCommunicationmanagerConfig.class, StorStatusConfig.class, - StorServerConfig.class, LoadTypeConfig.class, MetricsmanagerConfig.class}) + StorServerConfig.class, MetricsmanagerConfig.class}) public abstract class ContentNode extends AbstractService implements StorCommunicationmanagerConfig.Producer, StorStatusConfig.Producer, StorServerConfig.Producer { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java index e7c0968f99e..3461cab1201 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java @@ -7,7 +7,6 @@ import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.config.provision.NodeResources; import com.yahoo.metrics.MetricsmanagerConfig; import com.yahoo.searchlib.TranslogserverConfig; -import com.yahoo.vespa.config.content.LoadTypeConfig; import com.yahoo.vespa.config.content.StorFilestorConfig; import com.yahoo.vespa.config.content.core.StorBucketmoverConfig; import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig; @@ -44,7 +43,7 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults; @RestartConfigs({ProtonConfig.class, MetricsmanagerConfig.class, TranslogserverConfig.class, StorFilestorConfig.class, StorBucketmoverConfig.class, StorCommunicationmanagerConfig.class, StorStatusConfig.class, - StorServerConfig.class, LoadTypeConfig.class}) + StorServerConfig.class}) public class SearchNode extends AbstractService implements SearchInterface, ProtonConfig.Producer, diff --git a/config-model/src/main/resources/schema/clients-v2.rnc b/config-model/src/main/resources/schema/clients-v2.rnc deleted file mode 100644 index 5a9353321c8..00000000000 --- a/config-model/src/main/resources/schema/clients-v2.rnc +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -Clients20 = - attribute version { "2.0" } & - LoadTypes? - -LoadTypes = element load-types { - element type { - attribute name { text } & - attribute default-priority { text }? - }* -} - -FeederOptions20 = element feederoptions { - FeederOptionsOpts20 & - DocProcChain? -} - -FeederOptionsOpts20 = element abortondocumenterror { xsd:boolean }? & - element retryenabled { text }? & - element route { text }? & - element maxpendingdocs { xsd:positiveInteger }? & - element maxpendingbytes { xsd:positiveInteger }? & - element retrydelay { xsd:double { minInclusive = "0.0" } }? & - element timeout { xsd:double { minInclusive = "0.0" } }? & - element tracelevel { xsd:positiveInteger }? & - element mbusport { xsd:positiveInteger }? - - -DocProcChain = element docprocchain { - text -} diff --git a/config-model/src/main/resources/schema/clients.rnc b/config-model/src/main/resources/schema/clients.rnc deleted file mode 100644 index 1e1dffc90b9..00000000000 --- a/config-model/src/main/resources/schema/clients.rnc +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -include "clients-v2.rnc" - -Clients = element clients { - Clients20 -} diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc index 3a8ffe30563..e8bb1c0c6c2 100644 --- a/config-model/src/main/resources/schema/services.rnc +++ b/config-model/src/main/resources/schema/services.rnc @@ -1,7 +1,6 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. include "common.rnc" include "admin.rnc" -include "clients.rnc" include "content.rnc" include "docproc.rnc" include "routing.rnc" @@ -15,14 +14,12 @@ start = element services { GenericCluster* & GenericConfig* & Admin? & - Clients? & Content* & ContainerCluster* & Routing? } | GenericCluster | Admin -| Clients | Content | ContainerCluster diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java index b092f4fce10..baff0437b5d 100644 --- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java +++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java @@ -6,7 +6,6 @@ import com.yahoo.component.AbstractComponent; import com.yahoo.container.jdisc.ContainerMbusConfig; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.DocumentUtil; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.jdisc.ReferencedResource; @@ -28,7 +27,6 @@ import com.yahoo.messagebus.shared.SharedIntermediateSession; import com.yahoo.messagebus.shared.SharedMessageBus; import com.yahoo.messagebus.shared.SharedSourceSession; import com.yahoo.vespa.config.content.DistributionConfig; -import com.yahoo.vespa.config.content.LoadTypeConfig; import com.yahoo.yolean.concurrent.Memoized; import java.util.HashMap; @@ -72,17 +70,13 @@ public final class SessionCache extends AbstractComponent { DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { this(nets::net, containerMbusConfig, documentTypeManager, - null/*TODO: Remove on Vespa 8*/, messagebusConfig, policiesConfig, distributionConfig); + messagebusConfig, policiesConfig, distributionConfig); } - /** - * @deprecated load types are deprecated. Use constructor without LoadTypeSet instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 public SessionCache(Supplier<NetworkMultiplexer> net, ContainerMbusConfig containerMbusConfig, DocumentTypeManager documentTypeManager, - LoadTypeConfig loadTypeConfig, MessagebusConfig messagebusConfig, + MessagebusConfig messagebusConfig, DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { this(net, diff --git a/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusClientProviderTest.java b/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusClientProviderTest.java index b9f33506894..e0cd9ca6dde 100644 --- a/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusClientProviderTest.java +++ b/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusClientProviderTest.java @@ -10,7 +10,6 @@ import com.yahoo.messagebus.MessagebusConfig; import com.yahoo.messagebus.network.NetworkMultiplexer; import com.yahoo.messagebus.shared.NullNetwork; import com.yahoo.vespa.config.content.DistributionConfig; -import com.yahoo.vespa.config.content.LoadTypeConfig; import org.junit.Test; import static org.junit.Assert.assertNotNull; @@ -36,12 +35,10 @@ public class MbusClientProviderTest { testClient(new SessionConfig(builder)); } - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 private void testClient(SessionConfig config) { SessionCache cache = new SessionCache(() -> NetworkMultiplexer.dedicated(new NullNetwork()), new ContainerMbusConfig.Builder().build(), new DocumentTypeManager(new DocumentmanagerConfig.Builder().build()), - new LoadTypeConfig.Builder().build(), new MessagebusConfig.Builder().build(), new DocumentProtocolPoliciesConfig.Builder().build(), new DistributionConfig.Builder().build()); 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 71a93607b4b..7f4de2e43f5 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 @@ -7,8 +7,6 @@ import com.yahoo.document.select.parser.ParseException; import com.yahoo.document.select.parser.TokenMgrException; import com.yahoo.documentapi.VisitorParameters; import com.yahoo.documentapi.VisitorSession; -import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.fs4.DocsumPacket; import com.yahoo.messagebus.routing.Route; import com.yahoo.prelude.Ping; @@ -90,12 +88,6 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { } @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public LoadTypeSet getLoadTypeSet() { - return ((MessageBusDocumentAccess) access.delegate()).getParams().getLoadTypes(); - } - - @Override public Visitor createVisitor(Query query, String searchCluster, Route route, String documentType, int traceLevelOverride) { return new VdsVisitor(query, searchCluster, route, documentType, this, traceLevelOverride); } 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 9330e43eaf7..e6a5d0c7e35 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 @@ -7,8 +7,6 @@ import com.yahoo.documentapi.VisitorControlHandler; import com.yahoo.documentapi.VisitorDataHandler; import com.yahoo.documentapi.VisitorParameters; import com.yahoo.documentapi.VisitorSession; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage; import com.yahoo.documentapi.messagebus.protocol.QueryResultMessage; @@ -76,13 +74,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor { public interface VisitorSessionFactory { VisitorSession createVisitorSession(VisitorParameters params) throws ParseException; - - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - LoadTypeSet getLoadTypeSet(); } public VdsVisitor(Query query, String searchCluster, Route route, @@ -141,15 +132,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor { params.visitInconsistentBuckets(true); params.setPriority(DocumentProtocol.Priority.VERY_HIGH); - // TODO remove on Vespa 8 - if (query.properties().getString(streamingLoadtype) != null) { - LoadType loadType = visitorSessionFactory.getLoadTypeSet().getNameMap().get(query.properties().getString(streamingLoadtype)); - if (loadType != null) { - params.setLoadType(loadType); - params.setPriority(loadType.getPriority()); - } - } - if (query.properties().getString(streamingPriority) != null) { params.setPriority(DocumentProtocol.getPriorityByName( query.properties().getString(streamingPriority))); diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java index b1bc926daed..5d135f825c2 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java @@ -3,8 +3,6 @@ package com.yahoo.vespa.streamingvisitors; import com.yahoo.document.select.parser.ParseException; import com.yahoo.documentapi.*; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage; import com.yahoo.documentapi.messagebus.protocol.QueryResultMessage; @@ -33,12 +31,6 @@ import static org.junit.Assert.*; */ @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public class VdsVisitorTestCase { - private LoadTypeSet loadTypeSet = new LoadTypeSet(); // TODO remove on Vespa 8 - - public VdsVisitorTestCase() { - loadTypeSet.addLoadType(1, "low", DocumentProtocol.Priority.LOW_1); - loadTypeSet.addLoadType(2, "normal", DocumentProtocol.Priority.NORMAL_1); - } private SearchResult createSR(String docId, double rank) { BufferSerializer serializer = new BufferSerializer(); @@ -116,7 +108,6 @@ public class VdsVisitorTestCase { String selection = null; long from = 0; long to = 0; - String loadTypeName = null; DocumentProtocol.Priority priority = null; int maxBucketsPerVisitor = 0; @@ -140,7 +131,6 @@ public class VdsVisitorTestCase { selection = null; from = 123; to = 456; - loadTypeName = "low"; priority = DocumentProtocol.Priority.HIGH_2; maxBucketsPerVisitor = 2; @@ -194,9 +184,6 @@ public class VdsVisitorTestCase { if (qa.to != 0) { queryString.append("&streaming.totimestamp=").append(qa.to); } - if (qa.loadTypeName != null) { - queryString.append("&streaming.loadtype=").append(qa.loadTypeName); - } if (qa.priority != null) { queryString.append("&streaming.priority=").append(qa.priority); } @@ -228,21 +215,10 @@ public class VdsVisitorTestCase { } assertEquals(qa.from, params.getFromTimestamp()); assertEquals(qa.to, params.getToTimestamp()); - if (qa.loadTypeName != null && loadTypeSet.getNameMap().get(qa.loadTypeName) != null) { - LoadType expectedLoadType = loadTypeSet.getNameMap().get(qa.loadTypeName); - assertEquals(expectedLoadType, params.getLoadType()); - if (qa.priority != null) { - assertEquals(qa.priority, params.getPriority()); - } else { - assertEquals(expectedLoadType.getPriority(), params.getPriority()); - } + if (qa.priority != null) { + assertEquals(qa.priority, params.getPriority()); } else { - assertEquals(LoadType.DEFAULT, params.getLoadType()); - if (qa.priority != null) { - assertEquals(qa.priority, params.getPriority()); - } else { - assertEquals(DocumentProtocol.Priority.VERY_HIGH, params.getPriority()); - } + assertEquals(DocumentProtocol.Priority.VERY_HIGH, params.getPriority()); } if (qa.maxBucketsPerVisitor != 0) { assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor()); @@ -322,7 +298,7 @@ public class VdsVisitorTestCase { public void testBasics() throws Exception { Route route = Route.parse("storageClusterRouteSpec"); String searchCluster = "searchClusterConfigId"; - MockVisitorSessionFactory factory = new MockVisitorSessionFactory(loadTypeSet); + MockVisitorSessionFactory factory = new MockVisitorSessionFactory(); // Default values and no selection QueryArguments qa = new QueryArguments(); @@ -331,10 +307,6 @@ public class VdsVisitorTestCase { // Groupdoc qa.groupName = "group"; qa.maxBucketsPerVisitor = 2; // non-default maxBucketsPerVisitor - qa.loadTypeName = "normal"; // non-default loadTypeName, default priority - verifyVisitorOk(factory, qa, route, searchCluster); - - qa.loadTypeName = "unknown"; // unknown loadTypeName, default priority verifyVisitorOk(factory, qa, route, searchCluster); qa.priority = DocumentProtocol.Priority.NORMAL_2; // unknown loadTypeName, non-default priority @@ -349,7 +321,7 @@ public class VdsVisitorTestCase { public void testFailures() throws Exception { Route route = Route.parse("storageClusterRouteSpec"); String searchCluster = "searchClusterConfigId"; - MockVisitorSessionFactory factory = new MockVisitorSessionFactory(loadTypeSet); + MockVisitorSessionFactory factory = new MockVisitorSessionFactory(); // Default values and no selection QueryArguments qa = new QueryArguments(); @@ -490,13 +462,10 @@ public class VdsVisitorTestCase { private static class MockVisitorSessionFactory implements VdsVisitor.VisitorSessionFactory { private VisitorParameters params; - private LoadTypeSet loadTypeSet; // TODO remove on Vespa 8 private boolean timeoutQuery = false; private boolean failQuery = false; - private MockVisitorSessionFactory(LoadTypeSet loadTypeSet) { - this.loadTypeSet = loadTypeSet; - } + private MockVisitorSessionFactory() {} @Override public VisitorSession createVisitorSession(VisitorParameters params) throws ParseException { @@ -504,12 +473,6 @@ public class VdsVisitorTestCase { return new MockVisitorSession(params, timeoutQuery, failQuery); } - @Override - // TODO: Remove on Vespa 8 - public LoadTypeSet getLoadTypeSet() { - return loadTypeSet; - } - public VisitorParameters getParams() { return params; } diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java index 1fe6d4cc86c..c8a4b127c4e 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java @@ -6,7 +6,6 @@ import com.yahoo.document.DocumentOperation; import com.yahoo.document.DocumentPut; import com.yahoo.document.DocumentRemove; import com.yahoo.document.DocumentUpdate; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.protocol.DocumentMessage; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage; @@ -26,20 +25,17 @@ class MessageFactory { private final static Logger log = Logger.getLogger(MessageFactory.class.getName()); private final Message requestMsg; - private final LoadType loadType; // TODO: Remove on Vespa 8 private final DocumentProtocol.Priority priority; // TODO: Remove on Vespa 8 @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public MessageFactory(DocumentMessage requestMsg) { this.requestMsg = requestMsg; - loadType = requestMsg.getLoadType(); priority = requestMsg.getPriority(); // TODO: Remove on Vespa 8 } @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public DocumentMessage fromDocumentOperation(Processing processing, DocumentOperation documentOperation) { DocumentMessage message = newMessage(documentOperation); - message.setLoadType(loadType); message.setPriority(priority); // TODO: Remove on Vespa 8 message.setRoute(requestMsg.getRoute()); message.setTimeReceivedNow(); @@ -48,7 +44,6 @@ class MessageFactory { log.log(Level.FINE, () -> "Created '" + message.getClass().getName() + "', route = '" + message.getRoute() + "', priority = '" + message.getPriority().name() + // TODO: Remove on Vespa 8 - "', load type = '" + message.getLoadType() + "', trace level = '" + message.getTrace().getLevel() + "', time remaining = '" + message.getTimeRemaining() + "'."); return message; diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java index de5cbfa505b..ad8e05c7d88 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java @@ -17,7 +17,6 @@ import com.yahoo.docproc.jdisc.messagebus.MbusRequestContext; import com.yahoo.document.DocumentType; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.protocol.DocumentMessage; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; @@ -34,8 +33,6 @@ import com.yahoo.messagebus.network.NetworkMultiplexer; import com.yahoo.messagebus.network.rpc.RPCNetwork; import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.shared.SharedSourceSession; -import com.yahoo.vespa.config.content.DistributionConfig; -import com.yahoo.vespa.config.content.LoadTypeConfig; import org.junit.After; import org.junit.Before; @@ -139,7 +136,6 @@ public abstract class DocumentProcessingHandlerTestBase { public boolean sendMessage(String destinationChainName, DocumentMessage msg) { msg.setRoute(Route.parse("test/chain." + destinationChainName + " " + remoteServer.connectionSpec())); msg.setPriority(DocumentProtocol.Priority.HIGH_1); // TODO: Remove on Vespa 8 - msg.setLoadType(LoadType.DEFAULT); msg.getTrace().setLevel(9); msg.setTimeRemaining(60 * 1000); return driver.client().sendMessage(msg).isAccepted(); diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json index 2d4453d05de..58d91e427cf 100644 --- a/documentapi/abi-spec.json +++ b/documentapi/abi-spec.json @@ -931,8 +931,6 @@ "public void setTraceLevel(int)", "public int getTraceLevel()", "public void setPriority(com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", - "public void setLoadType(com.yahoo.documentapi.messagebus.loadtypes.LoadType)", - "public com.yahoo.documentapi.messagebus.loadtypes.LoadType getLoadType()", "public boolean skipBucketsOnFatalErrors()", "public void skipBucketsOnFatalErrors(boolean)", "public void slice(int, int)", @@ -1132,8 +1130,6 @@ ], "methods": [ "public void <init>()", - "public void <init>(com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)", - "public com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet getLoadTypes()", "public java.lang.String getRoutingConfigId()", "public com.yahoo.documentapi.messagebus.MessageBusParams setRoutingConfigId(java.lang.String)", "public java.lang.String getProtocolConfigId()", @@ -1795,8 +1791,6 @@ "public void swapState(com.yahoo.messagebus.Routable)", "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority getPriority()", "public void setPriority(com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", - "public com.yahoo.documentapi.messagebus.loadtypes.LoadType getLoadType()", - "public void setLoadType(com.yahoo.documentapi.messagebus.loadtypes.LoadType)", "public int getApproxSize()", "public com.yahoo.text.Utf8String getProtocol()" ], @@ -1846,10 +1840,8 @@ "public static com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority getPriority(int)", "public static com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority getPriorityByName(java.lang.String)", "public void <init>(com.yahoo.document.DocumentTypeManager)", - "public void <init>(com.yahoo.document.DocumentTypeManager, java.lang.String)", "public void <init>(com.yahoo.document.DocumentTypeManager, com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig, com.yahoo.vespa.config.content.DistributionConfig)", - "public void <init>(com.yahoo.document.DocumentTypeManager, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet, com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig, com.yahoo.vespa.config.content.DistributionConfig)", - "public void <init>(com.yahoo.document.DocumentTypeManager, java.lang.String, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)", + "public void <init>(com.yahoo.document.DocumentTypeManager, java.lang.String)", "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocol putRoutingPolicyFactory(java.lang.String, com.yahoo.documentapi.messagebus.protocol.RoutingPolicyFactory)", "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocol putRoutableFactory(int, com.yahoo.documentapi.messagebus.protocol.RoutableFactory, com.yahoo.component.VersionSpecification)", "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocol putRoutableFactory(int, com.yahoo.documentapi.messagebus.protocol.RoutableFactory, java.util.List)", @@ -2701,7 +2693,7 @@ "protected abstract boolean doEncode(com.yahoo.documentapi.messagebus.protocol.DocumentMessage, com.yahoo.document.serialization.DocumentSerializer)", "protected abstract com.yahoo.documentapi.messagebus.protocol.DocumentMessage doDecode(com.yahoo.document.serialization.DocumentDeserializer)", "public boolean encode(com.yahoo.messagebus.Routable, com.yahoo.document.serialization.DocumentSerializer)", - "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)" + "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer)" ], "fields": [] }, @@ -2717,7 +2709,7 @@ "protected abstract boolean doEncode(com.yahoo.documentapi.messagebus.protocol.DocumentReply, com.yahoo.document.serialization.DocumentSerializer)", "protected abstract com.yahoo.documentapi.messagebus.protocol.DocumentReply doDecode(com.yahoo.document.serialization.DocumentDeserializer)", "public boolean encode(com.yahoo.messagebus.Routable, com.yahoo.document.serialization.DocumentSerializer)", - "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)" + "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer)" ], "fields": [] }, @@ -3127,8 +3119,7 @@ ], "methods": [ "public abstract boolean encode(com.yahoo.messagebus.Routable, com.yahoo.document.serialization.DocumentSerializer)", - "public abstract com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)", - "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer)" + "public abstract com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer)" ], "fields": [] }, diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java index c76a25f5c22..76387710c0a 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java @@ -4,7 +4,6 @@ package com.yahoo.documentapi; import com.yahoo.document.BucketId; import com.yahoo.document.FixedBucketSpaces; import com.yahoo.document.fieldset.AllFields; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.messagebus.ThrottlePolicy; import com.yahoo.messagebus.routing.Route; @@ -47,7 +46,6 @@ public class VisitorParameters extends Parameters { private int maxBucketsPerVisitor = 1; private boolean dynamicallyIncreaseMaxBucketsPerVisitor = false; private float dynamicMaxBucketsIncreaseFactor = 2; - private LoadType loadType = LoadType.DEFAULT; // TODO: Remove on Vespa 8 private DocumentProtocol.Priority priority = null; private int traceLevel = 0; private boolean skipBucketsOnFatalErrors = false; @@ -96,7 +94,6 @@ public class VisitorParameters extends Parameters { setMaxFirstPassHits(params.getMaxFirstPassHits()); setMaxTotalHits(params.getMaxTotalHits()); setMaxBucketsPerVisitor(params.getMaxBucketsPerVisitor()); - setLoadType(params.getLoadType()); setPriority(params.getPriority()); setDynamicallyIncreaseMaxBucketsPerVisitor( params.getDynamicallyIncreaseMaxBucketsPerVisitor()); @@ -190,8 +187,6 @@ public class VisitorParameters extends Parameters { public DocumentProtocol.Priority getPriority() { if (priority != null) { return priority; - } else if (loadType != null) { - return loadType.getPriority(); } else { return DocumentProtocol.Priority.NORMAL_3; } @@ -323,22 +318,6 @@ public class VisitorParameters extends Parameters { this.priority = priority; } - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public void setLoadType(LoadType loadType) { - this.loadType = loadType; - } - - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public LoadType getLoadType() { - return loadType; - } - public boolean skipBucketsOnFatalErrors() { return skipBucketsOnFatalErrors; } public void skipBucketsOnFatalErrors(boolean skipBucketsOnFatalErrors) { this.skipBucketsOnFatalErrors = skipBucketsOnFatalErrors; } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java index c2e6dde7f60..09b7cf8d9a9 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java @@ -59,7 +59,7 @@ public class MessageBusDocumentAccess extends DocumentAccess { this.params = params; try { com.yahoo.messagebus.MessageBusParams mbusParams = new com.yahoo.messagebus.MessageBusParams(params.getMessageBusParams()); - mbusParams.addProtocol(new DocumentProtocol(getDocumentTypeManager(), params.getProtocolConfigId(), params.getLoadTypes())); + mbusParams.addProtocol(new DocumentProtocol(getDocumentTypeManager(), params.getProtocolConfigId())); if (System.getProperty("vespa.local", "false").equals("true")) { // set by Application when running locally LocalNetwork network = new LocalNetwork(); bus = new NetworkMessageBus(network, new MessageBus(network, mbusParams)); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java index bb8c3a3b1b1..c0e5b80dbff 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java @@ -2,7 +2,6 @@ package com.yahoo.documentapi.messagebus; import com.yahoo.documentapi.DocumentAccessParams; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.messagebus.SourceSessionParams; @@ -14,7 +13,6 @@ import static java.util.Objects.requireNonNull; /** * @author Einar M R Rosenvinge */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 public class MessageBusParams extends DocumentAccessParams { private String routingConfigId = null; @@ -27,29 +25,8 @@ public class MessageBusParams extends DocumentAccessParams { private RPCNetworkParams rpcNetworkParams = new RPCNetworkParams(); private com.yahoo.messagebus.MessageBusParams mbusParams = new com.yahoo.messagebus.MessageBusParams(); private SourceSessionParams sourceSessionParams = new SourceSessionParams(); - private LoadTypeSet loadTypes; // TODO remove on Vespa 8 - public MessageBusParams() { - this(new LoadTypeSet()); - } - - /** - * @deprecated load types are deprecated. Use default constructor instead - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public MessageBusParams(LoadTypeSet loadTypes) { - this.loadTypes = loadTypes; - } - - /** - * - * @return Returns the set of load types accepted by this Vespa installation - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public LoadTypeSet getLoadTypes() { - return loadTypes; - } + public MessageBusParams() {} /** * Returns the id to resolve to routing config. diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java index 5e4e87759cb..b50164aefc0 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java @@ -660,7 +660,6 @@ public class MessageBusVisitorSession implements VisitorSession { msg.setParameters(params.getLibraryParameters()); msg.setRoute(params.getRoute()); msg.setMaxBucketsPerVisitor(params.getMaxBucketsPerVisitor()); - msg.setLoadType(params.getLoadType()); msg.setPriority(params.getPriority()); // TODO: remove on Vespa 8 msg.setRetryEnabled(false); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadType.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadType.java deleted file mode 100644 index 133736a8542..00000000000 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadType.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.documentapi.messagebus.loadtypes; - -import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; - -/** - * @deprecated load types are deprecated - * @author thomasg - */ -@Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 -public class LoadType { - private int id; - private String name; - private DocumentProtocol.Priority priority; - - public static LoadType DEFAULT = new LoadType(0, "default", DocumentProtocol.Priority.NORMAL_3); - - public LoadType(int id, String name, DocumentProtocol.Priority priority) { - this.id = id; - this.name = name; - this.priority = priority; - } - - @Override - public boolean equals(Object other) { - if (!(other instanceof LoadType)) { - return false; - } - - LoadType o = (LoadType)other; - - return name.equals(o.getName()) && id == o.getId() && priority == o.getPriority(); - } - - @Override - public int hashCode() { - return java.util.Objects.hash(name, id, priority); - } - - public String getName() { return name; } - - public String toString() { return name + " (id " + id + ")"; } - - public DocumentProtocol.Priority getPriority() { return priority; } - - public int getId() { return id; } -} diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java deleted file mode 100644 index a3fbed472f0..00000000000 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java +++ /dev/null @@ -1,110 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.documentapi.messagebus.loadtypes; - -import com.yahoo.config.subscription.ConfigGetter; -import com.yahoo.vespa.config.content.LoadTypeConfig; -import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.Map; -import java.util.TreeMap; - -/** - * This class keeps track of all configured load types. - * - * For production use, you should only use the String constructor, - * and supply a valid config id. Only the load types configured will - * be propagated throughout the system, so there is no point in using other - * load types. - * - * For testing, you may want to use the empty constructor and add - * load types yourself with addType(). - * - * @deprecated load types are deprecated - */ -@Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 -public class LoadTypeSet { - - public static final LoadTypeSet EMPTY = new LoadTypeSet(); - - class DualMap { - Map<String, LoadType> nameMap = new TreeMap<String, LoadType>(); - Map<Integer, LoadType> idMap = new HashMap<Integer, LoadType>(); - - void put(LoadType l) { - if (nameMap.containsKey(l.getName()) || idMap.containsKey(l.getId())) { - throw new IllegalArgumentException( - "ID or name conflict when adding " + l); - } - - nameMap.put(l.getName(), l); - idMap.put(l.getId(), l); - } - } - - DualMap map; - - public LoadTypeSet() { - map = new DualMap(); - map.put(LoadType.DEFAULT); - } - - public LoadTypeSet(String configId) { - configure(new ConfigGetter<>(LoadTypeConfig.class).getConfig(configId)); - } - - public LoadTypeSet(LoadTypeConfig loadTypeConfig) { - configure(loadTypeConfig); - } - - public Map<String, LoadType> getNameMap() { - return map.nameMap; - } - - public Map<Integer, LoadType> getIdMap() { - return map.idMap; - } - - /** - * Used by config to generate priorities for a name, and add them to the load type set. - */ - public void addType(String name, String priority) { - try { - MessageDigest algorithm = MessageDigest.getInstance("MD5"); - algorithm.reset(); - algorithm.update(name.getBytes()); - byte messageDigest[] = algorithm.digest(); - - int id = 0; - for (int i = 0; i < 4; i++) { - int temp = ((int)messageDigest[i] & 0xff); - id <<= 8; - id |= temp; - } - - map.put(new LoadType(id, name, DocumentProtocol.Priority.valueOf(priority != null ? priority : "NORMAL_3"))); - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(e); - } - } - - public void addLoadType(int id, String name, DocumentProtocol.Priority priority) { - map.put(new LoadType(id, name, priority)); - } - - public void configure(LoadTypeConfig config) { - DualMap newMap = new DualMap(); - - // Default should always be available. - newMap.put(LoadType.DEFAULT); - - for (LoadTypeConfig.Type t : config.type()) { - newMap.put(new LoadType(t.id(), t.name(), DocumentProtocol.Priority.valueOf(t.priority()))); - } - - map = newMap; - } -} - diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/package-info.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/package-info.java deleted file mode 100644 index be0f91f0f29..00000000000 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -package com.yahoo.documentapi.messagebus.loadtypes; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java index 21f7c243c6f..d4736c391f7 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.documentapi.messagebus.protocol; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.messagebus.Message; import com.yahoo.messagebus.Routable; import com.yahoo.text.Utf8String; @@ -13,7 +12,6 @@ import com.yahoo.text.Utf8String; public abstract class DocumentMessage extends Message { private DocumentProtocol.Priority priority = DocumentProtocol.Priority.NORMAL_3; - private LoadType loadType = LoadType.DEFAULT; // TODO: Remove on Vespa 8 /** * Constructs a new message with no content. @@ -38,10 +36,6 @@ public abstract class DocumentMessage extends Message { DocumentProtocol.Priority pri = this.priority; this.priority = msg.priority; msg.priority = pri; - - LoadType lt = this.loadType; - this.loadType = msg.loadType; - msg.loadType = lt; } } @@ -66,28 +60,6 @@ public abstract class DocumentMessage extends Message { this.priority = priority; } - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public LoadType getLoadType() { - return loadType; - } - - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public void setLoadType(LoadType loadType) { - if (loadType != null) { - this.loadType = loadType; - } else { - this.loadType = LoadType.DEFAULT; - } - } - @Override public int getApproxSize() { return 4 + 1; // type + priority // TODO update on Vespa 8 to not include deprecated fields diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java index bab416389dd..0ff578b64d7 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java @@ -6,7 +6,6 @@ import com.yahoo.component.Version; import com.yahoo.component.VersionSpecification; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.DocumentTypeManagerConfigurer; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.messagebus.ErrorCode; import com.yahoo.messagebus.Protocol; import com.yahoo.messagebus.Reply; @@ -32,7 +31,6 @@ import static java.util.Objects.requireNonNull; * * @author Simon Thoresen Hult */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 public class DocumentProtocol implements Protocol { private static final Logger log = Logger.getLogger(DocumentProtocol.class.getName()); @@ -240,39 +238,21 @@ public class DocumentProtocol implements Protocol { } public DocumentProtocol(DocumentTypeManager docMan) { - this(docMan, null, new LoadTypeSet()); - } - - public DocumentProtocol(DocumentTypeManager docMan, String configId) { - this(docMan, configId, new LoadTypeSet()); + this(docMan, null); } public DocumentProtocol(DocumentTypeManager documentTypeManager, DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { - this(requireNonNull(documentTypeManager), null, new LoadTypeSet(), + this(requireNonNull(documentTypeManager), null, requireNonNull(policiesConfig), requireNonNull(distributionConfig)); } - /** - * @deprecated load types are deprecated. Use constructor without LoadTypeSet instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public DocumentProtocol(DocumentTypeManager documentTypeManager, LoadTypeSet loadTypes, - DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { - this(requireNonNull(documentTypeManager), null, requireNonNull(loadTypes), - requireNonNull(policiesConfig), requireNonNull(distributionConfig)); - } - - /** - * @deprecated load types are deprecated. Use constructor without LoadTypeSet instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public DocumentProtocol(DocumentTypeManager docMan, String configId, LoadTypeSet set) { - this(docMan, configId == null ? "client" : configId, set, null, null); + public DocumentProtocol(DocumentTypeManager docMan, String configId) { + this(docMan, configId == null ? "client" : configId, null, null); } - private DocumentProtocol(DocumentTypeManager docMan, String configId, LoadTypeSet set, + private DocumentProtocol(DocumentTypeManager docMan, String configId, DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { if (docMan != null) this.docMan = docMan; @@ -280,7 +260,7 @@ public class DocumentProtocol implements Protocol { this.docMan = new DocumentTypeManager(); DocumentTypeManagerConfigurer.configure(this.docMan, configId); } - this.routableRepository = new RoutableRepository(set); + this.routableRepository = new RoutableRepository(); // When adding factories to this list, please KEEP THEM ORDERED alphabetically like they are now. putRoutingPolicyFactory("AND", new RoutingPolicyFactories.AndPolicyFactory()); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java index 42172b04b90..e0d52ced318 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java @@ -9,7 +9,6 @@ import com.yahoo.document.DocumentUpdate; import com.yahoo.document.TestAndSetCondition; import com.yahoo.document.serialization.DocumentDeserializer; import com.yahoo.document.serialization.DocumentSerializer; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.messagebus.Routable; import com.yahoo.vdslib.DocumentSummary; import com.yahoo.vdslib.SearchResult; @@ -70,18 +69,17 @@ public abstract class RoutableFactories60 { } DocumentMessage msg = (DocumentMessage)obj; out.putByte(null, (byte)(msg.getPriority().getValue())); // TODO: encode default value on Vespa 8 - out.putInt(null, msg.getLoadType().getId()); + out.putInt(null, 0); // Ignored load type. 0 is legacy "default" load type ID. return doEncode(msg, out); } @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public Routable decode(DocumentDeserializer in, LoadTypeSet loadTypes) { + public Routable decode(DocumentDeserializer in) { byte pri = in.getByte(null); // TODO: ignore on Vespa 8 - int loadType = in.getInt(null); + in.getInt(null); // Ignored load type DocumentMessage msg = doDecode(in); if (msg != null) { msg.setPriority(DocumentProtocol.getPriority(pri)); - msg.setLoadType(loadTypes.getIdMap().get(loadType)); // TODO: ignore on Vespa 8 } return msg; } @@ -132,7 +130,7 @@ public abstract class RoutableFactories60 { } @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public Routable decode(DocumentDeserializer in, LoadTypeSet loadTypes) { + public Routable decode(DocumentDeserializer in) { byte pri = in.getByte(null); DocumentReply reply = doDecode(in); if (reply != null) { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactory.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactory.java index 7baa41e5c6a..bff6cac548e 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactory.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactory.java @@ -3,7 +3,6 @@ package com.yahoo.documentapi.messagebus.protocol; import com.yahoo.document.serialization.DocumentDeserializer; import com.yahoo.document.serialization.DocumentSerializer; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.messagebus.Routable; /** @@ -12,7 +11,7 @@ import com.yahoo.messagebus.Routable; * com.yahoo.component.VersionSpecification)} method. </p> * * <p>Notice that no routable type is passed to the - * {@link #decode(DocumentDeserializer, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)} method, so + * {@link #decode(DocumentDeserializer)} method, so * you may NOT share a factory across multiple routable types. To share serialization logic between factory use a common * superclass or composition with a common serialization utility.</p> * @@ -32,21 +31,12 @@ public interface RoutableFactory { boolean encode(Routable obj, DocumentSerializer out); /** - * <p>This method decodes the given byte bufer to a routable.</p> <p>Return false to signal failure.</p> <p>This + * <p>This method decodes the given byte buffer to a routable.</p> <p>Return false to signal failure.</p> <p>This * method is NOT exception safe.</p> * * @param in The buffer to read from. - * @param loadTypes The LoadTypeSet to inject into the Routable. * @return The decoded routable. - * @deprecated load types are deprecated. Use method without LoadTypeSet instead */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - Routable decode(DocumentDeserializer in, LoadTypeSet loadTypes); - - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - default Routable decode(DocumentDeserializer in) { - return decode(in, LoadTypeSet.EMPTY); - } + Routable decode(DocumentDeserializer in); } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java index 2360cbe8bc3..eb6caf5d0f7 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java @@ -9,7 +9,6 @@ import com.yahoo.document.serialization.DocumentDeserializer; import com.yahoo.document.serialization.DocumentDeserializerFactory; import com.yahoo.document.serialization.DocumentSerializer; import com.yahoo.document.serialization.DocumentSerializerFactory; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.io.GrowableByteBuffer; import java.util.logging.Level; import com.yahoo.messagebus.Routable; @@ -34,20 +33,10 @@ final class RoutableRepository { private static final Logger log = Logger.getLogger(RoutableRepository.class.getName()); private final CopyOnWriteHashMap<Integer, VersionMap> factoryTypes = new CopyOnWriteHashMap<>(); private final CopyOnWriteHashMap<CacheKey, RoutableFactory> cache = new CopyOnWriteHashMap<>(); - private LoadTypeSet loadTypes; // TODO remove on Vespa 8 public RoutableRepository() {} /** - * @deprecated load types are deprecated. Use default constructor instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public RoutableRepository(LoadTypeSet set) { - loadTypes = set; - } - - /** * Decodes a {@link Routable} from the given byte array. This uses the content of the byte array to dispatch the * decode request to the appropriate {@link RoutableFactory} that was previously registered. * @@ -75,7 +64,7 @@ final class RoutableRepository { log.log(Level.SEVERE,"No routable factory found for routable type " + type + " (version " + version + ")."); return null; } - Routable ret = factory.decode(in, loadTypes); + Routable ret = factory.decode(in); if (ret == null) { log.log(Level.SEVERE,"Routable factory " + factory.getClass().getName() + " failed to deserialize " + "routable of type " + type + " (version " + version + ").\nData = " + Arrays.toString(data)); diff --git a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java index b1187d48374..9b1d8e83804 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java @@ -2,15 +2,12 @@ package com.yahoo.documentapi; import com.yahoo.document.fieldset.AllFields; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import org.junit.Test; import static org.junit.Assert.*; @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public class VisitorParametersTestCase { - // TODO: Remove on Vespa 8 - private LoadType loadType = new LoadType(3, "samnmax", DocumentProtocol.Priority.HIGH_3); @SuppressWarnings("removal")// TODO: Vespa 8: remove private VisitorParameters createVisitorParameters() { @@ -28,7 +25,6 @@ public class VisitorParametersTestCase { params.setTimeoutMs(1337); params.setMaxPending(111); params.setFieldSet(AllFields.NAME); - params.setLoadType(loadType); // TODO: Remove on Vespa 8 params.setVisitRemoves(true); params.setVisitInconsistentBuckets(true); params.setTraceLevel(9); @@ -45,7 +41,6 @@ public class VisitorParametersTestCase { return params; } - @SuppressWarnings("removal")// TODO: Vespa 8: remove @Test public void testCopyConstructor() { VisitorParameters params = createVisitorParameters(); @@ -65,7 +60,6 @@ public class VisitorParametersTestCase { assertEquals(1337, copy.getTimeoutMs()); assertEquals(111, copy.getMaxPending()); assertEquals(AllFields.NAME, copy.getFieldSet()); - assertEquals(loadType, copy.getLoadType()); assertEquals(true, copy.getVisitRemoves()); assertEquals(true, copy.getVisitInconsistentBuckets()); assertEquals(9, copy.getTraceLevel()); diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java index 53545510ae7..97c7147bd86 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java @@ -14,7 +14,6 @@ import com.yahoo.documentapi.VisitorDataHandler; import com.yahoo.documentapi.VisitorDataQueue; import com.yahoo.documentapi.VisitorParameters; import com.yahoo.documentapi.VisitorResponse; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.protocol.CreateVisitorMessage; import com.yahoo.documentapi.messagebus.protocol.CreateVisitorReply; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; @@ -524,9 +523,6 @@ public class MessageBusVisitorSessionTestCase { if (msg.getMaxBucketsPerVisitor() != 1) { sb.append("max buckets per visitor=").append(msg.getMaxBucketsPerVisitor()).append("\n"); } - if (msg.getLoadType() != LoadType.DEFAULT) { - sb.append("load type=").append(msg.getLoadType().getName()).append("\n"); - } if (msg.getPriority() != DocumentProtocol.Priority.NORMAL_3) { // TODO: remove on Vespa 8 sb.append("priority=").append(msg.getPriority()).append("\n"); } @@ -742,7 +738,6 @@ public class MessageBusVisitorSessionTestCase { params.setTimeoutMs(1337); params.setMaxPending(111); params.setFieldSet(DocIdOnly.NAME); - params.setLoadType(new LoadType(3, "samnmax", DocumentProtocol.Priority.HIGH_3)); // TODO: Remove on Vespa 8 params.setVisitRemoves(true); params.setVisitInconsistentBuckets(true); params.setTraceLevel(9); @@ -772,7 +767,6 @@ public class MessageBusVisitorSessionTestCase { "]\n" + "route=extraterrestrial/highway\n" + "max buckets per visitor=55\n" + - "load type=samnmax\n" + "priority=HIGHEST\n" + "visitor library=CoolVisitor\n" + "trace level=9\n" + diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java deleted file mode 100644 index 18269971f88..00000000000 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.documentapi.messagebus.loadtypes.test; - -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -/** - * @author thomasg - */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 -// TODO Vespa 8: remove test case once load types are gone -public class LoadTypesTestCase { - - @Test - public void testIdGeneration() { - LoadTypeSet set = new LoadTypeSet(); - set.addType("vespagrim", "VERY_HIGH"); - set.addType("slow", "VERY_LOW"); - set.addType("test", null); - - assertEquals("vespagrim", set.getNameMap().get("vespagrim").getName()); - assertEquals("slow", set.getNameMap().get("slow").getName()); - assertEquals("test", set.getNameMap().get("test").getName()); - assertEquals("default", set.getNameMap().get("default").getName()); - - assertEquals(0xc21803d4, set.getNameMap().get("vespagrim").getId()); - } - -} diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java index deecba96aa6..5e8439c9536 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java @@ -143,7 +143,6 @@ public class Messages60TestCase extends MessagesTestBase { private static final String BUCKET_SPACE = "beartato"; @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public void run() { GetBucketListMessage msg = new GetBucketListMessage(new BucketId(16, 123)); msg.setBucketSpace(BUCKET_SPACE); @@ -152,7 +151,6 @@ public class Messages60TestCase extends MessagesTestBase { for (Language lang : LANGUAGES) { msg = (GetBucketListMessage)deserialize("GetBucketListMessage", DocumentProtocol.MESSAGE_GETBUCKETLIST, lang); assertEquals(new BucketId(16, 123), msg.getBucketId()); - assertEquals("default", msg.getLoadType().getName()); // TODO: Remove on Vespa 8 assertEquals(BUCKET_SPACE, msg.getBucketSpace()); } } @@ -163,10 +161,8 @@ public class Messages60TestCase extends MessagesTestBase { private static final String BUCKET_SPACE = "andrei"; @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public void run() { StatBucketMessage msg = new StatBucketMessage(new BucketId(16, 123), "id.user=123"); - msg.setLoadType(null); // TODO: Remove on Vespa 8 msg.setBucketSpace(BUCKET_SPACE); assertEquals(BASE_MESSAGE_LENGTH + 27 + serializedLength(BUCKET_SPACE), serialize("StatBucketMessage", msg)); @@ -174,7 +170,6 @@ public class Messages60TestCase extends MessagesTestBase { msg = (StatBucketMessage)deserialize("StatBucketMessage", DocumentProtocol.MESSAGE_STATBUCKET, lang); assertEquals(new BucketId(16, 123), msg.getBucketId()); assertEquals("id.user=123", msg.getDocumentSelection()); - assertEquals("default", msg.getLoadType().getName()); // TODO: Remove on Vespa 8 assertEquals(BUCKET_SPACE, msg.getBucketSpace()); } } diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java index 74d06c05383..f43449646be 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java @@ -4,7 +4,6 @@ package com.yahoo.documentapi.messagebus.protocol.test; import com.yahoo.component.Version; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.DocumentTypeManagerConfigurer; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.messagebus.Routable; import org.junit.Test; @@ -19,7 +18,6 @@ import static org.junit.Assert.*; /** * @author Simon Thoresen Hult */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 public abstract class MessagesTestBase { protected enum Language { @@ -29,12 +27,10 @@ public abstract class MessagesTestBase { protected static final Set<Language> LANGUAGES = EnumSet.allOf(Language.class); protected final DocumentTypeManager docMan = new DocumentTypeManager(); - protected final LoadTypeSet loadTypes = new LoadTypeSet(); // TODO remove on Vespa 8 - protected final DocumentProtocol protocol = new DocumentProtocol(docMan, null, loadTypes); + protected final DocumentProtocol protocol = new DocumentProtocol(docMan, null); public MessagesTestBase() { DocumentTypeManagerConfigurer.configure(docMan, "file:./test/cfg/testdoc.cfg"); - loadTypes.addLoadType(34, "foo", DocumentProtocol.Priority.NORMAL_2); } @Test diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessageBusSessionFactory.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessageBusSessionFactory.java index d9b1190aaed..13d6f5d3323 100755 --- a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessageBusSessionFactory.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessageBusSessionFactory.java @@ -19,12 +19,11 @@ public class MessageBusSessionFactory implements SessionFactory { this(processor, null, null); } - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 private MessageBusSessionFactory(MessagePropertyProcessor processor, DocumentmanagerConfig documentmanagerConfig, SlobroksConfig slobroksConfig) { this.processor = processor; - MessageBusParams params = new MessageBusParams(processor.getLoadTypes()); + MessageBusParams params = new MessageBusParams(); params.setTraceLevel(processor.getFeederOptions().getTraceLevel()); RPCNetworkParams rpcNetworkParams = processor.getFeederOptions().getNetworkParams(); if (slobroksConfig != null) // not set: will subscribe diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java index 84fbe63a576..934e86fc14b 100644 --- a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java @@ -4,13 +4,10 @@ package com.yahoo.feedapi; import com.yahoo.concurrent.SystemTimer; import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.container.jdisc.HttpRequest; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentMessage; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.messagebus.Message; import com.yahoo.messagebus.routing.Route; -import com.yahoo.vespa.config.content.LoadTypeConfig; import com.yahoo.vespaclient.config.FeederConfig; import java.util.logging.Level; @@ -33,23 +30,12 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib private String defaultDocprocChain = null; private boolean defaultAbortOnDocumentError = true; private boolean defaultAbortOnSendError = true; - private final LoadTypeSet loadTypes; // TODO remove on Vespa 8 private boolean configChanged = false; public MessagePropertyProcessor(FeederConfig config) { - loadTypes = new LoadTypeSet(); configure(config); } - /** - * @deprecated load types are deprecated. Use constructor without LoadTypeConfig instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public MessagePropertyProcessor(FeederConfig config, LoadTypeConfig loadTypeCfg) { - loadTypes = new LoadTypeSet(); - configure(config, loadTypeCfg); - } - public void setRoute(String routeOverride) { defaultRoute = Route.parse(routeOverride); } @@ -60,7 +46,6 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib String priorityParam = null; String abortOnDocErrorParam = null; String abortOnFeedErrorParam = null; - String loadTypeStr = null; String traceStr = null; String createIfNonExistentParam = null; Double totalTimeoutParam = null; @@ -81,7 +66,6 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib traceStr = request.getProperty("tracelevel"); abortOnDocErrorParam = request.getProperty("abortondocumenterror"); abortOnFeedErrorParam = request.getProperty("abortonfeederror"); - loadTypeStr = request.getProperty("loadtype"); createIfNonExistentParam = request.getProperty("createifnonexistent"); } @@ -109,16 +93,7 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib priority = DocumentProtocol.getPriorityByName(priorityParam); } - LoadType loadType = null; - if (loadTypes != null && loadTypeStr != null) { - loadType = loadTypes.getNameMap().get(loadTypeStr); - } - - if (loadType == null) { - loadType = LoadType.DEFAULT; - } - - return new PropertySetter(route, timeout, totalTimeout, priority, loadType, retry, abortOnDocumentError, abortOnFeedError, createIfNonExistent, traceStr != null ? Integer.parseInt(traceStr) : 0); + return new PropertySetter(route, timeout, totalTimeout, priority, retry, abortOnDocumentError, abortOnFeedError, createIfNonExistent, traceStr != null ? Integer.parseInt(traceStr) : 0); } public long getDefaultTimeoutMillis() { return defaultTimeoutMillis; } @@ -135,23 +110,6 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib return feederOptions; } - /** - * @deprecated load types are deprecated. configure without LoadTypeConfig instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public synchronized void configure(FeederConfig config, LoadTypeConfig loadTypeConfig) { - loadTypes.configure(loadTypeConfig); - configure(config); - } - - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - LoadTypeSet getLoadTypes() { - return loadTypes; - } - public synchronized void configure(FeederConfig config) { if (feederOptions != null) { setConfigChanged(true); @@ -191,17 +149,15 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib private boolean abortOnDocumentError; private boolean abortOnFeedError; private boolean createIfNonExistent; - private LoadType loadType; // TODO remove on Vespa 8 private int traceLevel; - PropertySetter(Route route, long timeout, long totalTimeout, DocumentProtocol.Priority priority, LoadType loadType, + PropertySetter(Route route, long timeout, long totalTimeout, DocumentProtocol.Priority priority, boolean retryEnabled, boolean abortOnDocumentError, boolean abortOnFeedError, boolean createIfNonExistent, int traceLevel) { this.route = route; this.timeout = timeout; this.totalTimeout = totalTimeout; this.priority = priority; - this.loadType = loadType; this.retryEnabled = retryEnabled; this.abortOnDocumentError = abortOnDocumentError; this.abortOnFeedError = abortOnFeedError; @@ -253,11 +209,6 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib msg.setRetryEnabled(retryEnabled); msg.getTrace().setLevel(Math.max(getFeederOptions().getTraceLevel(), traceLevel)); - if (loadType != null) { - ((DocumentMessage) msg).setLoadType(loadType); - ((DocumentMessage) msg).setPriority(loadType.getPriority()); - } - if (priority != null) { ((DocumentMessage) msg).setPriority(priority); } diff --git a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java index 52f2857c7e5..2ae3ecf113b 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/Arguments.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespafeeder; -import com.yahoo.vespa.config.content.LoadTypeConfig; import com.yahoo.feedapi.DummySessionFactory; import com.yahoo.feedapi.MessageBusSessionFactory; import com.yahoo.feedapi.MessagePropertyProcessor; diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/ClientParameters.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/ClientParameters.java index d3431818b63..3ea641fc642 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/ClientParameters.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/ClientParameters.java @@ -35,8 +35,6 @@ public class ClientParameters { public final int traceLevel; // Document request priority public final DocumentProtocol.Priority priority; - // Determines the Vespa load type - public final String loadTypeName; // If full documents are printed, they will be printed as JSON (instead of XML) public final boolean jsonOutput; @@ -45,7 +43,7 @@ public class ClientParameters { boolean help, Iterator<String> documentIds, boolean printIdsOnly, String fieldSet, String route, String cluster, String configId, boolean showDocSize, double timeout, boolean noRetry, int traceLevel, - DocumentProtocol.Priority priority, String loadTypeName, boolean jsonOutput) { + DocumentProtocol.Priority priority, boolean jsonOutput) { this.help = help; this.documentIds = documentIds; @@ -59,7 +57,6 @@ public class ClientParameters { this.noRetry = noRetry; this.traceLevel = traceLevel; this.priority = priority; - this.loadTypeName = loadTypeName; this.jsonOutput = jsonOutput; } @@ -76,7 +73,6 @@ public class ClientParameters { private boolean noRetry; private int traceLevel; private DocumentProtocol.Priority priority; - private String loadTypeName; private boolean jsonOutput; public Builder setHelp(boolean help) { @@ -139,11 +135,6 @@ public class ClientParameters { return this; } - public Builder setLoadTypeName(String loadTypeName) { - this.loadTypeName = loadTypeName; - return this; - } - public Builder setJsonOutput(boolean jsonOutput) { this.jsonOutput = jsonOutput; return this; @@ -152,7 +143,7 @@ public class ClientParameters { public ClientParameters build() { return new ClientParameters( help, documentIds, printIdsOnly, fieldSet, route, cluster, configId, - showDocSize, timeout, noRetry, traceLevel, priority, loadTypeName, jsonOutput); + showDocSize, timeout, noRetry, traceLevel, priority, jsonOutput); } } diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java index da9f48f44b1..bc5680d38b7 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java @@ -37,7 +37,6 @@ public class CommandLineOptions { public static final String NORETRY_OPTION = "noretry"; public static final String TRACE_OPTION = "trace"; public static final String PRIORITY_OPTION = "priority"; - public static final String LOADTYPE_OPTION = "loadtype"; public static final String JSONOUTPUT_OPTION = "jsonoutput"; public static final String XMLOUTPUT_OPTION = "xmloutput"; @@ -123,12 +122,6 @@ public class CommandLineOptions { .longOpt(PRIORITY_OPTION) .argName("priority").build()); - options.addOption(Option.builder("l") - .hasArg(true) - .desc("Load type (default \"\").") - .longOpt(LOADTYPE_OPTION) - .argName("loadtype").build()); - options.addOption(Option.builder("j") .hasArg(false) .desc("JSON output (default format)") @@ -163,7 +156,6 @@ public class CommandLineOptions { String route = cl.getOptionValue(ROUTE_OPTION, ""); String configId = cl.getOptionValue(CONFIGID_OPTION, ""); boolean help = cl.hasOption(HELP_OPTION); - String loadtype = cl.getOptionValue(LOADTYPE_OPTION, ""); boolean noRetry = cl.hasOption(NORETRY_OPTION); boolean showDocSize = cl.hasOption(SHOWDOCSIZE_OPTION); boolean jsonOutput = cl.hasOption(JSONOUTPUT_OPTION); @@ -211,7 +203,6 @@ public class CommandLineOptions { .setFieldSet(fieldSet) .setHelp(help) .setPrintIdsOnly(printIdsOnly) - .setLoadTypeName(loadtype) .setNoRetry(noRetry) .setCluster(cluster) .setRoute(route) diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java index 2454f5c8627..f0f36b06f8b 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java @@ -8,8 +8,6 @@ import com.yahoo.documentapi.SyncParameters; import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess; import com.yahoo.documentapi.messagebus.MessageBusParams; import com.yahoo.documentapi.messagebus.MessageBusSyncSession; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.GetDocumentMessage; import com.yahoo.documentapi.messagebus.protocol.GetDocumentReply; import com.yahoo.messagebus.Message; @@ -20,7 +18,6 @@ import com.yahoo.vespaclient.ClusterDef; import com.yahoo.vespaclient.ClusterList; import java.util.Iterator; -import java.util.Map; /** * The document retriever is responsible for retrieving documents using the Document API and printing the result to standard out. @@ -33,7 +30,6 @@ public class DocumentRetriever { private final ClusterList clusterList; private final DocumentAccessFactory documentAccessFactory; private final ClientParameters params; - private final LoadTypeSet loadTypeSet; // TODO remove on Vespa 8 private MessageBusSyncSession session; private MessageBusDocumentAccess documentAccess; @@ -43,21 +39,6 @@ public class DocumentRetriever { ClientParameters params) { this.clusterList = clusterList; this.documentAccessFactory = documentAccessFactory; - this.loadTypeSet = new LoadTypeSet(); // TODO remove on Vespa 8 - this.params = params; - } - - /** - * @deprecated load types are deprecated. Use constructor without LoadTypeSet instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public DocumentRetriever(ClusterList clusterList, - DocumentAccessFactory documentAccessFactory, - LoadTypeSet loadTypeSet, - ClientParameters params) { - this.clusterList = clusterList; - this.documentAccessFactory = documentAccessFactory; - this.loadTypeSet = loadTypeSet; this.params = params; } @@ -81,7 +62,6 @@ public class DocumentRetriever { public void retrieveDocuments() throws DocumentRetrieverException { boolean first = true; String route = params.cluster.isEmpty() ? params.route : resolveClusterRoute(params.cluster); - LoadType loadType = params.loadTypeName.isEmpty() ? null : resolveLoadType(params.loadTypeName); MessageBusParams messageBusParams = createMessageBusParams(params.configId, params.timeout, route); documentAccess = documentAccessFactory.createDocumentAccess(messageBusParams); @@ -104,7 +84,7 @@ public class DocumentRetriever { } } String docid = iter.next(); - Message msg = createDocumentRequest(docid, loadType); + Message msg = createDocumentRequest(docid); Reply reply = session.syncSend(msg); printReply(reply); } @@ -133,17 +113,8 @@ public class DocumentRetriever { return clusterDef.getRoute(); } - private LoadType resolveLoadType(String loadTypeName) throws DocumentRetrieverException { - Map<String, LoadType> loadTypesNameMap = loadTypeSet.getNameMap(); - if (!loadTypesNameMap.containsKey(loadTypeName)) { - throw new DocumentRetrieverException(String.format("Loadtype with name '%s' does not exist.\n", loadTypeName)); - } else { - return loadTypesNameMap.get(loadTypeName); - } - } - private MessageBusParams createMessageBusParams(String configId, double timeout, String route) { - MessageBusParams messageBusParams = new MessageBusParams(loadTypeSet); + MessageBusParams messageBusParams = new MessageBusParams(); messageBusParams.setRoute(route); messageBusParams.setProtocolConfigId(configId); messageBusParams.setRoutingConfigId(configId); @@ -155,15 +126,10 @@ public class DocumentRetriever { return messageBusParams; } - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - private Message createDocumentRequest(String docid, LoadType loadType) { + private Message createDocumentRequest(String docid) { GetDocumentMessage msg = new GetDocumentMessage(new DocumentId(docid), params.fieldSet); msg.setPriority(params.priority); // TODO: Remove on Vespa 8 msg.setRetryEnabled(!params.noRetry); - - if (loadType != null) { - msg.setLoadType(loadType); - } return msg; } diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/Main.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/Main.java index 7596246d16e..f5851041ceb 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/Main.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/Main.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaget; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.vespaclient.ClusterList; import java.util.logging.Level; @@ -38,12 +37,10 @@ public class Main { Runtime.getRuntime().addShutdownHook(new Thread(documentRetriever::shutdown)); } - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 private static DocumentRetriever createDocumentRetriever(ClientParameters params) { return new DocumentRetriever( new ClusterList("client"), new DocumentAccessFactory(), - new LoadTypeSet(params.configId), // TODO: Remove on Vespa 8 params ); } diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java index b634e899b74..d47810fa81f 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java @@ -66,7 +66,6 @@ public class CommandLineOptionsTest { assertFalse(params.noRetry); assertEquals(0, params.traceLevel); assertEquals(DocumentProtocol.Priority.NORMAL_2, params.priority); - assertTrue(params.loadTypeName.isEmpty()); } @Test @@ -80,7 +79,6 @@ public class CommandLineOptionsTest { "--noretry", "--trace", "1", "--priority", Integer.toString(DocumentProtocol.Priority.HIGH_3.getValue()), - "--loadtype", "dummyloadtype", "id:1", "id:2" ); @@ -92,7 +90,6 @@ public class CommandLineOptionsTest { assertTrue(params.noRetry); assertEquals(1, params.traceLevel); assertEquals(DocumentProtocol.Priority.HIGH_3, params.priority); - assertEquals("dummyloadtype", params.loadTypeName); Iterator<String> documentsIds = params.documentIds; assertEquals("id:1", documentsIds.next()); diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java index 30d117ab105..df847852c83 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java @@ -8,8 +8,6 @@ import com.yahoo.document.DocumentId; import com.yahoo.document.fieldset.AllFields; import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess; import com.yahoo.documentapi.messagebus.MessageBusSyncSession; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.GetDocumentMessage; import com.yahoo.documentapi.messagebus.protocol.GetDocumentReply; @@ -101,7 +99,6 @@ public class DocumentRetrieverTest { .setPrintIdsOnly(false) .setHelp(false) .setShowDocSize(false) - .setLoadTypeName("") .setNoRetry(false) .setTraceLevel(0) .setTimeout(0) @@ -139,24 +136,19 @@ public class DocumentRetrieverTest { .setDocumentIds(asIterator(DOC_ID_1)) .setPriority(DocumentProtocol.Priority.HIGH_1) .setNoRetry(true) - .setLoadTypeName("loadtype") .build(); when(mockedSession.syncSend(any())).thenReturn(createDocumentReply(DOC_ID_1)); - LoadTypeSet loadTypeSet = new LoadTypeSet(); // TODO remove on Vespa 8 - loadTypeSet.addLoadType(1, "loadtype", DocumentProtocol.Priority.HIGH_1); DocumentRetriever documentRetriever = new DocumentRetriever( new ClusterList(), mockedFactory, - loadTypeSet, params); documentRetriever.retrieveDocuments(); verify(mockedSession, times(1)).syncSend(argThat((ArgumentMatcher<GetDocumentMessage>) o -> o.getPriority().equals(DocumentProtocol.Priority.HIGH_1) && - !o.getRetryEnabled() && - o.getLoadType().equals(new LoadType(1, "loadtype", DocumentProtocol.Priority.HIGH_1)))); // TODO: Remove on Vespa 8 + !o.getRetryEnabled())); assertContainsDocument(DOC_ID_1); } @@ -221,19 +213,6 @@ public class DocumentRetrieverTest { } @Test - public void testInvalidLoadType() throws DocumentRetrieverException { - exception.expect(DocumentRetrieverException.class); - exception.expectMessage("Loadtype with name 'undefinedloadtype' does not exist.\n"); - - ClientParameters params = createParameters() - .setLoadTypeName("undefinedloadtype") - .build(); - - DocumentRetriever documentRetriever = createDocumentRetriever(params); - documentRetriever.retrieveDocuments(); - } - - @Test public void testClusterLookup() throws DocumentRetrieverException { final String cluster = "storage", expectedRoute = "[Content:cluster=storage]"; |