diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-11-01 14:00:59 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-11-01 14:00:59 +0100 |
commit | f9345f20d23291f71caff3ca43708990c1b3604b (patch) | |
tree | 5c3b56c39e36882d5a856402862febe548e93691 /document | |
parent | fb6f2c5f01f615b16860b76ba7a39b5fa7d5518f (diff) |
getContentType -> contentStruct and java doc.
Diffstat (limited to 'document')
4 files changed, 15 insertions, 11 deletions
diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java index 55183f8fa70..51a1602516e 100644 --- a/document/src/main/java/com/yahoo/document/Document.java +++ b/document/src/main/java/com/yahoo/document/Document.java @@ -120,7 +120,7 @@ public class Document extends StructuredFieldValue { @SuppressWarnings("deprecation") private void setNewType(DocumentType type) { - header = type.getContentType().createFieldValue(); + header = type.contentStruct().createFieldValue(); body = type.getBodyType().createFieldValue(); } diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java index f2a501100f2..6244885798e 100755 --- a/document/src/main/java/com/yahoo/document/DocumentType.java +++ b/document/src/main/java/com/yahoo/document/DocumentType.java @@ -100,14 +100,18 @@ public class DocumentType extends StructuredDataType { return false; } - public StructDataType getContentType() { + /** + * Provides the Struct describing the fields in the document. + * @return Struct describing the document fields. + */ + public StructDataType contentStruct() { return headerType; } - // Use getContentType instead + // Use contentStruct instead @Deprecated public StructDataType getHeaderType() { - return getContentType(); + return contentStruct(); } @Deprecated diff --git a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java index 6e842c68641..e45da62353d 100644 --- a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java @@ -112,18 +112,18 @@ public class DocumentSerializationTestCase extends AbstractTypesTest { CompressionConfig noncomp = new CompressionConfig(); CompressionConfig lz4comp = new CompressionConfig(CompressionType.LZ4); { - doc.getDataType().getContentType().setCompressionConfig(noncomp); + doc.getDataType().contentStruct().setCompressionConfig(noncomp); doc.getDataType().getBodyType().setCompressionConfig(noncomp); FileOutputStream fout = new FileOutputStream(path + "document-java-currentversion-uncompressed.dat", false); doc.serialize(fout); fout.close(); } { - doc.getDataType().getContentType().setCompressionConfig(lz4comp); + doc.getDataType().contentStruct().setCompressionConfig(lz4comp); doc.getDataType().getBodyType().setCompressionConfig(lz4comp); FileOutputStream fout = new FileOutputStream(path + "document-java-currentversion-lz4-9.dat", false); doc.serialize(fout); - doc.getDataType().getContentType().setCompressionConfig(noncomp); + doc.getDataType().contentStruct().setCompressionConfig(noncomp); doc.getDataType().getBodyType().setCompressionConfig(noncomp); fout.close(); } diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java index 855aea1c9b3..6a2147d6f15 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java @@ -806,12 +806,12 @@ public class DocumentTestCase extends DocumentTestCaseBase { CompressionConfig noncomp = new CompressionConfig(); CompressionConfig lz4comp = new CompressionConfig(CompressionType.LZ4); - doc.getDataType().getContentType().setCompressionConfig(lz4comp); + doc.getDataType().contentStruct().setCompressionConfig(lz4comp); doc.getDataType().getBodyType().setCompressionConfig(lz4comp); buf = new GrowableByteBuffer(size, 2.0f); doc.serialize(buf); - doc.getDataType().getContentType().setCompressionConfig(noncomp); + doc.getDataType().contentStruct().setCompressionConfig(noncomp); doc.getDataType().getBodyType().setCompressionConfig(noncomp); fos = new FileOutputStream("src/tests/data/serializejava-compressed.dat"); fos.write(buf.array(), 0, buf.position()); @@ -910,13 +910,13 @@ public class DocumentTestCase extends DocumentTestCaseBase { CompressionConfig noncomp = new CompressionConfig(); CompressionConfig lz4comp = new CompressionConfig(CompressionType.LZ4); - doc.getDataType().getContentType().setCompressionConfig(lz4comp); + doc.getDataType().contentStruct().setCompressionConfig(lz4comp); doc.getDataType().getBodyType().setCompressionConfig(lz4comp); GrowableByteBuffer data = new GrowableByteBuffer(); doc.serialize(data); int size = doc.getSerializedSize(); - doc.getDataType().getContentType().setCompressionConfig(noncomp); + doc.getDataType().contentStruct().setCompressionConfig(noncomp); doc.getDataType().getBodyType().setCompressionConfig(noncomp); assertEquals(size, data.position()); |