diff options
7 files changed, 21 insertions, 21 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 fe09f794de0..9730b3fb146 100644 --- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java +++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java @@ -41,9 +41,8 @@ public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOpera } @Override - @Deprecated public FieldUpdate getFieldUpdate(Field field) { - return getFieldUpdate(field.getName()); + return docU.getFieldUpdate(field); } @Override 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 9b61686ad6a..e6de3190156 100644 --- a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java +++ b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java @@ -328,7 +328,8 @@ public class SchemaMappingAndAccessesTest { Document doc = getDoc(); DocumentType type = doc.getDataType(); DocumentUpdate dud = new DocumentUpdate(type, new DocumentId("doc:map:test:1")); - FieldUpdate assignSingle = FieldUpdate.createAssign(type.getField("title"), new StringFieldValue("something")); + com.yahoo.document.Field title = type.getField("title"); + FieldUpdate assignSingle = FieldUpdate.createAssign(title, new StringFieldValue("something")); Map<String, String> fieldMap = new HashMap<>(); fieldMap.put("t", "title"); fieldMap.put("a", "artist"); @@ -336,8 +337,8 @@ public class SchemaMappingAndAccessesTest { pup.addFieldUpdate(assignSingle); assertEquals(pup.fieldUpdates().toString(), dud.fieldUpdates().toString()); assertEquals(pup.getDocumentType(), dud.getDocumentType()); - assertEquals(pup.getFieldUpdate(new com.yahoo.document.Field("title")).size(), 1); - assertEquals(pup.getFieldUpdate(0), dud.fieldUpdates().iterator().next()); + assertEquals(pup.getFieldUpdate(title).size(), 1); + assertEquals(pup.getFieldUpdate(title), dud.fieldUpdates().iterator().next()); assertEquals(pup.getFieldUpdate("title"), dud.getFieldUpdate("title")); assertEquals(pup.getId(), dud.getId()); assertEquals(pup.getType(), dud.getType()); diff --git a/docprocs/src/main/java/com/yahoo/docprocs/indexing/DocumentScript.java b/docprocs/src/main/java/com/yahoo/docprocs/indexing/DocumentScript.java index 62be2868708..4905f3d9dad 100644 --- a/docprocs/src/main/java/com/yahoo/docprocs/indexing/DocumentScript.java +++ b/docprocs/src/main/java/com/yahoo/docprocs/indexing/DocumentScript.java @@ -57,7 +57,7 @@ public class DocumentScript { removeAnyLinguisticsSpanTree(valueUpdate); } } - for (FieldPathUpdate fieldUpdate : update.getFieldPathUpdates()) { + for (FieldPathUpdate fieldUpdate : update.fieldPathUpdates()) { requireThatFieldIsDeclaredInDocument(fieldUpdate.getFieldPath().get(0).getFieldRef()); if (fieldUpdate instanceof AssignFieldPathUpdate) { removeAnyLinguisticsSpanTree(((AssignFieldPathUpdate)fieldUpdate).getFieldValue()); diff --git a/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java b/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java index c0a5cfd2153..cfaee10a07d 100644 --- a/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java +++ b/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java @@ -187,8 +187,8 @@ public class DocumentScriptTestCase { FieldPathUpdate executeWithUpdateAndExpectFieldPath(String fieldName, FieldPathUpdate updateIn) { DocumentUpdate update = executeWithUpdate(fieldName, updateIn); - assertEquals(1, update.getFieldPathUpdates().size()); - return update.getFieldPathUpdates().get(0); + assertEquals(1, update.fieldPathUpdates().size()); + return update.fieldPathUpdates().iterator().next(); } } @@ -229,10 +229,10 @@ public class DocumentScriptTestCase { StringFieldValue newTitleValue = new StringFieldValue("iron moose 4, moose with a vengeance"); DocumentUpdate update = f.executeWithUpdate("structfield", new AssignFieldPathUpdate(f.type, "structfield.title", newTitleValue)); - assertEquals(1, update.getFieldPathUpdates().size()); + assertEquals(1, update.fieldPathUpdates().size()); assertEquals(0, update.fieldUpdates().size()); - assertTrue(update.getFieldPathUpdates().get(0) instanceof AssignFieldPathUpdate); - AssignFieldPathUpdate assignUpdate = (AssignFieldPathUpdate)update.getFieldPathUpdates().get(0); + assertTrue(update.fieldPathUpdates().iterator().next() instanceof AssignFieldPathUpdate); + AssignFieldPathUpdate assignUpdate = (AssignFieldPathUpdate)update.fieldPathUpdates().iterator().next(); assertEquals("structfield.title", assignUpdate.getOriginalFieldPath()); assertEquals(newTitleValue, assignUpdate.getFieldValue()); } diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToPathUpdateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToPathUpdateTestCase.java index 459f3ce827c..3c5eb9ea1c5 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToPathUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToPathUpdateTestCase.java @@ -29,8 +29,8 @@ public class DocumentToPathUpdateTestCase { DocumentUpdate docUpd = new FieldPathUpdateAdapter(new SimpleDocumentAdapter(null, doc), upd).getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldPathUpdates().size()); - assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); + assertEquals(1, docUpd.fieldPathUpdates().size()); + assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); assertTrue(upd instanceof AssignFieldPathUpdate); assertEquals("my_int", upd.getOriginalFieldPath()); @@ -49,8 +49,8 @@ public class DocumentToPathUpdateTestCase { DocumentUpdate docUpd = new FieldPathUpdateAdapter(new SimpleDocumentAdapter(null, doc), upd).getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldPathUpdates().size()); - assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); + assertEquals(1, docUpd.fieldPathUpdates().size()); + assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); assertTrue(upd instanceof AssignFieldPathUpdate); assertEquals("my_str", upd.getOriginalFieldPath()); @@ -77,8 +77,8 @@ public class DocumentToPathUpdateTestCase { DocumentUpdate docUpd = new FieldPathUpdateAdapter(new SimpleDocumentAdapter(null, doc), upd).getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldPathUpdates().size()); - assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); + assertEquals(1, docUpd.fieldPathUpdates().size()); + assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); assertTrue(upd instanceof AssignFieldPathUpdate); assertEquals("a", upd.getOriginalFieldPath()); @@ -103,8 +103,8 @@ public class DocumentToPathUpdateTestCase { DocumentUpdate docUpd = new FieldPathUpdateAdapter(new SimpleDocumentAdapter(null, doc), upd).getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.getFieldPathUpdates().size()); - assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); + assertEquals(1, docUpd.fieldPathUpdates().size()); + assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); assertTrue(upd instanceof AssignFieldPathUpdate); assertEquals("a.b", upd.getOriginalFieldPath()); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java index 3efee6621e2..dc8ffcd8d10 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java @@ -32,7 +32,7 @@ public class DocumentUpdateTestCase { docUpdate = Expression.execute(Expression.fromString("input my_str | for_each { to_pos } | index my_pos"), docUpdate); assertNotNull(docUpdate); - assertEquals(0, docUpdate.getFieldPathUpdates().size()); + assertEquals(0, docUpdate.fieldPathUpdates().size()); assertEquals(1, docUpdate.fieldUpdates().size()); FieldUpdate fieldUpd = docUpdate.fieldUpdates().iterator().next(); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java index 29e5ad0f51f..63a2cc66a97 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java @@ -72,7 +72,7 @@ public class GuardTestCase { docUpdate.addFieldUpdate(FieldUpdate.createAssign(docType.getField("my_str"), new StringFieldValue("69"))); assertNotNull(docUpdate = Expression.execute(Expression.fromString("guard { input my_str | to_int | attribute my_lng }"), docUpdate)); - assertEquals(0, docUpdate.getFieldPathUpdates().size()); + assertEquals(0, docUpdate.fieldPathUpdates().size()); assertEquals(1, docUpdate.fieldUpdates().size()); FieldUpdate fieldUpd = docUpdate.fieldUpdates().iterator().next(); |