diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-18 10:34:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-18 10:34:25 +0200 |
commit | 688961517b28efd58f3b0a3505bfacb608664a8f (patch) | |
tree | 24b753af4d53b711f7de1dbcdfb29ad65a8f393d /docproc | |
parent | 25a8bf88ab9a9dbe15c786772ab053ec74dea686 (diff) |
Revert "Revert "Revert "Do not expose fieldupdates as a list. Hide implementation details ins…"""
Diffstat (limited to 'docproc')
3 files changed, 10 insertions, 22 deletions
diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java index 517f44cb983..a0516a62bd9 100644 --- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java +++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java @@ -10,7 +10,6 @@ import com.yahoo.document.Field; import com.yahoo.document.serialization.DocumentUpdateWriter; import com.yahoo.document.update.FieldUpdate; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -19,7 +18,6 @@ import java.util.Map; * * @author vegardh */ -// TODO Vespa 7 Remove all deprecated methods public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOperationWrapper { private DocumentUpdate docU; @@ -43,12 +41,10 @@ public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOpera @Override public FieldUpdate getFieldUpdate(Field field) { - return docU.getFieldUpdate(field); + return getFieldUpdate(field.getName()); } @Override - @Deprecated - @SuppressWarnings( "deprecation" ) public FieldUpdate getFieldUpdate(int index) { return docU.getFieldUpdate(index); } @@ -64,15 +60,10 @@ public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOpera } @Override - @Deprecated - @SuppressWarnings( "deprecation" ) public List<FieldUpdate> getFieldUpdates() { return docU.getFieldUpdates(); } - @Override - public Collection<FieldUpdate> fieldUpdates() { - return docU.fieldUpdates(); - } + @Override public DocumentId getId() { return docU.getId(); diff --git a/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java b/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java index a89dbfcc782..9a3a29e55b1 100644 --- a/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java @@ -37,10 +37,8 @@ public class ProcessingUpdateTestCase { @Test public void testProcessingUpdates() { DocumentType articleType = new DocumentType("article"); - Field bodyField = new Field("body", DataType.STRING, true); - Field titleField = new Field("title", DataType.STRING, true); - articleType.addField(bodyField); - articleType.addField(titleField); + articleType.addField(new Field("body", DataType.STRING, true)); + articleType.addField(new Field("title", DataType.STRING, true)); dtm = new DocumentTypeManager(); dtm.registerDocumentType(articleType); @@ -71,12 +69,12 @@ public class ProcessingUpdateTestCase { assertEquals(new StringFieldValue("body blah blah blah "), first.getFieldValue("title")); DocumentUpdate second = (DocumentUpdate) operations.get(1); - FieldUpdate firstUpd = second.getFieldUpdate(bodyField); + FieldUpdate firstUpd = second.getFieldUpdate(0); assertEquals(ValueUpdate.ValueUpdateClassID.ASSIGN, firstUpd.getValueUpdate(0).getValueUpdateClassID()); assertEquals(new StringFieldValue("this is the updated body of the article, blahdi blahdi blahdi"), firstUpd.getValueUpdate(0) .getValue()); - FieldUpdate secondUpd = second.getFieldUpdate(titleField); + FieldUpdate secondUpd = second.getFieldUpdate(1); assertEquals(ValueUpdate.ValueUpdateClassID.ASSIGN, secondUpd.getValueUpdate(0).getValueUpdateClassID()); assertEquals(new StringFieldValue("body blahdi blahdi blahdi "), secondUpd.getValueUpdate(0).getValue()); } diff --git a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java index e6de3190156..05a03480173 100644 --- a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java +++ b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java @@ -328,17 +328,16 @@ public class SchemaMappingAndAccessesTest { Document doc = getDoc(); DocumentType type = doc.getDataType(); DocumentUpdate dud = new DocumentUpdate(type, new DocumentId("doc:map:test:1")); - com.yahoo.document.Field title = type.getField("title"); - FieldUpdate assignSingle = FieldUpdate.createAssign(title, new StringFieldValue("something")); + FieldUpdate assignSingle = FieldUpdate.createAssign(type.getField("title"), new StringFieldValue("something")); Map<String, String> fieldMap = new HashMap<>(); fieldMap.put("t", "title"); fieldMap.put("a", "artist"); ProxyDocumentUpdate pup = new ProxyDocumentUpdate(dud, fieldMap); pup.addFieldUpdate(assignSingle); - assertEquals(pup.fieldUpdates().toString(), dud.fieldUpdates().toString()); + assertEquals(pup.getFieldUpdates(), dud.getFieldUpdates()); assertEquals(pup.getDocumentType(), dud.getDocumentType()); - assertEquals(pup.getFieldUpdate(title).size(), 1); - assertEquals(pup.getFieldUpdate(title), dud.fieldUpdates().iterator().next()); + assertEquals(pup.getFieldUpdate(new com.yahoo.document.Field("title")).size(), 1); + assertEquals(pup.getFieldUpdate(0), dud.getFieldUpdate(0)); assertEquals(pup.getFieldUpdate("title"), dud.getFieldUpdate("title")); assertEquals(pup.getId(), dud.getId()); assertEquals(pup.getType(), dud.getType()); |