Disallow on Vespa 8

4 files changed, 1 insertions, 20 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java
index 99f73a75669..399e8c6c311 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.schema.derived;
 
-import com.yahoo.config.subscription.ConfigInstanceUtil;
 import com.yahoo.schema.Schema;
 import com.yahoo.schema.document.Attribute;
 import com.yahoo.schema.document.Case;
@@ -16,8 +15,6 @@ import com.yahoo.vespa.indexinglanguage.expressions.ToPositionExpression;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -183,15 +180,6 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce
         return "attributes";
     }
 
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
-    private Map<String, AttributesConfig.Attribute.Builder> toMap(List<AttributesConfig.Attribute.Builder> ls) {
-        Map<String, AttributesConfig.Attribute.Builder> ret = new LinkedHashMap<>();
-        for (AttributesConfig.Attribute.Builder builder : ls) {
-            ret.put((String) ConfigInstanceUtil.getField(builder, "name"), builder);
-        }
-        return ret;
-    }
-
     @Override
     public void getConfig(AttributesConfig.Builder builder) {
         //TODO This is just to get some exporting tests to work, Should be undone and removed
diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ParsedDocumentSummary.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedDocumentSummary.java
index 93469a86fe3..7aaabaef865 100644
--- a/config-model/src/main/java/com/yahoo/schema/parser/ParsedDocumentSummary.java
+++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedDocumentSummary.java
@@ -30,8 +30,7 @@ class ParsedDocumentSummary extends ParsedBlock {
 
     ParsedSummaryField addField(ParsedSummaryField field) {
         String fieldName = field.name();
-        // TODO disallow this on Vespa 8
-        // verifyThat(! fields.containsKey(fieldName), "already has field", fieldName);
+        verifyThat(! fields.containsKey(fieldName), "already has field", fieldName);
         return fields.put(fieldName, field);
     }
 
diff --git a/config-model/src/test/examples/multiplesummaries.sd b/config-model/src/test/examples/multiplesummaries.sd
index 83e817718aa..07ab3c5a104 100644
--- a/config-model/src/test/examples/multiplesummaries.sd
+++ b/config-model/src/test/examples/multiplesummaries.sd
@@ -28,11 +28,6 @@ search multiplesummaries {
     summary field3 type array<int> {
     }
 
-    # TODO disallow duplicates
-    summary field1 type weightedset<string> {
-      source: field1
-    }
-
   }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
index d4e4f1dbb88..77d1b55019d 100644
--- a/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
@@ -175,7 +175,6 @@ public class SchemaParserTestCase {
         checkFileParses("src/test/derived/map_attribute/test.sd");
         checkFileParses("src/test/derived/map_of_struct_attribute/test.sd");
         checkFileParses("src/test/derived/mlr/mlr.sd");
-        checkFileParses("src/test/derived/multiplesummaries/multiplesummaries.sd");
         checkFileParses("src/test/derived/music3/music3.sd");
         checkFileParses("src/test/derived/music/music.sd");
         checkFileParses("src/test/derived/namecollision/collision.sd");