Refactor to allow for lazy decode.

2 files changed, 5 insertions, 5 deletions

diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
index e354cba141d..a2bb2e8514b 100644
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
@@ -10,6 +10,7 @@ import java.util.List;
 import javax.xml.stream.XMLStreamException;
 
 import com.yahoo.document.DocumentTypeManager;
+import com.yahoo.vespaxmlparser.FeedOperation;
 import com.yahoo.vespaxmlparser.FeedReader;
 import com.yahoo.vespaxmlparser.VespaXMLFeedReader;
 
@@ -80,14 +81,13 @@ public abstract class Feeder {
 
         while (!sender.isAborted()) {
             try {
-                VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
-                reader.read(op);
+                FeedOperation op = reader.read();
                 if (createIfNonExistent && op.getDocumentUpdate() != null) {
                     op.getDocumentUpdate().setCreateIfNonExistent(true);
                 }
 
                 // Done feeding.
-                if (op.getType() == VespaXMLFeedReader.OperationType.INVALID) {
+                if (op.getType() == FeedOperation.Type.INVALID) {
                     break;
                 } else {
                     sender.sendOperation(op);
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/VespaFeedSender.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/VespaFeedSender.java
index b441e81a829..a1666a83856 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/VespaFeedSender.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/VespaFeedSender.java
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.feedapi;
 
-import com.yahoo.vespaxmlparser.VespaXMLFeedReader;
+import com.yahoo.vespaxmlparser.FeedOperation;
 
 /**
  * Wrapper class for SimpleFeedAccess to send various XML operations.
@@ -18,7 +18,7 @@ public class VespaFeedSender {
         return sender.isAborted();
     }
 
-    public void sendOperation(VespaXMLFeedReader.Operation op) {
+    public void sendOperation(FeedOperation op) {
         switch (op.getType()) {
             case DOCUMENT:
                 sender.put(op.getDocument(), op.getCondition());