diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-11 15:41:34 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-11 15:41:34 +0200 |
commit | 06da5945a006c2e5462e72bf6bb41335cc55397a (patch) | |
tree | 07aba4de3b2a409823b2d6a73d5948ed9201eb51 /indexinglanguage/src | |
parent | da218c2b4b43987d887e94cbd9326e676ad7085c (diff) |
Avoid using deprecated API
Diffstat (limited to 'indexinglanguage/src')
4 files changed, 27 insertions, 27 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 252f6c5bd12..ee5896b2e0d 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.getFieldUpdates()) { + for (FieldUpdate fieldUpd : upd.getFieldUpdatesCollection()) { 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/DocumentToValueUpdateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java index de090163b7b..af094744832 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.getFieldUpdates().size()); - assertEquals("my_int", docUpd.getFieldUpdate(0).getField().getName()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); + assertEquals("my_int", docUpd.getFieldUpdatesCollection().iterator().next().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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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.getFieldUpdates().size()); + assertEquals(1, docUpd.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpd.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next(); 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 bdb8dbedf78..cf19f5fe5b5 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java @@ -33,9 +33,9 @@ public class DocumentUpdateTestCase { assertNotNull(docUpdate); assertEquals(0, docUpdate.getFieldPathUpdates().size()); - assertEquals(1, docUpdate.getFieldUpdates().size()); + assertEquals(1, docUpdate.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpdate.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpdate.getFieldUpdatesCollection().iterator().next(); 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 033034fed1f..0b9c8b22845 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 @@ -73,9 +73,9 @@ public class GuardTestCase { assertNotNull(docUpdate = Expression.execute(Expression.fromString("guard { input my_str | to_int | attribute my_lng }"), docUpdate)); assertEquals(0, docUpdate.getFieldPathUpdates().size()); - assertEquals(1, docUpdate.getFieldUpdates().size()); + assertEquals(1, docUpdate.getFieldUpdatesCollection().size()); - FieldUpdate fieldUpd = docUpdate.getFieldUpdate(0); + FieldUpdate fieldUpd = docUpdate.getFieldUpdatesCollection().iterator().next(); assertNotNull(fieldUpd); assertEquals(docType.getField("my_lng"), fieldUpd.getField()); assertEquals(1, fieldUpd.getValueUpdates().size()); |