diff options
Diffstat (limited to 'documentapi')
4 files changed, 3 insertions, 25 deletions
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 547d7f76dc5..3f0ebf93d04 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 @@ -11,6 +11,7 @@ import com.yahoo.messagebus.ErrorCode; import com.yahoo.messagebus.Protocol; import com.yahoo.messagebus.Reply; import com.yahoo.messagebus.Routable; +import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.messagebus.routing.RoutingContext; import com.yahoo.messagebus.routing.RoutingNodeIterator; import com.yahoo.messagebus.routing.RoutingPolicy; diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java index 07fd098c9b4..879226d8229 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java @@ -7,6 +7,7 @@ import com.yahoo.document.select.DocumentSelector; import com.yahoo.document.select.Result; import com.yahoo.document.select.parser.ParseException; import com.yahoo.messagebus.Message; +import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.routing.RoutingContext; diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java index 34124cf48db..16a5d760816 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java @@ -2,6 +2,7 @@ package com.yahoo.documentapi.messagebus.protocol; import com.yahoo.config.subscription.ConfigSubscriber; +import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.routing.RoutingContext; import com.yahoo.vespa.config.content.MessagetyperouteselectorpolicyConfig; diff --git a/documentapi/src/main/resources/configdefinitions/document-protocol-policies.def b/documentapi/src/main/resources/configdefinitions/document-protocol-policies.def deleted file mode 100644 index ace4f254821..00000000000 --- a/documentapi/src/main/resources/configdefinitions/document-protocol-policies.def +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=documentapi.messagebus.protocol - -## -## Super config for all policies in the document protocol, keyed by content cluster ids. -## Note: ContentPolicy also uses the "distribution" config. -## - -# -# Config used by MessageTypeRouteSelectorPolicy -# -# Default route if no override is set for a type. -cluster{}.defaultRoute string - -# The name of the route. -cluster{}.route[].name string - -# The document protocol message type triggering this route. -cluster{}.route[].messageType int - -# -# Config used by DocumentRouteSelectorPolicy -# -# The document selector for this cluster route. -cluster{}.selector string |