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 /indexinglanguage | |
parent | 25a8bf88ab9a9dbe15c786772ab053ec74dea686 (diff) |
Revert "Revert "Revert "Do not expose fieldupdates as a list. Hide implementation details ins…"""
Diffstat (limited to 'indexinglanguage')
5 files changed, 37 insertions, 37 deletions
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java index 2ccd8abffda..252f6c5bd12 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java @@ -57,7 +57,7 @@ public class SimpleAdapterFactory implements AdapterFactory { ret.add(new IdentityFieldPathUpdateAdapter(fieldUpd, newDocumentAdapter(complete, true))); } } - for (FieldUpdate fieldUpd : upd.fieldUpdates()) { + for (FieldUpdate fieldUpd : upd.getFieldUpdates()) { Field field = fieldUpd.getField(); for (ValueUpdate valueUpd : fieldUpd.getValueUpdates()) { if (FieldUpdateHelper.isComplete(field, valueUpd)) { 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 3c5eb9ea1c5..459f3ce827c 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.fieldPathUpdates().size()); - assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); + assertEquals(1, docUpd.getFieldPathUpdates().size()); + assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); 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.fieldPathUpdates().size()); - assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); + assertEquals(1, docUpd.getFieldPathUpdates().size()); + assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); 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.fieldPathUpdates().size()); - assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); + assertEquals(1, docUpd.getFieldPathUpdates().size()); + assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); 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.fieldPathUpdates().size()); - assertNotNull(upd = docUpd.fieldPathUpdates().iterator().next()); + assertEquals(1, docUpd.getFieldPathUpdates().size()); + assertNotNull(upd = docUpd.getFieldPathUpdates().get(0)); assertTrue(upd instanceof AssignFieldPathUpdate); assertEquals("a.b", upd.getOriginalFieldPath()); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java index 83947b5f64d..de090163b7b 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java @@ -40,8 +40,8 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); - assertEquals("my_int", docUpd.fieldUpdates().iterator().next().getField().getName()); + assertEquals(1, docUpd.getFieldUpdates().size()); + assertEquals("my_int", docUpd.getFieldUpdate(0).getField().getName()); } @Test @@ -56,9 +56,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_int"), fieldUpd.getField()); @@ -80,9 +80,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_int"), fieldUpd.getField()); @@ -103,9 +103,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_str"), fieldUpd.getField()); @@ -136,9 +136,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("a"), fieldUpd.getField()); @@ -166,9 +166,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_arr"), fieldUpd.getField()); @@ -196,9 +196,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_arr"), fieldUpd.getField()); @@ -231,9 +231,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("a"), fieldUpd.getField()); @@ -261,9 +261,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_wset"), fieldUpd.getField()); @@ -294,9 +294,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_wset"), fieldUpd.getField()); @@ -326,9 +326,9 @@ public class DocumentToValueUpdateTestCase { UpdateAdapter adapter = FieldUpdateAdapter.fromPartialUpdate(new SimpleDocumentAdapter(null, doc), valueUpd); DocumentUpdate docUpd = adapter.getOutput(); assertNotNull(docUpd); - assertEquals(1, docUpd.fieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpd.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_wset"), fieldUpd.getField()); 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 dc8ffcd8d10..bdb8dbedf78 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java @@ -32,10 +32,10 @@ public class DocumentUpdateTestCase { docUpdate = Expression.execute(Expression.fromString("input my_str | for_each { to_pos } | index my_pos"), docUpdate); assertNotNull(docUpdate); - assertEquals(0, docUpdate.fieldPathUpdates().size()); - assertEquals(1, docUpdate.fieldUpdates().size()); + assertEquals(0, docUpdate.getFieldPathUpdates().size()); + assertEquals(1, docUpdate.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpdate.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpdate.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_pos"), fieldUpd.getField()); assertEquals(1, fieldUpd.getValueUpdates().size()); 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 63a2cc66a97..033034fed1f 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,10 +72,10 @@ 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.fieldPathUpdates().size()); - assertEquals(1, docUpdate.fieldUpdates().size()); + assertEquals(0, docUpdate.getFieldPathUpdates().size()); + assertEquals(1, docUpdate.getFieldUpdates().size()); - FieldUpdate fieldUpd = docUpdate.fieldUpdates().iterator().next(); + FieldUpdate fieldUpd = docUpdate.getFieldUpdate(0); assertNotNull(fieldUpd); assertEquals(docType.getField("my_lng"), fieldUpd.getField()); assertEquals(1, fieldUpd.getValueUpdates().size()); |