diff options
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
4 files changed, 1 insertions, 47 deletions
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java index 06bb32213f9..a93cbe0c1ff 100644 --- a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java +++ b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java @@ -392,5 +392,4 @@ public final class NewDocumentType extends StructuredDataType implements DataTyp public Set<Name> getDocumentReferences() { return documentReferences; } - } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java index 50e93789159..6407f581a62 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java @@ -12,7 +12,6 @@ import com.yahoo.vespa.model.application.validation.change.ClusterSizeReductionV import com.yahoo.vespa.model.application.validation.change.ConfigValueChangeValidator; import com.yahoo.vespa.model.application.validation.change.ContainerRestartValidator; import com.yahoo.vespa.model.application.validation.change.ContentClusterRemovalValidator; -import com.yahoo.vespa.model.application.validation.change.ContentTypeRemovalValidator; import com.yahoo.vespa.model.application.validation.change.IndexedSearchClusterChangeValidator; import com.yahoo.vespa.model.application.validation.change.IndexingModeChangeValidator; import com.yahoo.vespa.model.application.validation.change.StartupCommandChangeValidator; @@ -76,7 +75,6 @@ public class Validation { new StreamingSearchClusterChangeValidator(), new ConfigValueChangeValidator(logger), new StartupCommandChangeValidator(), - new ContentTypeRemovalValidator(), new ContentClusterRemovalValidator(), new ClusterSizeReductionValidator(), new ContainerRestartValidator(), diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java index a2275b17233..52253411419 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.model.application.validation.change; import com.yahoo.config.model.api.ConfigChangeAction; -import com.yahoo.documentmodel.NewDocumentType; import com.yahoo.vespa.model.VespaModel; import com.yahoo.config.application.api.ValidationId; import com.yahoo.config.application.api.ValidationOverrides; @@ -27,7 +26,7 @@ public class ContentClusterRemovalValidator implements ChangeValidator { if (nextCluster == null) overrides.invalid(ValidationId.contentClusterRemoval, "Content cluster '" + currentClusterId + "' is removed. " + - "This will cause loss of all data in this cluster", + "This will cause loss of all data in this cluster", now); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidator.java deleted file mode 100644 index a691c8bb5c4..00000000000 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentTypeRemovalValidator.java +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.model.application.validation.change; - -import com.yahoo.config.application.api.ValidationId; -import com.yahoo.config.application.api.ValidationOverrides; -import com.yahoo.config.model.api.ConfigChangeAction; -import com.yahoo.documentmodel.NewDocumentType; -import com.yahoo.vespa.model.VespaModel; -import com.yahoo.vespa.model.content.cluster.ContentCluster; - -import java.time.Instant; -import java.util.Collections; -import java.util.List; - -/** - * Checks that this does not remove a data type in a cluster, as that causes deletion - * of all data of that type. - * - * @author bratseth - */ -public class ContentTypeRemovalValidator implements ChangeValidator { - - @Override - public List<ConfigChangeAction> validate(VespaModel current, VespaModel next, ValidationOverrides overrides, Instant now) { - for (ContentCluster currentCluster : current.getContentClusters().values()) { - ContentCluster nextCluster = next.getContentClusters().get(currentCluster.getSubId()); - if (nextCluster == null) continue; // validated elsewhere - - for (NewDocumentType type : currentCluster.getDocumentDefinitions().values()) { - if ( ! nextCluster.getDocumentDefinitions().containsKey(type.getName())) { - overrides.invalid(ValidationId.contentTypeRemoval, - "Type '" + type.getName() + "' is removed " + - " in content cluster '" + currentCluster.getName() + "'. " + - "This will cause loss of all data of this type", - now); - } - } - } - return Collections.emptyList(); - } - -} |