Refactor to allow for lazy decode.

3 files changed, 58 insertions, 76 deletions

diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/PositionParserTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/PositionParserTestCase.java
index a7fd782484e..e2aafcb4fdc 100644
--- a/document/src/test/java/com/yahoo/vespaxmlparser/PositionParserTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/PositionParserTestCase.java
@@ -26,7 +26,7 @@ public class PositionParserTestCase {
         mgr.registerDocumentType(docType);
 
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test_position.xml", mgr);
-        Iterator<VespaXMLFeedReader.Operation> it = parser.readAll().iterator();
+        Iterator<FeedOperation> it = parser.readAll().iterator();
         assertTrue(it.hasNext());
         assertDocument(PositionDataType.valueOf(1, 2), it.next());
         assertTrue(it.hasNext());
@@ -38,9 +38,9 @@ public class PositionParserTestCase {
         assertFalse(it.hasNext());
     }
 
-    private static void assertDocument(Struct expected, VespaXMLFeedReader.Operation operation) {
+    private static void assertDocument(Struct expected, FeedOperation operation) {
         assertNotNull(operation);
-        assertEquals(VespaXMLFeedReader.OperationType.DOCUMENT, operation.getType());
+        assertEquals(FeedOperation.Type.DOCUMENT, operation.getType());
         Document doc = operation.getDocument();
         assertNotNull(doc);
         assertEquals(expected, doc.getFieldValue("my_pos"));
diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/UriParserTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/UriParserTestCase.java
index dcdea0975ad..0ccae4dbde5 100644
--- a/document/src/test/java/com/yahoo/vespaxmlparser/UriParserTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/UriParserTestCase.java
@@ -28,7 +28,7 @@ public class UriParserTestCase {
         mgr.registerDocumentType(docType);
 
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test_uri.xml", mgr);
-        Iterator<VespaXMLFeedReader.Operation> it = parser.readAll().iterator();
+        Iterator<FeedOperation> it = parser.readAll().iterator();
 
         Document doc = nextDocument(it);
         assertNotNull(doc);
@@ -59,21 +59,21 @@ public class UriParserTestCase {
         assertFalse(it.hasNext());
     }
 
-    private static Document nextDocument(Iterator<VespaXMLFeedReader.Operation> it) {
+    private static Document nextDocument(Iterator<FeedOperation> it) {
         assertTrue(it.hasNext());
-        VespaXMLFeedReader.Operation op = it.next();
+        FeedOperation op = it.next();
         assertNotNull(op);
-        assertEquals(VespaXMLFeedReader.OperationType.DOCUMENT, op.getType());
+        assertEquals(FeedOperation.Type.DOCUMENT, op.getType());
         Document doc = op.getDocument();
         assertNotNull(doc);
         return doc;
     }
 
-    private static DocumentUpdate nextUpdate(Iterator<VespaXMLFeedReader.Operation> it) {
+    private static DocumentUpdate nextUpdate(Iterator<FeedOperation> it) {
         assertTrue(it.hasNext());
-        VespaXMLFeedReader.Operation op = it.next();
+        FeedOperation op = it.next();
         assertNotNull(op);
-        assertEquals(VespaXMLFeedReader.OperationType.UPDATE, op.getType());
+        assertEquals(FeedOperation.Type.UPDATE, op.getType());
         DocumentUpdate upd = op.getDocumentUpdate();
         assertNotNull(upd);
         return upd;
diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
index 29567177642..e33dbfe8898 100755
--- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
@@ -40,7 +40,7 @@ public class VespaXMLReaderTestCase {
     }
 
     @Test
-    public void testMapNoKey() throws Exception {
+    public void testMapNoKey() {
         try {
             VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/testmapnokey.xml", manager);
             parser.readAll();
@@ -51,7 +51,7 @@ public class VespaXMLReaderTestCase {
     }
 
     @Test
-    public void testMapNoValue() throws Exception {
+    public void testMapNoValue() {
         try {
             VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/testmapnovalue.xml", manager);
             parser.readAll();
@@ -64,10 +64,9 @@ public class VespaXMLReaderTestCase {
     @Test
     public void testNews1() throws Exception {
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/testalltypes.xml", manager);
-        VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-        parser.read(op);
+        FeedOperation op = parser.read();
 
-        assertTrue(VespaXMLFeedReader.OperationType.INVALID != op.getType());
+        assertTrue(FeedOperation.Type.INVALID != op.getType());
         Document doc = op.getDocument();
         assertEquals(new StringFieldValue("testUrl"), doc.getFieldValue("url"));
         assertEquals(new StringFieldValue("testTitle"), doc.getFieldValue("title"));
@@ -149,10 +148,9 @@ public class VespaXMLReaderTestCase {
     public void testNews3() throws Exception {
         // Updating all elements in a documentType
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test03.xml", manager);
-        VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-        parser.read(op);
+        FeedOperation op = parser.read();
 
-        assertEquals(VespaXMLFeedReader.OperationType.UPDATE, op.getType());
+        assertEquals(FeedOperation.Type.UPDATE, op.getType());
 
         DocumentUpdate docUpdate = op.getDocumentUpdate();
 
@@ -214,10 +212,9 @@ public class VespaXMLReaderTestCase {
         // Test on adding just a few fields to a DocumentUpdate (implies other fields to null)
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test04.xml", manager);
 
-        VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-        parser.read(op);
+        FeedOperation op = parser.read();
 
-        assertEquals(VespaXMLFeedReader.OperationType.UPDATE, op.getType());
+        assertEquals(FeedOperation.Type.UPDATE, op.getType());
 
         DocumentUpdate docUpdate = op.getDocumentUpdate();
         //url
@@ -269,10 +266,9 @@ public class VespaXMLReaderTestCase {
         // Adding a few new fields to a Document using different syntax
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test05.xml", manager);
 
-        VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-        parser.read(op);
+        FeedOperation op = parser.read();
 
-        assertEquals(VespaXMLFeedReader.OperationType.UPDATE, op.getType());
+        assertEquals(FeedOperation.Type.UPDATE, op.getType());
 
         DocumentUpdate docUpdate = op.getDocumentUpdate();
 
@@ -334,20 +330,19 @@ public class VespaXMLReaderTestCase {
 
         // long value with txt
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
         }
 
         // empty string
-        VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-        parser.read(op);
+        FeedOperation op = parser.read();
         assertEquals("doc:news:http://news6b", op.getDocument().getId().toString());
 
         // int array with text
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -355,7 +350,7 @@ public class VespaXMLReaderTestCase {
 
         // long array with whitespace
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -363,7 +358,7 @@ public class VespaXMLReaderTestCase {
 
         // byte array with value
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -371,7 +366,7 @@ public class VespaXMLReaderTestCase {
 
         // float array with string
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -379,7 +374,7 @@ public class VespaXMLReaderTestCase {
 
         // weighted set of int with string
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -387,7 +382,7 @@ public class VespaXMLReaderTestCase {
 
         // weighted set of int with string as weight
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -395,17 +390,17 @@ public class VespaXMLReaderTestCase {
 
         // weighted set of string with string as weight
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
         }
 
-        parser.read(op = new VespaXMLFeedReader.Operation());
+        op = parser.read();
         assertEquals("doc:news:http://news6j", op.getDocument().getId().toString());
 
-        parser.read(op = new VespaXMLFeedReader.Operation());
-        assertEquals(VespaXMLFeedReader.OperationType.INVALID, op.getType());
+        op = parser.read();
+        assertEquals(FeedOperation.Type.INVALID, op.getType());
     }
 
     @Test
@@ -414,10 +409,9 @@ public class VespaXMLReaderTestCase {
         // are also some updates that will fail (be skipped).
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test07.xml", manager);
 
-        VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-        parser.read(op);
+        FeedOperation op = parser.read();
 
-        assertEquals(VespaXMLFeedReader.OperationType.UPDATE, op.getType());
+        assertEquals(FeedOperation.Type.UPDATE, op.getType());
 
         DocumentUpdate docUpdate = op.getDocumentUpdate();
 
@@ -449,7 +443,7 @@ public class VespaXMLReaderTestCase {
 
         // Trying arithmetic on string (b)
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -457,7 +451,7 @@ public class VespaXMLReaderTestCase {
 
         // "By" as string (c)
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -465,7 +459,7 @@ public class VespaXMLReaderTestCase {
 
         // Empty key in weighted set of int (d)
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -473,7 +467,7 @@ public class VespaXMLReaderTestCase {
 
         // No "by" attribute (e)
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -481,7 +475,7 @@ public class VespaXMLReaderTestCase {
 
         // Float key as string (f)
         try {
-            parser.read(new VespaXMLFeedReader.Operation());
+            parser.read();
             fail();
         } catch (Exception e) {
             System.out.println(e.getMessage());
@@ -492,10 +486,9 @@ public class VespaXMLReaderTestCase {
     public void testNews8() throws Exception {
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test08.xml", manager);
 
-        VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-        parser.read(op);
+        FeedOperation op = parser.read();
 
-        assertEquals(VespaXMLFeedReader.OperationType.UPDATE, op.getType());
+        assertEquals(FeedOperation.Type.UPDATE, op.getType());
 
         DocumentUpdate docUpdate = op.getDocumentUpdate();
 
@@ -518,24 +511,21 @@ public class VespaXMLReaderTestCase {
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test09.xml", manager);
 
         {
-            VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-            parser.read(op);
+            FeedOperation op = parser.read();
 
-            assertEquals(VespaXMLFeedReader.OperationType.REMOVE, op.getType());
+            assertEquals(FeedOperation.Type.REMOVE, op.getType());
             assertEquals("doc:news:http://news9a", op.getRemove().toString());
         }
         {
-            VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-            parser.read(op);
+            FeedOperation op = parser.read();
 
-            assertEquals(VespaXMLFeedReader.OperationType.REMOVE, op.getType());
+            assertEquals(FeedOperation.Type.REMOVE, op.getType());
             assertEquals("doc:news:http://news9b", op.getRemove().toString());
         }
         {
             // Remove without documentid. Not supported.
-            VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
             try {
-                parser.read(op);
+                parser.read();
                 fail();
             } catch (Exception e) {
                 System.out.println(e.getMessage());
@@ -547,8 +537,7 @@ public class VespaXMLReaderTestCase {
     public void testNews10() throws Exception {
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test10.xml", manager);
         {
-            VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-            parser.read(op);
+            FeedOperation op = parser.read();
             Document doc = op.getDocument();
 
             assertEquals(new StringFieldValue("testUrl"), doc.getFieldValue("url"));
@@ -585,15 +574,13 @@ public class VespaXMLReaderTestCase {
             assertEquals(Integer.valueOf(14), strWset.get(new StringFieldValue("string14")));
         }
         {
-            VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-            parser.read(op);
+            FeedOperation op = parser.read();
             Document doc = op.getDocument();
             assertNotNull(doc);
             assertEquals(new StringFieldValue("testUrl2"), doc.getFieldValue("url"));
         }
         {
-            VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-            parser.read(op);
+            FeedOperation op = parser.read();
             DocumentUpdate upd = op.getDocumentUpdate();
 
             assertNull(upd.getFieldUpdate("url"));
@@ -629,8 +616,7 @@ public class VespaXMLReaderTestCase {
                                  .getWeight());
         }
         {
-            VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-            parser.read(op);
+            FeedOperation op = parser.read();
             DocumentUpdate upd = op.getDocumentUpdate();
 
             assertEquals(new StringFieldValue("assignUrl"),
@@ -661,15 +647,13 @@ public class VespaXMLReaderTestCase {
             assertNull(upd.getFieldUpdate("weightedsetstring"));
         }
         {
-            VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-            parser.read(op);
+            FeedOperation op = parser.read();
             assertEquals("doc:news:http://news10e", op.getRemove().toString());
         }
         {
             // Illegal remove without documentid attribute
             try {
-                VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-                parser.read(op);
+                parser.read();
                 fail();
             } catch (Exception e) {
                 System.out.println(e.getMessage());
@@ -682,10 +666,9 @@ public class VespaXMLReaderTestCase {
         // Adding a few new fields to a Document using different syntax
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/tests/vespaxml/fieldpathupdates.xml", manager);
 
-        VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-        parser.read(op);
+        FeedOperation op = parser.read();
 
-        assertEquals(VespaXMLFeedReader.OperationType.UPDATE, op.getType());
+        assertEquals(FeedOperation.Type.UPDATE, op.getType());
 
         DocumentUpdate docUpdate = op.getDocumentUpdate();
 
@@ -801,13 +784,13 @@ public class VespaXMLReaderTestCase {
                 .configure(m, "file:src/test/java/com/yahoo/document/documentmanager.docindoc.cfg");
 
         VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test_docindoc.xml", m);
-        List<VespaXMLFeedReader.Operation> ops = parser.readAll();
+        List<FeedOperation> ops = parser.readAll();
 
         assertEquals(1, ops.size());
-        VespaXMLFeedReader.Operation op = ops.get(0);
+        FeedOperation op = ops.get(0);
         System.err.println(op);
 
-        assertEquals(VespaXMLFeedReader.OperationType.DOCUMENT, op.getType());
+        assertEquals(FeedOperation.Type.DOCUMENT, op.getType());
         assertNull(op.getRemove());
         assertNull(op.getDocumentUpdate());
         assertNotNull(op.getDocument());
@@ -886,8 +869,7 @@ public class VespaXMLReaderTestCase {
         final int NUM_OPERATIONS_IN_FEED = 3;
 
         for (int i = 0; i < NUM_OPERATIONS_IN_FEED; i++) {
-            VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-            parser.read(op);
+            FeedOperation op = parser.read();
 
             assertTrue("Missing test and set condition", op.getCondition().isPresent());
             assertEquals("Condition is not the same as in xml feed", "news.value_long == 1", op.getCondition().getSelection());