Mostly remove old way of overriding validations in dev

3 files changed, 6 insertions, 16 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index 68924dde3e1..dd66861f2ce 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -142,12 +142,8 @@ public class DeployState implements ConfigDefinitionStore {
         this.semanticRules = semanticRules; // TODO: Remove this by seeing how pagetemplates are propagated
         this.importedModels = importMlModels(applicationPackage, modelImporters, deployLogger);
 
-        ValidationOverrides suppliedValidationOverrides = applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml)
-                                                                            .orElse(ValidationOverrides.empty);
-        this.validationOverrides =
-                zone.environment().isManuallyDeployed() // // Warn but allow in manually deployed zones
-                ? new ValidationOverrides.AllowAllValidationOverrides(suppliedValidationOverrides, deployLogger)
-                : suppliedValidationOverrides;
+        this.validationOverrides = applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml)
+                                                     .orElse(ValidationOverrides.empty);
 
         this.wantedNodeVespaVersion = wantedNodeVespaVersion;
         this.now = now;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
index 89f2a9faa9d..b576d1cb5d2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -174,8 +175,9 @@ public class VespaModelFactory implements ModelFactory {
             return Validation.validate(model, validationParameters, deployState);
         } catch (ValidationOverrides.ValidationException e) {
             if (deployState.isHosted() && zone.environment().isManuallyDeployed())
-                log.warning("Auto-overriding validation which would be disallowed in production: " +
-                            Exceptions.toMessageString(e));
+                deployState.getDeployLogger().logApplicationPackage(Level.WARNING,
+                                                                    "Auto-overriding validation which would be disallowed in production: " +
+                                                                    Exceptions.toMessageString(e));
             else
                 rethrowUnlessIgnoreErrors(e, validationParameters.ignoreValidationErrors());
         } catch (IllegalArgumentException | TransientException e) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidatorTest.java
index c8fdb8348c3..45f3b0fcf60 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidatorTest.java
@@ -45,14 +45,6 @@ public class ContentTypeRemovalValidatorTest {
         tester.deploy(previous, getServices("book"), Environment.prod, removalOverride); // Allowed due to override
     }
 
-    @Test
-    public void testNoOverrideNeededinDev() {
-        ValidationTester tester = new ValidationTester();
-
-        VespaModel previous = tester.deploy(null, getServices("music"), Environment.prod, null).getFirst();
-        tester.deploy(previous, getServices("book"), Environment.dev, null);
-    }
-
     private static String getServices(String documentType) {
         return "<services version='1.0'>" +
                "  <content id='test' version='1.0'>" +