Remove unused method and unneeded default implementation

1 files changed, 1 insertions, 23 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 6d78e7d7756..b2d9244cc9d 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,7 +1,6 @@
 // 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;
 
 /**
@@ -31,29 +30,8 @@ public interface ModelFactory {
      * 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 ignoreValidationErrors true if validation errors should not trigger exceptions
-     * @return a {@link ModelCreateResult} instance.
-     * @deprecated use {@link #createAndValidateModel(ModelContext, ValidationParameters)}
-     */
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    @Deprecated
-    // 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
-                                                                                     : 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.
      */
-    // TODO: Remove default implementation when 6.259 is latest version in use
-    default ModelCreateResult createAndValidateModel(ModelContext modelContext, ValidationParameters validationParameters) {
-        return createAndValidateModel(modelContext, validationParameters.ignoreValidationErrors());
-    }
+    ModelCreateResult createAndValidateModel(ModelContext modelContext, ValidationParameters validationParameters);
 }