From ba0cf910aec5e4bd921e4e7d77010982537490ad Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Fri, 2 Jul 2021 13:16:25 +0200 Subject: Revert "Merge pull request #18515 from vespa-engine/revert-18507-jonmv/reapply-session-cache-with-injected-config" This reverts commit fdea20ac7ba02313c94246e7cf77125320147d56, reversing changes made to 7537c42fa661952916cf91eebbb75e6984505100. --- .../DocumentProcessingHandlerAllMessageTypesTestCase.java | 2 +- .../docproc/jdisc/DocumentProcessingHandlerTestBase.java | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'docproc') diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java index c508e7da61d..268a40f04c9 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java @@ -36,7 +36,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertNotNull; /** - * @author Einar M R Rosenvinge + * @author Einar M R Rosenvinge */ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentProcessingHandlerTestBase { 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 05009f484c8..c437261224d 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java @@ -5,6 +5,7 @@ import com.yahoo.collections.Pair; import com.yahoo.component.ComponentId; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.core.document.ContainerDocumentConfig; +import com.yahoo.container.jdisc.ContainerMbusConfig; import com.yahoo.container.jdisc.messagebus.MbusServerProvider; import com.yahoo.container.jdisc.messagebus.SessionCache; import com.yahoo.docproc.CallStack; @@ -13,12 +14,15 @@ 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; import com.yahoo.jdisc.AbstractResource; import com.yahoo.jdisc.ReferencedResource; import com.yahoo.jdisc.application.ContainerBuilder; +import com.yahoo.messagebus.MessagebusConfig; import com.yahoo.messagebus.Protocol; import com.yahoo.messagebus.SourceSessionParams; import com.yahoo.messagebus.jdisc.MbusClient; @@ -26,6 +30,8 @@ import com.yahoo.messagebus.jdisc.test.RemoteServer; import com.yahoo.messagebus.jdisc.test.ServerTestDriver; 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; @@ -52,8 +58,11 @@ public abstract class DocumentProcessingHandlerTestBase { driver = ServerTestDriver.newInactiveInstanceWithProtocol(protocol, true); - sessionCache = - new SessionCache("raw:", driver.client().slobrokId(), "test", "raw:", null, "raw:", documentTypeManager); + sessionCache = new SessionCache(new ContainerMbusConfig.Builder().build(), + driver.client().slobroksConfig(), + new MessagebusConfig.Builder().build(), + "test", + protocol); ContainerBuilder builder = driver.parent().newContainerBuilder(); ComponentRegistry registry = new ComponentRegistry<>(); @@ -102,7 +111,7 @@ public abstract class DocumentProcessingHandlerTestBase { resource.release(); } - remoteServer = RemoteServer.newInstance(driver.client().slobrokId(), "foobar", protocol); + remoteServer = RemoteServer.newInstance("foobar", protocol); } @After -- cgit v1.2.3