More cleanup

4 files changed, 8 insertions, 29 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 df9f72b2182..38d831a0b28 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
@@ -34,15 +34,14 @@ public final class NewDocumentType extends StructuredDataType implements DataTyp
 
     public static final class Name {
 
-        // TODO: privatize
-        final String name;
-        final int id;
+        private final String name;
+        private final int id;
 
         public Name(String name) {
-            this(name.hashCode(),name);
+            this(name.hashCode(), name);
         }
 
-        public Name(int id,String name) {
+        public Name(int id, String name) {
             this.id = id;
             this.name = name;
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index 9f9c5def406..acb4f58655d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -404,25 +404,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     /**
      * Resolve config for a given key and config definition
      *
-     * @param configKey The key to resolve.
-     * @param targetDef The config definition to use for the schema
-     * @return The payload as a list of strings
-     */
-    @Deprecated // TODO: Remove after December 2020
-    @Override
-    public ConfigPayload getConfig(ConfigKey<?> configKey, com.yahoo.vespa.config.buildergen.ConfigDefinition targetDef) {
-        Objects.requireNonNull(targetDef, "config definition cannot be null");
-
-        ConfigInstance.Builder builder = resolveToBuilder(configKey);
-        log.log(Level.FINE, () -> "Found builder for " + configKey);
-        InnerCNode innerCNode = targetDef.getCNode();
-        ConfigPayload payload = getConfigFromBuilder(builder, innerCNode);
-        return (innerCNode != null) ? payload.applyDefaultsFromDef(innerCNode) : payload;
-    }
-
-    /**
-     * Resolve config for a given key and config definition
-     *
      * @param configKey the key to resolve.
      * @param targetDef the config definition to use for the schema
      * @return the resolved config instance
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
index 385a678d452..b83c345efd3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
@@ -35,13 +35,12 @@ public class IndexingModeChangeValidator implements ChangeValidator {
         for (Map.Entry<String, ContentCluster> currentEntry : currentModel.getContentClusters().entrySet()) {
             ContentCluster nextCluster = nextModel.getContentClusters().get(currentEntry.getKey());
             if (nextCluster == null) continue;
-            actions.addAll(validateContentCluster(currentEntry.getValue(), nextCluster, overrides, now));
+            actions.addAll(validateContentCluster(currentEntry.getValue(), nextCluster));
         }
         return actions;
     }
 
-    private static List<ConfigChangeAction> validateContentCluster(
-            ContentCluster currentCluster, ContentCluster nextCluster, ValidationOverrides overrides, Instant now) {
+    private static List<ConfigChangeAction> validateContentCluster(ContentCluster currentCluster, ContentCluster nextCluster) {
         List<ConfigChangeAction> actions = new ArrayList<>();
         ContentSearchCluster currentSearchCluster = currentCluster.getSearch();
         ContentSearchCluster nextSearchCluster = nextCluster.getSearch();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java
index 2effc42cbef..91e370211f1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidator.java
@@ -68,8 +68,8 @@ public class IndexingScriptChangeValidator {
         return removeOutputExpressions(currentScript).equals(removeOutputExpressions(nextScript));
     }
 
-    private static ScriptExpression removeOutputExpressions(ScriptExpression script) {
-        return (ScriptExpression) new OutputExpressionRemover().convert(script);
+    private static Expression removeOutputExpressions(ScriptExpression script) {
+        return new OutputExpressionRemover().convert(script);
     }
 
     private static class OutputExpressionRemover extends ExpressionConverter {