Avoid using deprecated API

10 files changed, 54 insertions, 43 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 a0516a62bd9..39186555883 100644
--- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java
+++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java
@@ -10,6 +10,7 @@ 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;
 
@@ -45,6 +46,7 @@ public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOpera
     }
 
     @Override
+    @SuppressWarnings( "deprecation" )
     public FieldUpdate getFieldUpdate(int index) {
         return docU.getFieldUpdate(index);
     }
@@ -60,10 +62,14 @@ public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOpera
     }
 
     @Override
+    @SuppressWarnings( "deprecation" )
     public List<FieldUpdate> getFieldUpdates() {
         return docU.getFieldUpdates();
     }
-
+    @Override
+    public Collection<FieldUpdate> getFieldUpdatesCollection() {
+        return docU.getFieldUpdatesCollection();
+    }
     @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 9a3a29e55b1..a89dbfcc782 100644
--- a/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java
@@ -37,8 +37,10 @@ public class ProcessingUpdateTestCase {
     @Test
     public void testProcessingUpdates() {
         DocumentType articleType = new DocumentType("article");
-        articleType.addField(new Field("body", DataType.STRING, true));
-        articleType.addField(new Field("title", DataType.STRING, true));
+        Field bodyField = new Field("body", DataType.STRING, true);
+        Field titleField = new Field("title", DataType.STRING, true);
+        articleType.addField(bodyField);
+        articleType.addField(titleField);
         dtm = new DocumentTypeManager();
         dtm.registerDocumentType(articleType);
 
@@ -69,12 +71,12 @@ public class ProcessingUpdateTestCase {
         assertEquals(new StringFieldValue("body blah blah blah "), first.getFieldValue("title"));
 
         DocumentUpdate second = (DocumentUpdate) operations.get(1);
-        FieldUpdate firstUpd = second.getFieldUpdate(0);
+        FieldUpdate firstUpd = second.getFieldUpdate(bodyField);
         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(1);
+        FieldUpdate secondUpd = second.getFieldUpdate(titleField);
         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 05a03480173..c8ac2e31585 100644
--- a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
+++ b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
@@ -334,10 +334,10 @@ public class SchemaMappingAndAccessesTest {
         fieldMap.put("a", "artist");
         ProxyDocumentUpdate pup = new ProxyDocumentUpdate(dud, fieldMap);
         pup.addFieldUpdate(assignSingle);
-        assertEquals(pup.getFieldUpdates(), dud.getFieldUpdates());
+        assertEquals(pup.getFieldUpdatesCollection().toString(), dud.getFieldUpdatesCollection().toString());
         assertEquals(pup.getDocumentType(), dud.getDocumentType());
         assertEquals(pup.getFieldUpdate(new com.yahoo.document.Field("title")).size(), 1);
-        assertEquals(pup.getFieldUpdate(0), dud.getFieldUpdate(0));
+        assertEquals(pup.getFieldUpdate(0), dud.getFieldUpdatesCollection().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 f25603deee9..088d6d0ecaf 100644
--- a/docprocs/src/main/java/com/yahoo/docprocs/indexing/DocumentScript.java
+++ b/docprocs/src/main/java/com/yahoo/docprocs/indexing/DocumentScript.java
@@ -9,7 +9,6 @@ import com.yahoo.document.datatypes.Array;
 import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.document.datatypes.MapFieldValue;
 import com.yahoo.document.datatypes.StringFieldValue;
-import com.yahoo.document.datatypes.Struct;
 import com.yahoo.document.datatypes.StructuredFieldValue;
 import com.yahoo.document.datatypes.WeightedSet;
 import com.yahoo.document.fieldpathupdate.AssignFieldPathUpdate;
@@ -20,7 +19,11 @@ import com.yahoo.document.update.ValueUpdate;
 import com.yahoo.vespa.indexinglanguage.AdapterFactory;
 import com.yahoo.vespa.indexinglanguage.expressions.Expression;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Simon Thoresen Hult
@@ -48,7 +51,7 @@ public class DocumentScript {
     }
 
     public DocumentUpdate execute(AdapterFactory adapterFactory, DocumentUpdate update) {
-        for (FieldUpdate fieldUpdate : update.getFieldUpdates()) {
+        for (FieldUpdate fieldUpdate : update.getFieldUpdatesCollection()) {
             requireThatFieldIsDeclaredInDocument(fieldUpdate.getField());
             for (ValueUpdate<?> valueUpdate : fieldUpdate.getValueUpdates()) {
                 removeAnyLinguisticsSpanTree(valueUpdate);
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 a47762bfbf3..41fd72e2336 100644
--- a/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java
+++ b/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java
@@ -230,7 +230,7 @@ public class DocumentScriptTestCase {
         DocumentUpdate update = f.executeWithUpdate("structfield", new AssignFieldPathUpdate(f.type, "structfield.title", newTitleValue));
 
         assertEquals(1, update.getFieldPathUpdates().size());
-        assertEquals(0, update.getFieldUpdates().size());
+        assertEquals(0, update.getFieldUpdatesCollection().size());
         assertTrue(update.getFieldPathUpdates().get(0) instanceof AssignFieldPathUpdate);
         AssignFieldPathUpdate assignUpdate = (AssignFieldPathUpdate)update.getFieldPathUpdates().get(0);
         assertEquals("structfield.title", assignUpdate.getOriginalFieldPath());
diff --git a/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java b/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java
index cef020cd828..a0dd0ac9b89 100644
--- a/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java
+++ b/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java
@@ -63,15 +63,15 @@ public class IndexingProcessorTestCase {
         assertTrue(output instanceof DocumentUpdate);
         DocumentUpdate docUpdate = (DocumentUpdate) output;
 
-        assertEquals(3, docUpdate.getFieldUpdates().size());
+        assertEquals(3, docUpdate.getFieldUpdatesCollection().size());
         {
-            FieldUpdate fieldUpdate = docUpdate.getFieldUpdate(0);
+            FieldUpdate fieldUpdate = docUpdate.getFieldUpdate("song");
             assertEquals("song", fieldUpdate.getField().getName());
             assertEquals(1, fieldUpdate.getValueUpdates().size());
             ValueUpdate<?> valueUpdate = fieldUpdate.getValueUpdate(0);
             assertTrue(valueUpdate instanceof AssignValueUpdate);
             assertEquals(new StringFieldValue("isbnmarker"), valueUpdate.getValue());
-            fieldUpdate = docUpdate.getFieldUpdate(1);
+            fieldUpdate = docUpdate.getFieldUpdate("title");
             assertEquals("title", fieldUpdate.getField().getName());
             assertEquals(1, fieldUpdate.getValueUpdates().size());
             valueUpdate = fieldUpdate.getValueUpdate(0);
@@ -80,14 +80,14 @@ public class IndexingProcessorTestCase {
         }
 
         {
-            FieldUpdate fieldUpdate = docUpdate.getFieldUpdate(1);
+            FieldUpdate fieldUpdate = docUpdate.getFieldUpdate("title");
             ValueUpdate<?> valueUpdate = fieldUpdate.getValueUpdate(0);
             assertEquals("title", fieldUpdate.getField().getName());
             assertTrue(valueUpdate instanceof AssignValueUpdate);
             assertEquals(new StringFieldValue("69"), valueUpdate.getValue());
         }
         {
-            FieldUpdate fieldUpdate = docUpdate.getFieldUpdate(2);
+            FieldUpdate fieldUpdate = docUpdate.getFieldUpdate("isbn");
             ValueUpdate<?> valueUpdate = fieldUpdate.getValueUpdate(0);
             assertEquals("isbn", fieldUpdate.getField().getName());
             assertTrue(valueUpdate instanceof AssignValueUpdate);
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());