From 0683a03e8acad571b476e6ed96534e903f8c4b1e Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Thu, 28 Jan 2021 10:00:00 +0100 Subject: Revert "Revert "Jonmv/reapply document protocol super config [run-systemtest]"" This reverts commit 2e2e2edeb3ea99f2c04925070cf44601e2cd94fb. --- documentapi/abi-spec.json | 154 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 138 insertions(+), 16 deletions(-) (limited to 'documentapi/abi-spec.json') diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json index 39d6898215c..36c2e1fda99 100644 --- a/documentapi/abi-spec.json +++ b/documentapi/abi-spec.json @@ -1128,6 +1128,7 @@ "public com.yahoo.documentapi.messagebus.MessageBusParams setRoutingConfigId(java.lang.String)", "public java.lang.String getProtocolConfigId()", "public com.yahoo.documentapi.messagebus.MessageBusParams setProtocolConfigId(java.lang.String)", + "public com.yahoo.documentapi.messagebus.MessageBusParams setDocumentProtocolPoliciesConfig(com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig, com.yahoo.vespa.config.content.DistributionConfig)", "public com.yahoo.documentapi.messagebus.MessageBusParams setRouteName(java.lang.String)", "public com.yahoo.documentapi.messagebus.MessageBusParams setRoute(java.lang.String)", "public com.yahoo.documentapi.messagebus.MessageBusParams setRouteNameForGet(java.lang.String)", @@ -1573,6 +1574,7 @@ "fields": [ "protected final java.lang.String clusterName", "protected final java.lang.String distributionConfigId", + "protected final com.yahoo.vespa.config.content.DistributionConfig distributionConfig", "protected final com.yahoo.documentapi.messagebus.protocol.ContentPolicy$SlobrokHostPatternGenerator slobrokHostPatternGenerator" ] }, @@ -1595,8 +1597,7 @@ "public" ], "methods": [ - "public void (java.lang.String)", - "public void (java.util.Map)", + "public void (java.lang.String, com.yahoo.vespa.config.content.DistributionConfig)", "public void (com.yahoo.documentapi.messagebus.protocol.ContentPolicy$Parameters)", "public void select(com.yahoo.messagebus.routing.RoutingContext)", "public void merge(com.yahoo.messagebus.routing.RoutingContext)", @@ -1806,6 +1807,7 @@ "public static com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority getPriorityByName(java.lang.String)", "public void (com.yahoo.document.DocumentTypeManager)", "public void (com.yahoo.document.DocumentTypeManager, java.lang.String)", + "public void (com.yahoo.document.DocumentTypeManager, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet, com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig, com.yahoo.vespa.config.content.DistributionConfig)", "public void (com.yahoo.document.DocumentTypeManager, java.lang.String, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)", "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)", @@ -1890,6 +1892,138 @@ "public static final int ERROR_SUSPENDED" ] }, + "com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Builder": { + "superClass": "java.lang.Object", + "interfaces": [ + "com.yahoo.config.ConfigInstance$Builder" + ], + "attributes": [ + "public" + ], + "methods": [ + "public void ()", + "public void (com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Builder cluster(java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Builder)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Builder cluster(java.util.Map)", + "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)", + "public final java.lang.String getDefMd5()", + "public final java.lang.String getDefName()", + "public final java.lang.String getDefNamespace()", + "public final boolean getApplyOnRestart()", + "public final void setApplyOnRestart(boolean)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig build()" + ], + "fields": [ + "public java.util.Map cluster" + ] + }, + "com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Builder": { + "superClass": "java.lang.Object", + "interfaces": [ + "com.yahoo.config.ConfigBuilder" + ], + "attributes": [ + "public" + ], + "methods": [ + "public void ()", + "public void (com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Builder defaultRoute(java.lang.String)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Builder route(com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Route$Builder)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Builder route(java.util.List)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Builder selector(java.lang.String)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster build()" + ], + "fields": [ + "public java.util.List route" + ] + }, + "com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Route$Builder": { + "superClass": "java.lang.Object", + "interfaces": [ + "com.yahoo.config.ConfigBuilder" + ], + "attributes": [ + "public" + ], + "methods": [ + "public void ()", + "public void (com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Route)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Route$Builder name(java.lang.String)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Route$Builder messageType(int)", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Route build()" + ], + "fields": [] + }, + "com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Route": { + "superClass": "com.yahoo.config.InnerNode", + "interfaces": [], + "attributes": [ + "public", + "final" + ], + "methods": [ + "public void (com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Route$Builder)", + "public java.lang.String name()", + "public int messageType()" + ], + "fields": [] + }, + "com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster": { + "superClass": "com.yahoo.config.InnerNode", + "interfaces": [], + "attributes": [ + "public", + "final" + ], + "methods": [ + "public void (com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Builder)", + "public java.lang.String defaultRoute()", + "public java.util.List route()", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster$Route route(int)", + "public java.lang.String selector()" + ], + "fields": [] + }, + "com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Producer": { + "superClass": "java.lang.Object", + "interfaces": [ + "com.yahoo.config.ConfigInstance$Producer" + ], + "attributes": [ + "public", + "interface", + "abstract" + ], + "methods": [ + "public abstract void getConfig(com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Builder)" + ], + "fields": [] + }, + "com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig": { + "superClass": "com.yahoo.config.ConfigInstance", + "interfaces": [], + "attributes": [ + "public", + "final" + ], + "methods": [ + "public static java.lang.String getDefMd5()", + "public static java.lang.String getDefName()", + "public static java.lang.String getDefNamespace()", + "public static java.lang.String getDefVersion()", + "public void (com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Builder)", + "public java.util.Map cluster()", + "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster cluster(java.lang.String)" + ], + "fields": [ + "public static final java.lang.String CONFIG_DEF_MD5", + "public static final java.lang.String CONFIG_DEF_NAME", + "public static final java.lang.String CONFIG_DEF_NAMESPACE", + "public static final java.lang.String CONFIG_DEF_VERSION", + "public static final java.lang.String[] CONFIG_DEF_SCHEMA" + ] + }, "com.yahoo.documentapi.messagebus.protocol.DocumentProtocolRoutingPolicy": { "superClass": "java.lang.Object", "interfaces": [ @@ -1928,6 +2062,7 @@ "public" ], "methods": [ + "public void (com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig)", "public void (java.lang.String)", "public synchronized java.lang.String getError()", "public void configure(com.yahoo.documentapi.messagebus.protocol.DocumentrouteselectorpolicyConfig)", @@ -2952,18 +3087,6 @@ ], "fields": [] }, - "com.yahoo.documentapi.messagebus.protocol.RoutingPolicyFactories": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public", - "abstract" - ], - "methods": [ - "public void ()" - ], - "fields": [] - }, "com.yahoo.documentapi.messagebus.protocol.RoutingPolicyFactory": { "superClass": "java.lang.Object", "interfaces": [], @@ -2973,8 +3096,7 @@ "abstract" ], "methods": [ - "public abstract com.yahoo.documentapi.messagebus.protocol.DocumentProtocolRoutingPolicy createPolicy(java.lang.String)", - "public abstract void destroy()" + "public abstract com.yahoo.documentapi.messagebus.protocol.DocumentProtocolRoutingPolicy createPolicy(java.lang.String)" ], "fields": [] }, -- cgit v1.2.3