From 923399a03316b8cc7acf5ffdf99426edf667ac6c Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Tue, 25 Sep 2018 13:52:38 +0200 Subject: Remove BatchDocumentUpdateMessage and BatchDocumentUpdateReply from java portion of documentapi. --- .../jdisc/messagebus/MbusRequestContext.java | 1 - .../jdisc/messagebus/ProcessingFactory.java | 7 ------ ...ntProcessingHandlerAllMessageTypesTestCase.java | 29 ---------------------- ...cessingHandlerTransformingMessagesTestCase.java | 19 -------------- 4 files changed, 56 deletions(-) (limited to 'docproc') diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java index 0f3f3938701..187557791f3 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java @@ -168,7 +168,6 @@ public class MbusRequestContext implements RequestContext, ResponseHandler { case DocumentProtocol.MESSAGE_PUTDOCUMENT: case DocumentProtocol.MESSAGE_UPDATEDOCUMENT: case DocumentProtocol.MESSAGE_REMOVEDOCUMENT: - case DocumentProtocol.MESSAGE_BATCHDOCUMENTUPDATE: return true; } return false; diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java index 044f86e93e6..49a6020d633 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java @@ -15,7 +15,6 @@ import com.yahoo.document.DocumentOperation; import com.yahoo.document.DocumentPut; import com.yahoo.document.DocumentRemove; import com.yahoo.document.DocumentUpdate; -import com.yahoo.documentapi.messagebus.protocol.BatchDocumentUpdateMessage; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage; import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage; @@ -67,12 +66,6 @@ class ProcessingFactory { processings.add(createProcessing(removeOperation, message)); break; } - case DocumentProtocol.MESSAGE_BATCHDOCUMENTUPDATE: { - for (DocumentUpdate update : ((BatchDocumentUpdateMessage) message).getUpdates()) { - processings.add(createProcessing(update, message)); - } - break; - } } return processings; } diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java index 387436be546..e0ca630889d 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java @@ -10,7 +10,6 @@ import com.yahoo.document.datatypes.FieldValue; import com.yahoo.document.datatypes.IntegerFieldValue; import com.yahoo.document.datatypes.StringFieldValue; import com.yahoo.document.update.FieldUpdate; -import com.yahoo.documentapi.messagebus.protocol.BatchDocumentUpdateMessage; import com.yahoo.documentapi.messagebus.protocol.GetDocumentMessage; import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage; import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage; @@ -52,7 +51,6 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr put(); remove(); update(); - batchDocumentUpdate(); } private void get() throws InterruptedException { @@ -129,33 +127,6 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr assertFalse(reply.hasErrors()); } - private void batchDocumentUpdate() throws InterruptedException { - DocumentUpdate doc1 = new DocumentUpdate(getType(), new DocumentId("userdoc:test:12345:multi:1")); - DocumentUpdate doc2 = new DocumentUpdate(getType(), new DocumentId("userdoc:test:12345:multi:2")); - - Field testField = getType().getField("blahblah"); - doc1.addFieldUpdate(FieldUpdate.createAssign(testField, new StringFieldValue("1 not yet processed"))); - doc2.addFieldUpdate(FieldUpdate.createAssign(testField, new StringFieldValue("2 not yet processed"))); - - BatchDocumentUpdateMessage message = new BatchDocumentUpdateMessage(12345); - message.addUpdate(doc1); - message.addUpdate(doc2); - - assertTrue(sendMessage(FOOBAR, message)); - - Message remote1 = remoteServer.awaitMessage(60, TimeUnit.SECONDS); - assertTrue(remote1 instanceof UpdateDocumentMessage); - remoteServer.ackMessage(remote1); - assertNull(driver.client().awaitReply(100, TimeUnit.MILLISECONDS)); - - Message remote2 = remoteServer.awaitMessage(60, TimeUnit.SECONDS); - assertTrue(remote2 instanceof UpdateDocumentMessage); - remoteServer.ackMessage(remote2); - Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); - assertNotNull(reply); - assertFalse(reply.hasErrors()); - } - @Override public List> getCallStacks() { CallStack stack = new CallStack(); diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java index 30ff43264a0..efa05273c8d 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java @@ -69,7 +69,6 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum put(); remove(); update(); - batchDocumentUpdate(); } private void put() throws InterruptedException { @@ -170,24 +169,6 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum } } - private void batchDocumentUpdate() throws InterruptedException { - DocumentUpdate doc1 = new DocumentUpdate(getType(), new DocumentId("userdoc:test:12345:batch:nodocstatus:keep:this")); - DocumentUpdate doc2 = new DocumentUpdate(getType(), new DocumentId("userdoc:test:12345:batch:nodocstatus:skip:this")); - - Field testField = getType().getField("foostring"); - doc1.addFieldUpdate(FieldUpdate.createAssign(testField, new StringFieldValue("1 not yet processed"))); - doc2.addFieldUpdate(FieldUpdate.createAssign(testField, new StringFieldValue("2 not yet processed"))); - - BatchDocumentUpdateMessage message = new BatchDocumentUpdateMessage(12345); - message.addUpdate(doc1); - message.addUpdate(doc2); - - Routable result = sendMessageAndGetResult(message); - assertThat(result, instanceOf(UpdateDocumentMessage.class)); - DocumentUpdate outputUpd = ((UpdateDocumentMessage)result).getDocumentUpdate(); - assertThat(outputUpd.getId().toString(), is("userdoc:test:12345:batch:nodocstatus:keep:this")); - } - public class TransformingDocumentProcessor extends DocumentProcessor { @Override -- cgit v1.2.3