From 3ea887ac2bedf3b1c6e170cadf78d83a74bfc832 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 17 Oct 2022 12:41:36 +0200 Subject: Restore legacy signature --- .../document/json/DocumentUpdateJsonSerializerTest.java | 2 +- .../java/com/yahoo/document/json/JsonReaderTestCase.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'document/src/test/java/com/yahoo') 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 7bdb526bb1c..070ede480ac 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.readSingleDocument(DocumentOperationType.UPDATE, docId).operation(); + return (DocumentUpdate) reader.readOperation(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 97422217857..bee2adb10a0 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.readSingleDocument(DocumentOperationType.PUT, - "id:unittest:smoke::doc1").operation(); + DocumentPut put = (DocumentPut) r.readOperation(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.readSingleDocument(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation(); + DocumentUpdate doc = (DocumentUpdate) r.readOperation(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.readSingleDocument(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation(); + DocumentUpdate doc = (DocumentUpdate) r.readOperation(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.readSingleDocument(DocumentOperationType.PUT, - "id:unittest:testnull::doc1").operation(); + DocumentPut put = (DocumentPut) r.readOperation(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.readSingleDocument(DocumentOperationType.PUT, "id:unittest:testnull::doc1"); + r.readOperation(DocumentOperationType.PUT, "id:unittest:testnull::doc1"); fail(); } @@ -1639,7 +1639,7 @@ public class JsonReaderTestCase { " 'fields': {", " 'something': {", " 'modify': {} }}}")); - reader.readSingleDocument(DocumentOperationType.UPDATE, "id:unittest:smoke::doc1"); + reader.readOperation(DocumentOperationType.UPDATE, "id:unittest:smoke::doc1"); fail("Expected exception"); } catch (IllegalArgumentException e) { -- cgit v1.2.3