diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-06-18 05:24:16 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-06-18 05:24:16 +0000 |
commit | 78d1292783fd65b431462e9ab969a570c5f200fb (patch) | |
tree | d1447ee23fea813b773d7f7c46552d7342d1fac3 /document | |
parent | fcf38c0586e6166ed819a078355502bda4656d01 (diff) |
Follow up from PR comments and GC some more code.
Diffstat (limited to 'document')
5 files changed, 4 insertions, 43 deletions
diff --git a/document/abi-spec.json b/document/abi-spec.json index 4e74143725f..7a0637db1aa 100644 --- a/document/abi-spec.json +++ b/document/abi-spec.json @@ -437,7 +437,6 @@ "public boolean isValueCompatible(com.yahoo.document.datatypes.FieldValue)", "public com.yahoo.document.StructDataType contentStruct()", "public com.yahoo.document.StructDataType getHeaderType()", - "public com.yahoo.document.StructDataType getBodyType()", "protected void register(com.yahoo.document.DocumentTypeManager, java.util.List)", "public boolean isA(java.lang.String)", "public void addField(com.yahoo.document.Field)", diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java index 116765b5530..568fe9265d5 100644 --- a/document/src/main/java/com/yahoo/document/Document.java +++ b/document/src/main/java/com/yahoo/document/Document.java @@ -205,22 +205,7 @@ public class Document extends StructuredFieldValue { @Override public Iterator<Map.Entry<Field, FieldValue>> iterator() { - return new Iterator<>() { - - private Iterator<Map.Entry<Field, FieldValue>> headerIt = header.iterator(); - - public boolean hasNext() { - return headerIt.hasNext(); - } - - public Map.Entry<Field, FieldValue> next() { - return headerIt.next(); - } - - public void remove() { - headerIt.remove(); - } - }; + return header.iterator(); } public String toString() { diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java index 09b9fcf7563..f73fd634e0e 100755 --- a/document/src/main/java/com/yahoo/document/DocumentType.java +++ b/document/src/main/java/com/yahoo/document/DocumentType.java @@ -144,12 +144,6 @@ public class DocumentType extends StructuredDataType { return contentStruct(); } - @Deprecated // TODO: Remove on Vespa 8 - /** @deprecated use contentStruct instead */ - public StructDataType getBodyType() { - return null; - } - @Override protected void register(DocumentTypeManager manager, List<DataType> seenTypes) { seenTypes.add(this); @@ -473,24 +467,7 @@ public class DocumentType extends StructuredDataType { * @return An iterator for iterating the fields in this documenttype. */ public Iterator<Field> fieldIteratorThisTypeOnly() { - return new Iterator<>() { - Iterator<Field> headerIt = headerType.getFields().iterator(); - - public boolean hasNext() { - return headerIt.hasNext(); - } - - public Field next() { - return headerIt.next(); - } - - - public void remove() { - if (headerIt != null) { - headerIt.remove(); - } - } - }; + return headerType.getFields().iterator(); } public boolean equals(Object o) { 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 598369bae39..079e16915e1 100644 --- a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java @@ -68,7 +68,7 @@ public class VespaDocumentSerializerTestCase { CompressionFixture() { docType = new DocumentType("map_of_structs"); - docType.getHeaderType().setCompressionConfig(new CompressionConfig(CompressionType.LZ4)); + docType.contentStruct().setCompressionConfig(new CompressionConfig(CompressionType.LZ4)); nestedType = new StructDataType("nested_type"); nestedType.addField(new Field("str", DataType.STRING)); diff --git a/document/src/tests/data/crossplatform-java-cpp-document.cfg b/document/src/tests/data/crossplatform-java-cpp-document.cfg index 672a22b3cf5..3ebe56b8671 100644 --- a/document/src/tests/data/crossplatform-java-cpp-document.cfg +++ b/document/src/tests/data/crossplatform-java-cpp-document.cfg @@ -62,7 +62,7 @@ datatype[7].weightedsettype[0] datatype[7].structtype[1] datatype[7].structtype[0].name serializetest.header datatype[7].structtype[0].version 0 -datatype[7].structtype[0].field[11] +datatype[7].structtype[0].field[15] datatype[7].structtype[0].field[0].name floatfield datatype[7].structtype[0].field[0].id[0] datatype[7].structtype[0].field[0].datatype 1 |