Merge pull request #7830 from vespa-engine/bratseth/build-method-on-config-builder

Add build() method to config builders

6 files changed, 6 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java b/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java
index 9573b66c215..6e5e530d902 100644
--- a/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java
+++ b/config-model/src/main/java/com/yahoo/config/model/graph/ModelNode.java
@@ -18,7 +18,6 @@ import java.util.*;
  * Only Collection, not Collection subtypes can be used.
  *
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ModelNode<MODEL extends ConfigModel> implements ConfigModelInstanceFactory<MODEL> {
 
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index 528393e4135..ae8e8fe7de5 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -149,7 +149,7 @@ public class ApplicationDeployTest {
         DocumentmanagerConfig.Builder b = new DocumentmanagerConfig.Builder();
         model.getConfig(b, VespaModel.ROOT_CONFIGID);
         //String docMan = model.getConfig("documentmanager", "").toString();
-        DocumentmanagerConfig dc = new DocumentmanagerConfig(b);
+        DocumentmanagerConfig dc = b.build();
         String docMan=ConfigInstance.serialize(dc).toString();
         int pFlags = Pattern.MULTILINE + Pattern.DOTALL;
         Pattern base = Pattern.compile(".*name.*base\\.header.*", pFlags);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
index 71db60065aa..084cbcfdfc0 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
@@ -180,7 +180,7 @@ public class AttributeSettingsTestCase extends SearchDefinitionTestCase {
         AttributeFields attributes = new AttributeFields(getSearchWithMutables());
         AttributesConfig.Builder builder = new AttributesConfig.Builder();
         attributes.getConfig(builder);
-        AttributesConfig cfg = new AttributesConfig(builder);
+        AttributesConfig cfg = builder.build();
         assertEquals("a", cfg.attribute().get(0).name());
         assertFalse(cfg.attribute().get(0).ismutable());
 
@@ -197,7 +197,7 @@ public class AttributeSettingsTestCase extends SearchDefinitionTestCase {
         IndexingScript script = new IndexingScript(getSearchWithMutables());
         IlscriptsConfig.Builder builder = new IlscriptsConfig.Builder();
         script.getConfig(builder);
-        IlscriptsConfig cfg = new IlscriptsConfig(builder);
+        IlscriptsConfig cfg = builder.build();
         assertEquals(1, cfg.ilscript().size());
         IlscriptsConfig.Ilscript ils = cfg.ilscript(0);
         assertEquals("test", ils.doctype());
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
index f37a39d6f93..8ad6abbbb42 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
@@ -67,7 +67,7 @@ public class InheritanceTestCase extends AbstractExportingTestCase {
             builder.build();
             DocumentmanagerConfig.Builder b = new DocumentmanagerConfig.Builder();
             DerivedConfiguration.exportDocuments(new DocumentManager().produce(builder.getModel(), b), outDir.getPath());
-            DocumentmanagerConfig dc = new DocumentmanagerConfig(b);
+            DocumentmanagerConfig dc = b.build();
             assertEquals(17, dc.datatype().size());
             assertNotNull(structType("child.body", dc));
             DocumentmanagerConfig.Datatype.Structtype childHeader = structType("child.header", dc);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java
index ba19a8312f6..17c767f4029 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java
@@ -110,7 +110,7 @@ public class SummaryMapTestCase extends SearchDefinitionTestCase {
 
         SummarymapConfig.Builder scb = new SummarymapConfig.Builder();
         summaryMap.getConfig(scb);
-        SummarymapConfig c = new SummarymapConfig(scb);
+        SummarymapConfig c = scb.build();
         
         assertEquals(-1, c.defaultoutputclass());
         assertEquals(c.override().size(), 6);
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java
index 48032706cc0..37b49955bbf 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/VsmFieldsTestCase.java
@@ -29,7 +29,7 @@ public class VsmFieldsTestCase {
         VsmFields vsmFields = new VsmFields(search);
         VsmfieldsConfig.Builder cfgBuilder = new VsmfieldsConfig.Builder();
         vsmFields.getConfig(cfgBuilder);
-        VsmfieldsConfig cfg = new VsmfieldsConfig(cfgBuilder);
+        VsmfieldsConfig cfg = cfgBuilder.build();
 
         assertEquals(1, cfg.fieldspec().size());
         VsmfieldsConfig.Fieldspec fieldSpec = cfg.fieldspec().get(0);