1 files changed, 20 insertions, 3 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelFactory.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelFactory.java
index 572c470b6aa..feccabf47b0 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelFactory.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelFactory.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
+import com.yahoo.config.model.api.ValidationParameters.IgnoreValidationErrors;
 import com.yahoo.config.provision.Version;
 
 /**
@@ -17,8 +18,8 @@ public interface ModelFactory {
 
     /**
      * Creates an instance of a {@link Model}. The resulting instance will be used to serve config. No model
-     * validation will be done, calling this method assumes that {@link #createAndValidateModel} has already
-     * been called at some point for this model.
+     * validation will be done, calling this method assumes that{@link #createAndValidateModel(ModelContext, ValidationParameters)}
+     * has already been called at some point for this model.
      *
      * @param modelContext an instance of {@link ModelContext}, containing dependencies for creating a {@link Model}.
      * @return a {@link Model} instance.
@@ -32,7 +33,23 @@ public interface ModelFactory {
      * @param modelContext an instance of {@link ModelContext}, containing dependencies for creating a {@link Model}
      * @param ignoreValidationErrors true if validation errors should not trigger exceptions
      * @return a {@link ModelCreateResult} instance.
+     * @deprecated use {@link #createAndValidateModel(ModelContext, ValidationParameters)}
      */
-    ModelCreateResult createAndValidateModel(ModelContext modelContext, boolean ignoreValidationErrors);
+    @Deprecated
+    // TODO: Remove when 6.258 is latest version in use
+    default ModelCreateResult createAndValidateModel(ModelContext modelContext, boolean ignoreValidationErrors) {
+        return createAndValidateModel(modelContext, new ValidationParameters(ignoreValidationErrors
+                                                                                     ? IgnoreValidationErrors.FALSE
+                                                                                     : IgnoreValidationErrors.TRUE));
+    }
 
+    /**
+     * Creates an instance of a {@link Model}. The resulting instance will be used to serve config. Any validation
+     * of a {@link Model} and the {@link ModelContext} can be done in this method.
+     *
+     * @param modelContext an instance of {@link ModelContext}, containing dependencies for creating a {@link Model}
+     * @param validationParameters validation parameters
+     * @return a {@link ModelCreateResult} instance.
+     */
+    ModelCreateResult createAndValidateModel(ModelContext modelContext, ValidationParameters validationParameters);
 }