Merge pull request #23002 from vespa-engine/cleanup-ancient-xml-syntax

Clean up 'searchchain' and 'searchchains' syntax in services.xml

3 files changed, 12 insertions, 30 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
index 7af81b3b9b1..1a5a7bbe544 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
@@ -83,8 +83,8 @@ public class VespaDomBuilderTest {
 
     @Test
     public void testGetElement() {
-        Element e = Xml.getElement(new StringReader("<searchchain><foo>sdf</foo></searchchain>"));
-        assertEquals(e.getTagName(), "searchchain");
+        Element e = Xml.getElement(new StringReader("<chain><foo>sdf</foo></chain>"));
+        assertEquals(e.getTagName(), "chain");
         assertEquals(XML.getChild(e, "foo").getTagName(), "foo");
         assertEquals(XML.getValue(XML.getChild(e, "foo")), "sdf");
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java
index 6006b52cf02..9fb7b58a43c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java
@@ -43,7 +43,7 @@ public class DomSchemaChainsBuilderTest extends DomBuilderTest {
     private SearchChains searchChains;
 
     private static final Element element = parse(
-            "<searchchains>",
+            "<search>",
             "  <searcher id='searcher:1'/>",
 
             "  <provider id='provider:1' inherits='parentChain1 parentChain2' excludes='ExcludedSearcher1 ExcludedSearcher2'",
@@ -59,15 +59,15 @@ public class DomSchemaChainsBuilderTest extends DomBuilderTest {
 
             "  </provider>",
 
-            "  <searchchain id='default'>",
+            "  <chain id='default'>",
             "    <federation id='federationSearcher'>",
             "      <source id='mysource'>",
             "        <federationoptions optional='false' />",
             "      </source>",
             "    </federation>",
-            "  </searchchain>",
+            "  </chain>",
 
-            "</searchchains>");
+            "</search>");
 
 
     @Before
@@ -78,17 +78,17 @@ public class DomSchemaChainsBuilderTest extends DomBuilderTest {
     @Test
     public void referToFederationAsSearcher() {
         final Element element = parse(
-                "<searchchains>",
+                "<search>",
                 "  <federation id='federationSearcher'>",
                 "    <source id='mysource'>",
                 "      <federationoptions optional='false' />",
                 "    </source>",
                 "  </federation>",
 
-                "  <searchchain id='default'>",
+                "  <chain id='default'>",
                 "    <searcher id='federationSearcher'/>",
-                "  </searchchain>",
-                "</searchchains>");
+                "  </chain>",
+                "</search>");
 
         try {
             MockRoot root = new MockRoot();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java
index d74f271f6ef..20345615753 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SchemaChainsTest.java
@@ -21,15 +21,10 @@ import static org.junit.Assert.assertEquals;
  */
 public class SchemaChainsTest extends SchemaChainsTestBase {
 
-    private ChainsConfig chainsConfig;
     private ClusterConfig clusterConfig;
 
     @Before
     public void subscribe() {
-        ChainsConfig.Builder chainsBuilder = new ChainsConfig.Builder();
-        chainsBuilder = (ChainsConfig.Builder)root.getConfig(chainsBuilder, "searchchains");
-        chainsConfig = new ChainsConfig(chainsBuilder);
-
         ClusterConfig.Builder clusterBuilder = new ClusterConfig.Builder();
         clusterBuilder = (ClusterConfig.Builder)root.getConfig(clusterBuilder, "searchchains/chain/cluster2/component/" + ClusterSearcher.class.getName());
         clusterConfig = new ClusterConfig(clusterBuilder);
@@ -39,7 +34,7 @@ public class SchemaChainsTest extends SchemaChainsTestBase {
     @Override
     Element servicesXml() {
         return parse(
-            "<searchchains>",
+            "<search>",
             "  <searcher id='searcher:1' classId='classId1' />",
 
             "  <provider id='provider:1' inherits='parentChain1 parentChain2' excludes='ExcludedSearcher1 ExcludedSearcher2'",
@@ -67,20 +62,7 @@ public class SchemaChainsTest extends SchemaChainsTestBase {
             "       <queryType>PROGRAMMATIC</queryType>",
             "    </config>",
             "  </provider>",
-
-            "  <searchchain id='default:99'>",
-            "    <federation id='federation:98' provides='provide_federation' before='p1 p2' after='s1 s2'>",
-            "      <source id='source:1'>",
-            "        <federationoptions optional='false' />",
-            "      </source>",
-            "    </federation>",
-            "  </searchchain>",
-
-            "  <searchchain id='parentChain1' />",
-            "  <searchchain id='parentChain2' />",
-            "  <searchchain id='parentChain3' />",
-            "  <searchchain id='parentChain4' />",
-            "</searchchains>");
+            "</search>");
     }
 
     private SearchChains getSearchChains() {