diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-06-07 09:10:29 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:30 +0200 |
commit | c4ee8c6f7fad73483a38692bc2411a1422f7644b (patch) | |
tree | 99902a70d495fb6205b3147e67133f6133cdf13c /config-model/src/test/java | |
parent | 2f8e6ec5550e0078c07cd8fcfbdaaa4e3b9f0065 (diff) |
Remove feed handler setup
Diffstat (limited to 'config-model/src/test/java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java | 80 |
1 files changed, 1 insertions, 79 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java index b4242336c5c..507d7cc1522 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java @@ -2,20 +2,15 @@ package com.yahoo.vespa.model.container.xml; import com.yahoo.config.model.builder.xml.test.DomBuilderTest; -import com.yahoo.config.model.test.MockApplicationPackage; -import com.yahoo.config.model.test.MockRoot; -import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.Handler; import com.yahoo.vespa.model.container.component.SystemBindingPattern; -import com.yahoo.vespa.model.container.component.UserBindingPattern; import org.junit.Test; import org.w3c.dom.Element; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.Set; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -40,29 +35,6 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa } @Test - public void custom_bindings_are_allowed() { - Element elem = DomBuilderTest.parse( - "<container id='cluster1' version='1.0'>", - " <document-api>", - " <binding>http://*/document-api/</binding>", - " </document-api>", - nodesXml, - "</container>"); - createModel(root, elem); - - verifyCustomBindings("com.yahoo.vespa.http.server.FeedHandler"); - } - - private void verifyCustomBindings(String id) { - Handler<?> handler = getHandlers("cluster1").get(id); - - assertTrue(handler.getServerBindings().contains(UserBindingPattern.fromHttpPath("/document-api/reserved-for-internal-use/feedapi"))); - assertTrue(handler.getServerBindings().contains(UserBindingPattern.fromHttpPath("/document-api/reserved-for-internal-use/feedapi/"))); - - assertEquals(2, handler.getServerBindings().size()); - } - - @Test public void requireThatHandlersAreSetup() { Element elem = DomBuilderTest.parse( "<container id='cluster1' version='1.0'>", @@ -76,57 +48,7 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa assertNotNull(handlerMap.get("com.yahoo.container.handler.VipStatusHandler")); assertNotNull(handlerMap.get("com.yahoo.container.handler.observability.ApplicationStatusHandler")); assertNotNull(handlerMap.get("com.yahoo.container.jdisc.state.StateHandler")); - - assertNotNull(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler")); - assertTrue(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler").getServerBindings() - .contains(SystemBindingPattern.fromHttpPath("/reserved-for-internal-use/feedapi"))); - assertTrue(handlerMap.get("com.yahoo.vespa.http.server.FeedHandler").getServerBindings() - .contains(SystemBindingPattern.fromHttpPath("/reserved-for-internal-use/feedapi"))); - assertEquals(2, handlerMap.get("com.yahoo.vespa.http.server.FeedHandler").getServerBindings().size()); - } - - @Test - public void feeding_api_have_separate_threadpools() { - Element elem = DomBuilderTest.parse( - "<container id='cluster1' version='1.0'>", - " <document-api />", - nodesXml, - "</container>"); - root = new MockRoot("root", new MockApplicationPackage.Builder().build()); - createModel(root, elem); - Map<String, Handler<?>> handlers = getHandlers("cluster1"); - Handler<?> feedApiHandler = handlers.get("com.yahoo.vespa.http.server.FeedHandler"); - Set<String> injectedComponentIds = feedApiHandler.getInjectedComponentIds(); - assertTrue(injectedComponentIds.contains("threadpool@feedapi-handler")); - - ContainerThreadpoolConfig config = root.getConfig( - ContainerThreadpoolConfig.class, "cluster1/component/com.yahoo.vespa.http.server.FeedHandler/threadpool@feedapi-handler"); - assertEquals(-4, config.maxThreads()); - assertEquals(-4, config.minThreads()); - } - - @Test - public void threadpools_configuration_can_be_overridden() { - Element elem = DomBuilderTest.parse( - "<container id='cluster1' version='1.0'>", - " <document-api>", - " <http-client-api>", - " <threadpool>", - " <max-threads>50</max-threads>", - " <min-threads>25</min-threads>", - " <queue-size>1000</queue-size>", - " </threadpool>", - " </http-client-api>", - " </document-api>", - nodesXml, - "</container>"); - createModel(root, elem); - - ContainerThreadpoolConfig feedThreadpoolConfig = root.getConfig( - ContainerThreadpoolConfig.class, "cluster1/component/com.yahoo.vespa.http.server.FeedHandler/threadpool@feedapi-handler"); - assertEquals(50, feedThreadpoolConfig.maxThreads()); - assertEquals(25, feedThreadpoolConfig.minThreads()); - assertEquals(1000, feedThreadpoolConfig.queueSize()); + assertNotNull(handlerMap.get("com.yahoo.document.restapi.resource.DocumentV1ApiHandler")); } } |