diff options
5 files changed, 39 insertions, 38 deletions
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/ConditionalFeedOperation.java b/document/src/main/java/com/yahoo/vespaxmlparser/ConditionalFeedOperation.java deleted file mode 100644 index 2f63bad714c..00000000000 --- a/document/src/main/java/com/yahoo/vespaxmlparser/ConditionalFeedOperation.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespaxmlparser; - -import com.yahoo.document.TestAndSetCondition; - -public class ConditionalFeedOperation extends FeedOperation { - - private final TestAndSetCondition condition; - - protected ConditionalFeedOperation(Type type) { - super(type); - this.condition = TestAndSetCondition.NOT_PRESENT_CONDITION; - } - protected ConditionalFeedOperation(Type type, TestAndSetCondition condition) { - super(type); - this.condition = condition; - } - - @Override - public TestAndSetCondition getCondition() { - return condition; - } - -} diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/DocumentFeedOperation.java b/document/src/main/java/com/yahoo/vespaxmlparser/DocumentFeedOperation.java index 7a62bd92f37..f76cad08e50 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/DocumentFeedOperation.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/DocumentFeedOperation.java @@ -2,13 +2,14 @@ package com.yahoo.vespaxmlparser; import com.yahoo.document.DocumentPut; +import com.yahoo.document.TestAndSetCondition; -public class DocumentFeedOperation extends ConditionalFeedOperation { +public class DocumentFeedOperation extends FeedOperation { private final DocumentPut put; public DocumentFeedOperation(DocumentPut put) { - super(Type.DOCUMENT, put.getCondition()); + super(Type.DOCUMENT); this.put = put; } @@ -17,5 +18,10 @@ public class DocumentFeedOperation extends ConditionalFeedOperation { return put; } + @Override + public TestAndSetCondition getCondition() { + return put.getCondition(); + } + } diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/DocumentUpdateFeedOperation.java b/document/src/main/java/com/yahoo/vespaxmlparser/DocumentUpdateFeedOperation.java index c8b57dbce45..cddf0557bcc 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/DocumentUpdateFeedOperation.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/DocumentUpdateFeedOperation.java @@ -2,11 +2,12 @@ package com.yahoo.vespaxmlparser; import com.yahoo.document.DocumentUpdate; +import com.yahoo.document.TestAndSetCondition; -public class DocumentUpdateFeedOperation extends ConditionalFeedOperation { +public class DocumentUpdateFeedOperation extends FeedOperation { private final DocumentUpdate update; public DocumentUpdateFeedOperation(DocumentUpdate update) { - super(Type.UPDATE, update.getCondition()); + super(Type.UPDATE); this.update = update; } @@ -14,4 +15,8 @@ public class DocumentUpdateFeedOperation extends ConditionalFeedOperation { public DocumentUpdate getDocumentUpdate() { return update; } + @Override + public TestAndSetCondition getCondition() { + return update.getCondition(); + } } diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/RemoveFeedOperation.java b/document/src/main/java/com/yahoo/vespaxmlparser/RemoveFeedOperation.java index 6c9c87feef4..82455ea165a 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/RemoveFeedOperation.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/RemoveFeedOperation.java @@ -1,14 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespaxmlparser; -import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentRemove; import com.yahoo.document.TestAndSetCondition; -public class RemoveFeedOperation extends ConditionalFeedOperation { +public class RemoveFeedOperation extends FeedOperation { private final DocumentRemove remove; public RemoveFeedOperation(DocumentRemove remove) { - super(Type.REMOVE, remove.getCondition()); + super(Type.REMOVE); this.remove = remove; } @@ -16,4 +15,8 @@ public class RemoveFeedOperation extends ConditionalFeedOperation { public DocumentRemove getDocumentRemove() { return remove; } + @Override + public TestAndSetCondition getCondition() { + return remove.getCondition(); + } } diff --git a/vespaclient-java/src/main/java/com/yahoo/vespa/feed/perf/SimpleFeeder.java b/vespaclient-java/src/main/java/com/yahoo/vespa/feed/perf/SimpleFeeder.java index e29e32aee92..c4dfe6b26f1 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespa/feed/perf/SimpleFeeder.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespa/feed/perf/SimpleFeeder.java @@ -35,7 +35,6 @@ import com.yahoo.messagebus.SourceSessionParams; import com.yahoo.messagebus.StaticThrottlePolicy; import com.yahoo.messagebus.network.rpc.RPCNetworkParams; import com.yahoo.messagebus.routing.Route; -import com.yahoo.vespaxmlparser.ConditionalFeedOperation; import com.yahoo.vespaxmlparser.FeedReader; import com.yahoo.vespaxmlparser.FeedOperation; import com.yahoo.vespaxmlparser.RemoveFeedOperation; @@ -285,33 +284,45 @@ public class SimpleFeeder implements ReplyHandler { } } - static class LazyDocumentOperation extends ConditionalFeedOperation { + static class LazyDocumentOperation extends FeedOperation { private final DocumentDeserializer deserializer; + private final TestAndSetCondition condition; LazyDocumentOperation(DocumentDeserializer deserializer, TestAndSetCondition condition) { - super(Type.DOCUMENT, condition); + super(Type.DOCUMENT); this.deserializer = deserializer; + this.condition = condition; } @Override public DocumentPut getDocumentPut() { DocumentPut put = new DocumentPut(new Document(deserializer)); - put.setCondition(getCondition()); + put.setCondition(condition); return put; } + @Override + public TestAndSetCondition getCondition() { + return condition; + } } - static class LazyUpdateOperation extends ConditionalFeedOperation { + static class LazyUpdateOperation extends FeedOperation { private final DocumentDeserializer deserializer; + private final TestAndSetCondition condition; LazyUpdateOperation(DocumentDeserializer deserializer, TestAndSetCondition condition) { - super(Type.UPDATE, condition); + super(Type.UPDATE); this.deserializer = deserializer; + this.condition = condition; } @Override public DocumentUpdate getDocumentUpdate() { DocumentUpdate update = new DocumentUpdate(deserializer); - update.setCondition(getCondition()); + update.setCondition(condition); return update; } + @Override + public TestAndSetCondition getCondition() { + return condition; + } } @Override |