diff options
author | Arnstein Ressem <aressem@gmail.com> | 2022-10-20 09:29:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-20 09:29:16 +0200 |
commit | 1f4a800efebfaf8308d1f1ee41f767d6c41ffdec (patch) | |
tree | f10b8b1f364300cd84edfe39b46a0a7cd5070c94 /document | |
parent | ed84f0e74f65585832a260ac5c35aa7c717a8f87 (diff) |
Revert "Bratseth/restore signature"
Diffstat (limited to 'document')
3 files changed, 10 insertions, 15 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/JsonReader.java b/document/src/main/java/com/yahoo/document/json/JsonReader.java index 86023d52b63..f8de0fb959e 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonReader.java +++ b/document/src/main/java/com/yahoo/document/json/JsonReader.java @@ -60,7 +60,7 @@ public class JsonReader { * @param docIdString document ID * @return the parsed document operation */ - public ParsedDocumentOperation readOperation(DocumentOperationType operationType, String docIdString) { + public ParsedDocumentOperation readSingleDocument(DocumentOperationType operationType, String docIdString) { DocumentId docId = new DocumentId(docIdString); DocumentParseInfo documentParseInfo; try { @@ -78,11 +78,6 @@ public class JsonReader { return operation; } - @Deprecated // Use readOperation instead - public DocumentOperation readSingleDocument(DocumentOperationType operationType, String docIdString) { - return readOperation(operationType, docIdString).operation(); - } - /** Returns the next document operation, or null if we have reached the end */ public DocumentOperation next() { switch (state) { diff --git a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java index 070ede480ac..7bdb526bb1c 100644 --- a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java +++ b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java @@ -96,7 +96,7 @@ public class DocumentUpdateJsonSerializerTest { private static DocumentUpdate jsonToDocumentUpdate(String jsonDoc, String docId) { final InputStream rawDoc = new ByteArrayInputStream(Utf8.toBytes(jsonDoc)); JsonReader reader = new JsonReader(types, rawDoc, parserFactory); - return (DocumentUpdate) reader.readOperation(DocumentOperationType.UPDATE, docId).operation(); + return (DocumentUpdate) reader.readSingleDocument(DocumentOperationType.UPDATE, docId).operation(); } private static String documentUpdateToJson(DocumentUpdate update) { diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java index bee2adb10a0..97422217857 100644 --- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java +++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java @@ -218,8 +218,8 @@ public class JsonReaderTestCase { " 'nalle': 'bamse'", " }", "}")); - DocumentPut put = (DocumentPut) r.readOperation(DocumentOperationType.PUT, - "id:unittest:smoke::doc1").operation(); + DocumentPut put = (DocumentPut) r.readSingleDocument(DocumentOperationType.PUT, + "id:unittest:smoke::doc1").operation(); smokeTestDoc(put.getDocument()); } @@ -229,7 +229,7 @@ public class JsonReaderTestCase { " 'fields': {", " 'something': {", " 'assign': 'orOther' }}}")); - DocumentUpdate doc = (DocumentUpdate) r.readOperation(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation(); + DocumentUpdate doc = (DocumentUpdate) r.readSingleDocument(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation(); FieldUpdate f = doc.getFieldUpdate("something"); assertEquals(1, f.size()); assertTrue(f.getValueUpdate(0) instanceof AssignValueUpdate); @@ -241,7 +241,7 @@ public class JsonReaderTestCase { " 'fields': {", " 'int1': {", " 'assign': null }}}")); - DocumentUpdate doc = (DocumentUpdate) r.readOperation(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation(); + DocumentUpdate doc = (DocumentUpdate) r.readSingleDocument(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation(); FieldUpdate f = doc.getFieldUpdate("int1"); assertEquals(1, f.size()); assertTrue(f.getValueUpdate(0) instanceof ClearValueUpdate); @@ -1339,8 +1339,8 @@ public class JsonReaderTestCase { " 'tensorfield': null", " }", "}")); - DocumentPut put = (DocumentPut) r.readOperation(DocumentOperationType.PUT, - "id:unittest:testnull::doc1").operation(); + DocumentPut put = (DocumentPut) r.readSingleDocument(DocumentOperationType.PUT, + "id:unittest:testnull::doc1").operation(); Document doc = put.getDocument(); assertFieldValueNull(doc, "intfield"); assertFieldValueNull(doc, "stringfield"); @@ -1357,7 +1357,7 @@ public class JsonReaderTestCase { " 'arrayfield': [ null ]", " }", "}")); - r.readOperation(DocumentOperationType.PUT, "id:unittest:testnull::doc1"); + r.readSingleDocument(DocumentOperationType.PUT, "id:unittest:testnull::doc1"); fail(); } @@ -1639,7 +1639,7 @@ public class JsonReaderTestCase { " 'fields': {", " 'something': {", " 'modify': {} }}}")); - reader.readOperation(DocumentOperationType.UPDATE, "id:unittest:smoke::doc1"); + reader.readSingleDocument(DocumentOperationType.UPDATE, "id:unittest:smoke::doc1"); fail("Expected exception"); } catch (IllegalArgumentException e) { |