Merge pull request #6340 from vespa-engine/hmusum/add-default-implementation

Need default implementation of new method (for old models)

1 files changed, 6 insertions, 2 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 feccabf47b0..6d78e7d7756 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
@@ -35,8 +35,9 @@ public interface ModelFactory {
      * @return a {@link ModelCreateResult} instance.
      * @deprecated use {@link #createAndValidateModel(ModelContext, ValidationParameters)}
      */
+    @SuppressWarnings("DeprecatedIsStillUsed")
     @Deprecated
-    // TODO: Remove when 6.258 is latest version in use
+    // TODO: Remove when 6.259 is latest version in use
     default ModelCreateResult createAndValidateModel(ModelContext modelContext, boolean ignoreValidationErrors) {
         return createAndValidateModel(modelContext, new ValidationParameters(ignoreValidationErrors
                                                                                      ? IgnoreValidationErrors.FALSE
@@ -51,5 +52,8 @@ public interface ModelFactory {
      * @param validationParameters validation parameters
      * @return a {@link ModelCreateResult} instance.
      */
-    ModelCreateResult createAndValidateModel(ModelContext modelContext, ValidationParameters validationParameters);
+    // TODO: Remove default implementation when 6.259 is latest version in use
+    default ModelCreateResult createAndValidateModel(ModelContext modelContext, ValidationParameters validationParameters) {
+        return createAndValidateModel(modelContext, validationParameters.ignoreValidationErrors());
+    }
 }