Add deprecation comments and some renaming.

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 ee5896b2e0d..2ccd8abffda 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.getFieldUpdatesCollection()) {
+        for (FieldUpdate fieldUpd : upd.fieldUpdates()) {
             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 af094744832..83947b5f64d 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.getFieldUpdatesCollection().size());
-        assertEquals("my_int", docUpd.getFieldUpdatesCollection().iterator().next().getField().getName());
+        assertEquals(1, docUpd.fieldUpdates().size());
+        assertEquals("my_int", docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpd.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpd.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpd.fieldUpdates().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 cf19f5fe5b5..3efee6621e2 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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpdate.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpdate.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpdate.fieldUpdates().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 0b9c8b22845..29e5ad0f51f 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.getFieldUpdatesCollection().size());
+        assertEquals(1, docUpdate.fieldUpdates().size());
 
-        FieldUpdate fieldUpd = docUpdate.getFieldUpdatesCollection().iterator().next();
+        FieldUpdate fieldUpd = docUpdate.fieldUpdates().iterator().next();
         assertNotNull(fieldUpd);
         assertEquals(docType.getField("my_lng"), fieldUpd.getField());
         assertEquals(1, fieldUpd.getValueUpdates().size());