diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-12-11 08:07:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 08:07:46 -0800 |
| commit | cf4ba9d201390e2fe24c8bb068aa4a39db474e92 (patch) | |
| tree | 1d31128b1b15738e0fcce1b2295222ba62fd5a92 | |
| parent | 8f9594a7219835c3540b1cc40ec835838b147bbb (diff) | |
| parent | 079dcc6d4400d58f638c65c10b75a5e048e314cf (diff) | |
Merge pull request #7926 from vespa-engine/bratseth/add-xml-renderer
Add XmlRenderer to registry
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java b/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java index 8cd90efdc64..0f01261f6a4 100644 --- a/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java +++ b/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java @@ -24,6 +24,7 @@ import java.util.concurrent.Executor; public final class RendererRegistry extends ComponentRegistry<com.yahoo.processing.rendering.Renderer<Result>> { public static final ComponentId xmlRendererId = ComponentId.fromString("DefaultRenderer"); + private static final ComponentId newXmlRendererId = ComponentId.fromString("XmlRenderer"); public static final ComponentId jsonRendererId = ComponentId.fromString("JsonRenderer"); public static final ComponentId defaultRendererId = jsonRendererId; @@ -64,6 +65,11 @@ public final class RendererRegistry extends ComponentRegistry<com.yahoo.processi xmlRenderer.initId(xmlRendererId); register(xmlRenderer.getId(), xmlRenderer); + // Add new Vespa 7 xml renderer + Renderer newXmlRenderer = new XmlRenderer(executor); + newXmlRenderer.initId(newXmlRendererId); + register(newXmlRenderer.getId(), newXmlRenderer); + // add application renderers for (Renderer renderer : renderers) register(renderer.getId(), renderer); @@ -80,6 +86,7 @@ public final class RendererRegistry extends ComponentRegistry<com.yahoo.processi // deconstruct the renderers which was created by this getRenderer(jsonRendererId.toSpecification()).deconstruct(); getRenderer(xmlRendererId.toSpecification()).deconstruct(); + getRenderer(newXmlRendererId.toSpecification()).deconstruct(); getRenderer(tiledRendererId.toSpecification()).deconstruct(); getRenderer(pageRendererId.toSpecification()).deconstruct(); } |