cleanup some unneccessary cruft

15 files changed, 0 insertions, 75 deletions

diff --git a/document/abi-spec.json b/document/abi-spec.json
index abb9f76b311..e7960298b90 100644
--- a/document/abi-spec.json
+++ b/document/abi-spec.json
@@ -436,7 +436,6 @@
       "public void addField(com.yahoo.document.Field)",
       "public void addFieldSets(java.util.Map)",
       "public com.yahoo.document.Field addField(java.lang.String, com.yahoo.document.DataType)",
-      "public com.yahoo.document.Field addHeaderField(java.lang.String, com.yahoo.document.DataType)",
       "public void inherit(com.yahoo.document.DocumentType)",
       "public java.util.Collection getInheritedTypes()",
       "public java.util.ListIterator inheritedIterator()",
@@ -3350,7 +3349,6 @@
       "public"
     ],
     "methods": [
-      "public void <init>(com.yahoo.document.serialization.DocumentUpdateReader, com.yahoo.document.DocumentType, int)",
       "public void <init>(com.yahoo.document.serialization.DocumentUpdateReader, com.yahoo.document.DocumentType)",
       "public com.yahoo.document.DocumentType getDocumentType()",
       "public com.yahoo.document.Field getField()",
diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java
index d1dda22206b..0f771e4d55a 100644
--- a/document/src/main/java/com/yahoo/document/DocumentType.java
+++ b/document/src/main/java/com/yahoo/document/DocumentType.java
@@ -261,19 +261,6 @@ public class DocumentType extends StructuredDataType {
     }
 
     /**
-     * Adds a new header field to this document type and returns the new field object
-     *
-     * @param name The name of the field to add
-     * @param type The datatype of the field to add
-     * @return The field created
-     *         TODO Fix searchdefinition so that exception can be thrown if filed is already registerd
-     */
-    @Deprecated
-    public Field addHeaderField(String name, DataType type) {
-        return addField(name, type);
-    }
-
-    /**
      * Adds a document to the inherited document types of this.
      * If this type is already directly inherited, nothing is done
      *
diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
index f11b1ae9531..2f2f5647603 100644
--- a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
+++ b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
@@ -195,7 +195,6 @@ public class DocumentTypeManagerConfigurer implements ConfigSubscriber.SingleSub
             }
         }
 
-        @SuppressWarnings("deprecation")
         private void fillStructs(DocumentmanagerConfig config) {
             for (var thisDataType : config.datatype()) {
                 for (var struct : thisDataType.structtype()) {
@@ -262,7 +261,6 @@ public class DocumentTypeManagerConfigurer implements ConfigSubscriber.SingleSub
             }
         }
 
-        @SuppressWarnings("deprecation")
         private void apply(DocumentmanagerConfig config) {
             splitConfig(config);
             setupAnnotationTypesWithoutPayloads(config);
diff --git a/document/src/main/java/com/yahoo/document/datatypes/Array.java b/document/src/main/java/com/yahoo/document/datatypes/Array.java
index 672690bafad..790cc5d4cde 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/Array.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/Array.java
@@ -220,12 +220,10 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i
         return values.addAll(index, c);
     }
 
-    @SuppressWarnings("deprecation")
     public boolean retainAll(Collection<?> c) {
         return values.retainAll(c);
     }
 
-    @SuppressWarnings("deprecation")
     public boolean removeAll(Collection<?> c) {
         return values.removeAll(c);
     }
@@ -234,12 +232,10 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i
         return values.get(index);
     }
 
-    @SuppressWarnings("deprecation")
     public int indexOf(Object o) {
         return values.indexOf(o);
     }
 
-    @SuppressWarnings("deprecation")
     public int lastIndexOf(Object o) {
         return values.lastIndexOf(o);
     }
@@ -256,7 +252,6 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i
         return values.remove(index);
     }
 
-    @SuppressWarnings("deprecation")
     public T set(int index, T o) {
         verifyElementCompatibility(o);
         T fval = values.set(index, o);
@@ -512,7 +507,6 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i
             };
         }
 
-        @SuppressWarnings("deprecation")
         public List<E> subList(int fromIndex, int toIndex) {
             return new ListWrapper<E>(myvalues.subList(fromIndex, toIndex));
         }
diff --git a/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java b/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java
index d6166f8fcbe..55b94941994 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java
@@ -90,7 +90,6 @@ public class ComparisonNode implements ExpressionNode {
         return null;
     }
 
-    @SuppressWarnings("deprecation")
     private BucketSet compare(BucketIdFactory factory, IdNode id, LiteralNode literal, String operator) {
         String field = id.getField();
         Object value = literal.getValue();
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java
index 4afab9233c6..47ae31b53fe 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java
@@ -99,7 +99,6 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu
         read(null, document);
     }
 
-    @SuppressWarnings("deprecation")
     public void read(FieldBase field, Document doc) {
         // Verify that we have correct version
         version = getShort(null);
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
index 8f5a0f6acd5..ee36dcb1a9c 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
@@ -84,7 +84,6 @@ public class VespaDocumentSerializer6 extends BufferSerializer implements Docume
         write(new Field(doc.getDataType().getName(), 0, doc.getDataType()), doc);
     }
 
-    @SuppressWarnings("deprecation")
     public void write(FieldBase field, Document doc) {
         buf.putShort(Document.SERIALIZED_VERSION);
 
diff --git a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java
index c2a3dd824a5..b2992bf4988 100644
--- a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java
@@ -75,11 +75,6 @@ public class FieldUpdate {
         addValueUpdates(valueUpdates);
     }
 
-    @Deprecated
-    public FieldUpdate(DocumentUpdateReader reader, DocumentType type, int serializationVersion) {
-        this(reader, type);
-    }
-
     public FieldUpdate(DocumentUpdateReader reader, DocumentType type) {
         documentType = type;
         reader.read(this);
diff --git a/document/src/test/java/com/yahoo/document/DataTypeNameTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeNameTestCase.java
index 0d6c50e3e4f..efdb37b90d4 100644
--- a/document/src/test/java/com/yahoo/document/DataTypeNameTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DataTypeNameTestCase.java
@@ -12,7 +12,6 @@ import static org.junit.Assert.assertFalse;
 public class DataTypeNameTestCase {
 
     @Test
-    @SuppressWarnings("deprecation")
     public void requireThatAccessorsWork() {
         DataTypeName name = new DataTypeName("foo");
         assertEquals("foo", name.getName());
diff --git a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
index db877bb9712..77b621a3c36 100644
--- a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
@@ -58,7 +58,6 @@ import static org.junit.Assert.assertTrue;
 public class DocumentSerializationTestCase extends AbstractTypesTest {
 
     @Test
-    @SuppressWarnings("deprecation")
     public void testSerializationAllVersions() throws IOException {
 
         DocumentType docInDocType = new DocumentType("docindoc");
diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
index 8d6fe7a8fa1..e2bdd846dd1 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
@@ -100,7 +100,6 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         return dcMan;
     }
 
-    @SuppressWarnings("deprecation")
     public void setUpSertestDocType() {
         docMan = new DocumentTypeManager();
 
@@ -748,7 +747,6 @@ public class DocumentTestCase extends DocumentTestCaseBase {
     }
 
     @Test
-    @SuppressWarnings("deprecation")
     public void testSerializeDeserialize() {
         setUpSertestDocType();
         Document doc = getSertestDocument();
@@ -878,36 +876,6 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         doc.setFieldValue("something", testlist);
     }
 
-    @SuppressWarnings("deprecation")
-    @Test
-    public void testCompressionConfiguredIsIgnored() {
-
-        int size_uncompressed;
-        {
-            DocumentTypeManager docMan = DocumentTypeManager.fromFile("src/tests/data/cppdocument.cfg");
-            Document doc = new Document(docMan.getDocumentType("serializetest"), new DocumentId("id:ns:serializetest::test"));
-
-            doc.setFieldValue("stringfield",
-                              "compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me ");
-
-            GrowableByteBuffer data = new GrowableByteBuffer();
-            doc.serialize(data);
-            size_uncompressed = data.position();
-        }
-
-        DocumentTypeManager docMan = DocumentTypeManager.fromFile("src/tests/data/compressed.cfg");
-        Document doc = new Document(docMan.getDocumentType("serializetest"), new DocumentId("id:ns:serializetest::test"));
-
-        doc.setFieldValue("stringfield",
-                          "compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me compress me ");
-
-        GrowableByteBuffer data = new GrowableByteBuffer();
-        doc.serialize(data);
-        int size_compressed = data.position();
-
-        assertEquals(size_compressed, size_uncompressed);
-    }
-
     @Test
     public void testDocumentDataType() {
         //use documenttypemanagerconfigurer to read config
@@ -1092,7 +1060,6 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         assertEquals(doc, doc2);
     }
 
-    @SuppressWarnings("deprecation")
     @Test
     public void testUnknownFieldsDeserialization() {
         DocumentTypeManager docTypeManasjer = new DocumentTypeManager();
diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java
index 5cc4263d037..d85905d5b66 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java
@@ -25,7 +25,6 @@ public class DocumentTypeManagerTestCase {
 
     // Verify that we can register and retrieve fields.
     @Test
-    @SuppressWarnings("deprecation")
     public void testRegisterAndGet() {
         DocumentTypeManager manager = new DocumentTypeManager();
 
@@ -59,7 +58,6 @@ public class DocumentTypeManagerTestCase {
         assertSame(DataType.DOUBLE, doubleType);
     }
 
-    @SuppressWarnings("deprecation")
     @Test
     public void testRecursiveRegister() {
         StructDataType struct = new StructDataType("mystruct");
@@ -88,7 +86,6 @@ public class DocumentTypeManagerTestCase {
         assertEquals(docType2, manager.getDocumentType(new DataTypeName("myotherdoc")));
     }
 
-    @SuppressWarnings("deprecation")
     @Test
     public void testMultipleDocuments() {
         DocumentType docType1 = new DocumentType("foo0");
@@ -122,7 +119,6 @@ public class DocumentTypeManagerTestCase {
         assertEquals(manager.getDocumentTypes().get(new DataTypeName("foo1")), docType2);
     }
 
-    @SuppressWarnings("deprecation")
     @Test
     public void testReverseMapOrder() {
         DocumentTypeManager manager = createConfiguredManager("file:src/test/document/documentmanager.map.cfg");
@@ -131,7 +127,6 @@ public class DocumentTypeManagerTestCase {
         assertNotNull(manager.getDataTypeByCode(1001));
     }
 
-    @SuppressWarnings("deprecation")
     @Test
     public void testConfigure() {
         DocumentTypeManager manager = createConfiguredManager("file:src/test/document/documentmanager.cfg");
@@ -502,7 +497,6 @@ search annotationsimplicitstruct {
         assertReferenceTypePresentInManager(manager, 12345678, "referenced_type");
     }
 
-    @SuppressWarnings("deprecation")
     private static void assertReferenceTypePresentInManager(DocumentTypeManager manager, int refTypeId,
                                                             String refTargetTypeName) {
         DataType type = manager.getDataTypeByCode(refTypeId);
diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
index 9bbc894758b..9733cd41a88 100644
--- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
@@ -502,7 +502,6 @@ public class DocumentUpdateTestCase {
     }
 
     @Test
-    @SuppressWarnings("deprecation")
     public void testFieldUpdatesInDocUp() {
         DocumentType t1 = new DocumentType("doo");
         Field f1 = new Field("field1", DataType.STRING);
diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java b/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java
index 315bd1d5bd4..321df9e2660 100644
--- a/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java
+++ b/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java
@@ -37,7 +37,6 @@ import static org.junit.Assert.assertEquals;
  * test to fail, so you will need to update the
  * AnnotationDeserialization component to handle the format changes.
  */
-@SuppressWarnings("deprecation")
 public class SerializeAnnotationsTestCase {
 
     private static final String PATH = "src/tests/serialization/";
diff --git a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java
index 9814e765a89..57f9a14d60b 100644
--- a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java
+++ b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.assertEquals;
  * @author Simon Thoresen Hult
  * @author vekterli
  */
-@SuppressWarnings("deprecation")
 public class VespaDocumentSerializerTestCase {
 
     @Test