diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-16 16:21:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-16 16:21:52 +0200 |
commit | 5fb8e66dbd2d6e02a64a054e147ac7214943d563 (patch) | |
tree | e4361448985e10f3e4a92afa48f61d561b85ae9c | |
parent | ba318cb1604b4a1377d57bb1e0c233948e61d743 (diff) | |
parent | f5a1eb11c45abb80c05736c8db675e94f3b5ea06 (diff) |
Merge pull request #10309 from vespa-engine/balder/remove-some-more-doc-ids
doc: -> id:
18 files changed, 128 insertions, 123 deletions
diff --git a/docproc/src/test/java/com/yahoo/docproc/AccessesAnnotationTestCase.java b/docproc/src/test/java/com/yahoo/docproc/AccessesAnnotationTestCase.java index c82aed31288..8853d8b33c0 100644 --- a/docproc/src/test/java/com/yahoo/docproc/AccessesAnnotationTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/AccessesAnnotationTestCase.java @@ -24,7 +24,7 @@ public class AccessesAnnotationTestCase { type.addField("title", DataType.STRING); type.addField("artist", DataType.STRING); type.addField("year", DataType.INT); - Document doc = new Document(type, new DocumentId("doc:map:test:1")); + Document doc = new Document(type, new DocumentId("id:map:album::1")); MyDocProc docProc = new MyDocProc(); DocumentPut put = new DocumentPut(doc); diff --git a/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java b/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java index 929ccf908ed..7e8d9a25026 100644 --- a/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java @@ -34,10 +34,10 @@ public class CallbackTestCase { // Create documents DocumentType type = new DocumentType("test"); type.addField("status", DataType.STRING); - put1 = new DocumentPut(type, new DocumentId("doc:callback:test:1")); - put2 = new DocumentPut(type, new DocumentId("doc:callback:test:2")); - operations.add(new DocumentPut(type, new DocumentId("doc:callback:test:3"))); - operations.add(new DocumentPut(type, new DocumentId("doc:callback:test:4"))); + put1 = new DocumentPut(type, new DocumentId("id:callback:test::1")); + put2 = new DocumentPut(type, new DocumentId("id:callback:test::2")); + operations.add(new DocumentPut(type, new DocumentId("id:callback:test::3"))); + operations.add(new DocumentPut(type, new DocumentId("id:callback:test::4"))); } @Test diff --git a/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java b/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java index 687dae9f6e9..2820ee2d10e 100644 --- a/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java @@ -24,9 +24,9 @@ public abstract class DocumentProcessingAbstractTestCase { // Create documents DocumentType type = new DocumentType("test"); type.addField("test", DataType.STRING); - DocumentPut put1 = new DocumentPut(type, new DocumentId("doc:test:test:1")); - DocumentPut put2 = new DocumentPut(type, new DocumentId("doc:test:test:2")); - DocumentPut put3 = new DocumentPut(type, new DocumentId("doc:test:test:3")); + DocumentPut put1 = new DocumentPut(type, new DocumentId("id:test:test::1")); + DocumentPut put2 = new DocumentPut(type, new DocumentId("id:test:test::2")); + DocumentPut put3 = new DocumentPut(type, new DocumentId("id:test:test::3")); // Process them service.process(put1); diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java index 9ab59ae7c34..a149a01b9ff 100644 --- a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java @@ -38,9 +38,9 @@ public class FailingDocumentProcessingTestCase { // Create documents DocumentType type = new DocumentType("test"); type.addField("test", DataType.STRING); - DocumentPut put1 = new DocumentPut(type, new DocumentId("doc:failing:test:1")); - DocumentPut put2 = new DocumentPut(type, new DocumentId("doc:failing:test:2")); - DocumentPut put3 = new DocumentPut(type, new DocumentId("doc:failing:test:3")); + DocumentPut put1 = new DocumentPut(type, new DocumentId("id:failing:test::1")); + DocumentPut put2 = new DocumentPut(type, new DocumentId("id:failing:test::2")); + DocumentPut put3 = new DocumentPut(type, new DocumentId("id:failing:test::3")); // Process them service.process(put1); @@ -77,7 +77,7 @@ public class FailingDocumentProcessingTestCase { @Override public void process(DocumentPut put) { super.process(put); - if (put.getId().toString().equals("doc:failing:test:2")) { + if (put.getId().toString().equals("id:failing:test::2")) { throw new HandledProcessingException("Failed at receiving document test:2"); } } diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java index 4e90d125672..98a7d3fe65e 100644 --- a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java @@ -39,9 +39,9 @@ public class FailingDocumentProcessingWithoutExceptionTestCase { // Create documents DocumentType type = new DocumentType("test"); type.addField("test", DataType.STRING); - DocumentPut put1 = new DocumentPut(type, new DocumentId("doc:woexception:test:1")); - DocumentPut put2 = new DocumentPut(type, new DocumentId("doc:woexception:test:2")); - DocumentPut put3 = new DocumentPut(type, new DocumentId("doc:woexception:test:3")); + DocumentPut put1 = new DocumentPut(type, new DocumentId("id:woexception:test::1")); + DocumentPut put2 = new DocumentPut(type, new DocumentId("id:woexception:test::2")); + DocumentPut put3 = new DocumentPut(type, new DocumentId("id:woexception:test::3")); // Process them service.process(put1); @@ -82,7 +82,7 @@ public class FailingDocumentProcessingWithoutExceptionTestCase { public Progress process(Processing processing) { super.process(processing); for (DocumentOperation op : processing.getDocumentOperations()) { - if (op.getId().toString().equals("doc:woexception:test:2")) { + if (op.getId().toString().equals("id:woexception:test::2")) { return DocumentProcessor.Progress.FAILED; } } diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java index 087e5c6856c..0a5295a1800 100644 --- a/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java @@ -43,9 +43,9 @@ public class FailingPermanentlyDocumentProcessingTestCase { // Create documents DocumentType type = new DocumentType("test"); type.addField("test", DataType.STRING); - DocumentPut put1 = new DocumentPut(type, new DocumentId("doc:permanentfailure:test:1")); - DocumentPut put2 = new DocumentPut(type, new DocumentId("doc:permanentfailure:test:2")); - DocumentPut put3 = new DocumentPut(type, new DocumentId("doc:permanentfailure:test:3")); + DocumentPut put1 = new DocumentPut(type, new DocumentId("id:permanentfailure:test::1")); + DocumentPut put2 = new DocumentPut(type, new DocumentId("id:permanentfailure:test::2")); + DocumentPut put3 = new DocumentPut(type, new DocumentId("id:permanentfailure:test::3")); // Process them service.process(put1); @@ -93,7 +93,7 @@ public class FailingPermanentlyDocumentProcessingTestCase { public Progress process(Processing processing) { super.process(processing); for (DocumentOperation op : processing.getDocumentOperations()) { - if (op.getId().toString().equals("doc:permanentfailure:test:2")) { + if (op.getId().toString().equals("id:permanentfailure:test::2")) { return DocumentProcessor.Progress.PERMANENT_FAILURE; } } diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java index 59dcb583e2a..2a56dad05ba 100644 --- a/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java @@ -26,7 +26,7 @@ public class FailingWithErrorTestCase { DocumentType type = new DocumentType("test"); type.addField("test", DataType.STRING); - DocumentPut put = new DocumentPut(type, new DocumentId("doc:failing:test:1")); + DocumentPut put = new DocumentPut(type, new DocumentId("id:failing:test::1")); put.getDocument().setFieldValue("test", "foobar"); service.process(put); diff --git a/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java b/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java index a89dbfcc782..6868bc8ecd4 100644 --- a/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java @@ -44,10 +44,10 @@ public class ProcessingUpdateTestCase { dtm = new DocumentTypeManager(); dtm.registerDocumentType(articleType); - put = new DocumentPut(articleType, "doc:banana:apple"); + put = new DocumentPut(articleType, "id:banana:article::1"); put.getDocument().setFieldValue("body", "this is the body of the article, blah blah blah"); FieldUpdate upd = FieldUpdate.createAssign(articleType.getField("body"), new StringFieldValue("this is the updated body of the article, blahdi blahdi blahdi")); - update = new DocumentUpdate(articleType, new DocumentId("doc:grape:orange")); + update = new DocumentUpdate(articleType, new DocumentId("id:grape:article::2")); update.addFieldUpdate(upd); DocprocService service = new DocprocService("update"); diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java index 6f527aae17a..c89ac21610e 100644 --- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java @@ -53,9 +53,9 @@ public class SimpleDocumentProcessorTestCase { public void requireThatProcessingMultipleOperationsWork() { DocumentType type = createTestType(); - Processing p = getProcessing(new DocumentPut(type, "doc:this:is:a:document"), - new DocumentUpdate(type, "doc:this:is:an:update"), - new DocumentRemove(new DocumentId("doc:this:is:a:remove"))); + Processing p = getProcessing(new DocumentPut(type, "id:this:foobar::is:a:document"), + new DocumentUpdate(type, "id:this:foobar::is:an:update"), + new DocumentRemove(new DocumentId("id:this:foobar::is:a:remove"))); DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor()); service.getExecutor().process(p); @@ -74,7 +74,7 @@ public class SimpleDocumentProcessorTestCase { public void requireThatProcessingSingleOperationWorks() { DocumentType type = createTestType(); - Processing p = getProcessing(new DocumentPut(type, "doc:this:is:a:document")); + Processing p = getProcessing(new DocumentPut(type, "id:this:foobar::is:a:document")); DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor()); service.getExecutor().process(p); @@ -88,9 +88,9 @@ public class SimpleDocumentProcessorTestCase { public void requireThatThrowingTerminatesIteration() { DocumentType type = createTestType(); - Processing p = getProcessing(new DocumentPut(type, "doc:this:is:a:document"), - new DocumentRemove(new DocumentId("doc:this:is:a:remove")), - new DocumentPut(type, "doc:this:is:a:document2")); + Processing p = getProcessing(new DocumentPut(type, "id:this:foobar::is:a:document"), + new DocumentRemove(new DocumentId("id:this:foobar::is:a:remove")), + new DocumentPut(type, "id:this:foobar::is:a:document2")); DocprocService service = setupDocprocService(new SimpleDocumentProcessorThrowingOnRemovesAndUpdates()); try { @@ -105,7 +105,7 @@ public class SimpleDocumentProcessorTestCase { is("processed")); assertThat(p.getDocumentOperations().get(1) instanceof DocumentRemove, is(true)); assertThat(p.getDocumentOperations().get(1).getId().toString(), - is("doc:this:is:a:remove")); + is("id:this:foobar::is:a:remove")); assertThat(p.getDocumentOperations().get(2) instanceof DocumentPut, is(true)); assertThat(((DocumentPut) p.getDocumentOperations().get(2)).getDocument().getFieldValue("title"), nullValue()); diff --git a/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java b/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java index 0c3f080001b..eec8c3f61c7 100644 --- a/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java @@ -36,28 +36,28 @@ public class TransientFailureTestCase { DocumentPut put; - put = new DocumentPut(type, new DocumentId("doc:transfail:bad")); + put = new DocumentPut(type, new DocumentId("id:transfail:test::bad")); service.process(put, endpoint); while (service.doWork()) { } assertEquals(0, endpoint.numOk); assertEquals(1, endpoint.numTransientFail); assertEquals(0, endpoint.numFail); - put = new DocumentPut(type, new DocumentId("doc:transfail:verybad")); + put = new DocumentPut(type, new DocumentId("id:transfail:test::verybad")); service.process(put, endpoint); while (service.doWork()) { } assertEquals(0, endpoint.numOk); assertEquals(1, endpoint.numTransientFail); assertEquals(1, endpoint.numFail); - put = new DocumentPut(type, new DocumentId("doc:transfail:good")); + put = new DocumentPut(type, new DocumentId("id:transfail:test::good")); service.process(put, endpoint); while (service.doWork()) { } assertEquals(1, endpoint.numOk); assertEquals(1, endpoint.numTransientFail); assertEquals(1, endpoint.numFail); - put = new DocumentPut(type, new DocumentId("doc:transfail:veryverybad")); + put = new DocumentPut(type, new DocumentId("id:transfail:test::veryverybad")); service.process(put, endpoint); while (service.doWork()) { } assertEquals(1, endpoint.numOk); @@ -72,11 +72,11 @@ public class TransientFailureTestCase { @Override public Progress process(Processing processing) { for (DocumentOperation op : processing.getDocumentOperations()) { - if (op.getId().toString().equals("doc:transfail:bad")) { + if (op.getId().toString().equals("id:transfail:test::bad")) { throw new TransientFailureException("sorry, try again later"); - } else if (op.getId().toString().equals("doc:transfail:verybad")) { + } else if (op.getId().toString().equals("id:transfail:test::verybad")) { return Progress.FAILED; - } else if (op.getId().toString().equals("doc:transfail:veryverybad")) { + } else if (op.getId().toString().equals("id:transfail:test::veryverybad")) { return Progress.PERMANENT_FAILURE; } } 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 375c0e0552a..17bcfd68bf4 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerAllMessageTypesTestCase.java @@ -52,7 +52,7 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr } private void get() throws InterruptedException { - GetDocumentMessage message = new GetDocumentMessage(new DocumentId("doc:this:is:a:test"), "fieldset?"); + GetDocumentMessage message = new GetDocumentMessage(new DocumentId("id:this:baz::is:a:test"), "fieldset?"); assertTrue(sendMessage(FOOBAR, message)); @@ -69,7 +69,7 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr private void put() throws InterruptedException { - Document document = new Document(getType(), "doc:baz:foo"); + Document document = new Document(getType(), "id:ns:baz::foo"); document.setFieldValue("blahblah", new StringFieldValue("This is a test.")); PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(document)); @@ -89,7 +89,7 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr } private void remove() throws InterruptedException { - RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("doc:12345:6789")); + RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:ns:baz::12345:6789")); assertTrue(sendMessage(FOOBAR, message)); @@ -101,13 +101,13 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr assertThat(result, instanceOf(RemoveDocumentMessage.class)); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage) result; - assertThat(outputMsg.getDocumentId().toString(), is("doc:12345:6789")); + assertThat(outputMsg.getDocumentId().toString(), is("id:ns:baz::12345:6789")); assertFalse(reply.hasErrors()); } private void update() throws InterruptedException { - DocumentUpdate documentUpdate = new DocumentUpdate(getType(), "doc:baz:foo"); + DocumentUpdate documentUpdate = new DocumentUpdate(getType(), "id:ns:baz::foo"); UpdateDocumentMessage message = new UpdateDocumentMessage(documentUpdate); assertTrue(sendMessage(FOOBAR, message)); @@ -120,7 +120,7 @@ public class DocumentProcessingHandlerAllMessageTypesTestCase extends DocumentPr assertThat(result, instanceOf(UpdateDocumentMessage.class)); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage) result; - assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("doc:baz:foo")); + assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:ns:baz::foo")); assertFalse(reply.hasErrors()); } diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java index 813fd4b1f71..01b66bc2fb6 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerBasicTestCase.java @@ -39,7 +39,7 @@ public class DocumentProcessingHandlerBasicTestCase extends DocumentProcessingHa @Test public void testPut() throws InterruptedException { - Document document = new Document(getType(), "doc:yalla:balla"); + Document document = new Document(getType(), "id:ns:yalla::balla"); document.setFieldValue("blahblah", new StringFieldValue("This is a test.")); PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(document)); diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java index 47ce05ebace..db92d16b95e 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java @@ -60,28 +60,28 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan private void putToManySomeInSameBucket() throws InterruptedException { assertPutMessages(createPutDocumentMessage(), TOMANYSOMEINSAMEBUCKET, "id:123456:baz:n=7890:bar:er:bra", - "doc:foo:bar:er:ja", + "id:foo:baz::er:ja", "id:567890:baz:n=1234:a", - "doc:foo:bar:hahahhaa", + "id:foo:baz::hahahhaa", "id:123456:baz:n=7890:a:a", - "doc:foo:bar:aa", + "id:foo:baz::aa", "id:567890:baz:n=1234:bar:ala", - "doc:foo:bar:sdfgsaa", + "id:foo:baz::sdfgsaa", "id:123456:baz:n=7890:bar:tralsfa", - "doc:foo:bar:dfshaa"); + "id:foo:baz::dfshaa"); } private void putToFourPuts() throws InterruptedException { assertPutMessages(createPutDocumentMessage(), TOMANY, - "doc:foo:bar:er:bra", - "doc:foo:bar:er:ja", - "doc:foo:bar:hahahhaa", - "doc:foo:bar:trallala"); + "id:foo:baz::er:bra", + "id:foo:baz::er:ja", + "id:foo:baz::hahahhaa", + "id:foo:baz::trallala"); } private void putToOne() throws InterruptedException { assertPutMessages(createPutDocumentMessage(), TOONE, - "doc:baz:bar"); + "id:ns:baz::bar"); } private void putToZero() throws InterruptedException { @@ -104,7 +104,7 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan } protected PutDocumentMessage createPutDocumentMessage() { - Document document = new Document(getType(), "doc:baz:bar"); + Document document = new Document(getType(), "id:ns:baz::bar"); document.setFieldValue("blahblah", new StringFieldValue("This is a test.")); return new PutDocumentMessage(new DocumentPut(document)); } @@ -158,10 +158,10 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan public Progress process(Processing processing) { List<DocumentOperation> operations = processing.getDocumentOperations(); operations.clear(); - operations.add(new DocumentPut(type, "doc:foo:bar:er:bra")); - operations.add(new DocumentPut(type, "doc:foo:bar:er:ja")); - operations.add(new DocumentPut(type, "doc:foo:bar:trallala")); - operations.add(new DocumentPut(type, "doc:foo:bar:hahahhaa")); + operations.add(new DocumentPut(type, "id:foo:baz::er:bra")); + operations.add(new DocumentPut(type, "id:foo:baz::er:ja")); + operations.add(new DocumentPut(type, "id:foo:baz::trallala")); + operations.add(new DocumentPut(type, "id:foo:baz::hahahhaa")); return Progress.DONE; } } @@ -182,15 +182,15 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan List<DocumentOperation> operations = processing.getDocumentOperations(); operations.clear(); operations.add(new DocumentPut(type, "id:123456:baz:n=7890:bar:er:bra")); - operations.add(new DocumentPut(type, "doc:foo:bar:er:ja")); + operations.add(new DocumentPut(type, "id:foo:baz::er:ja")); operations.add(new DocumentPut(type, "id:567890:baz:n=1234:a")); - operations.add(new DocumentPut(type, "doc:foo:bar:hahahhaa")); + operations.add(new DocumentPut(type, "id:foo:baz::hahahhaa")); operations.add(new DocumentPut(type, "id:123456:baz:n=7890:a:a")); - operations.add(new DocumentPut(type, "doc:foo:bar:aa")); + operations.add(new DocumentPut(type, "id:foo:baz::aa")); operations.add(new DocumentPut(type, "id:567890:baz:n=1234:bar:ala")); - operations.add(new DocumentPut(type, "doc:foo:bar:sdfgsaa")); + operations.add(new DocumentPut(type, "id:foo:baz::sdfgsaa")); operations.add(new DocumentPut(type, "id:123456:baz:n=7890:bar:tralsfa")); - operations.add(new DocumentPut(type, "doc:foo:bar:dfshaa")); + operations.add(new DocumentPut(type, "id:foo:baz::dfshaa")); return Progress.DONE; } 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 4eb102d8aad..00efab737c4 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java @@ -83,28 +83,28 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum private void put() throws InterruptedException { { - PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "doc:nodocstatus:put:to:put"))); + PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:put"))); Routable result = sendMessageAndGetResult(message); assertThat(result, instanceOf(PutDocumentMessage.class)); PutDocumentMessage outputMsg = (PutDocumentMessage)result; assertThat(outputMsg.getDocumentPut().getDocument().getFieldValue("foostring").toString(), is("banana")); } { - PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "doc:nodocstatus:put:to:remove"))); + PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:remove"))); Routable result = sendMessageAndGetResult(message); assertThat(result, instanceOf(RemoveDocumentMessage.class)); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage)result; - assertThat(outputMsg.getDocumentId().toString(), is("doc:nodocstatus:put:to:remove")); + assertThat(outputMsg.getDocumentId().toString(), is("id:nodocstatus:foo::put:to:remove")); } { - PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "doc:nodocstatus:put:to:update"))); + PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:update"))); Routable result = sendMessageAndGetResult(message); assertThat(result, instanceOf(UpdateDocumentMessage.class)); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage)result; - assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("doc:nodocstatus:put:to:update")); + assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:nodocstatus:foo::put:to:update")); } { - PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "doc:nodocstatus:put:to:nothing"))); + PutDocumentMessage message = new PutDocumentMessage(new DocumentPut(new Document(getType(), "id:nodocstatus:foo::put:to:nothing"))); assertTrue(sendMessage(FOOBAR, message)); Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); @@ -115,29 +115,29 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum private void remove() throws InterruptedException { { - RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("doc:nodocstatus:remove:to:put")); + RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:put")); Routable result = sendMessageAndGetResult(message); assertThat(result, instanceOf(PutDocumentMessage.class)); PutDocumentMessage outputMsg = (PutDocumentMessage)result; - assertThat(outputMsg.getDocumentPut().getDocument().getId().toString(), is("doc:nodocstatus:remove:to:put")); + assertThat(outputMsg.getDocumentPut().getDocument().getId().toString(), is("id:nodocstatus:foo::remove:to:put")); } { - RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("doc:nodocstatus:remove:to:remove")); + RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:remove")); Routable result = sendMessageAndGetResult(message); assertThat(result, instanceOf(RemoveDocumentMessage.class)); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage)result; - assertThat(outputMsg.getDocumentId().toString(), is("doc:nodocstatus:remove:to:remove")); + assertThat(outputMsg.getDocumentId().toString(), is("id:nodocstatus:foo::remove:to:remove")); } { - RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("doc:nodocstatus:remove:to:update")); + RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:update")); Routable result = sendMessageAndGetResult(message); assertThat(result, instanceOf(UpdateDocumentMessage.class)); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage)result; - assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("doc:nodocstatus:remove:to:update")); + assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:nodocstatus:foo::remove:to:update")); } { - RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("doc:nodocstatus:remove:to:nothing")); + RemoveDocumentMessage message = new RemoveDocumentMessage(new DocumentId("id:nodocstatus:foo::remove:to:nothing")); assertTrue(sendMessage(FOOBAR, message)); Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); @@ -148,29 +148,29 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum private void update() throws InterruptedException { { - UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "doc:nodocstatus:update:to:put")); + UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:put")); Routable result = sendMessageAndGetResult(message); assertThat(result, instanceOf(PutDocumentMessage.class)); PutDocumentMessage outputMsg = (PutDocumentMessage)result; - assertThat(outputMsg.getDocumentPut().getDocument().getId().toString(), is("doc:nodocstatus:update:to:put")); + assertThat(outputMsg.getDocumentPut().getDocument().getId().toString(), is("id:nodocstatus:foo::update:to:put")); } { - UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "doc:nodocstatus:update:to:remove")); + UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:remove")); Routable result = sendMessageAndGetResult(message); assertThat(result, instanceOf(RemoveDocumentMessage.class)); RemoveDocumentMessage outputMsg = (RemoveDocumentMessage)result; - assertThat(outputMsg.getDocumentId().toString(), is("doc:nodocstatus:update:to:remove")); + assertThat(outputMsg.getDocumentId().toString(), is("id:nodocstatus:foo::update:to:remove")); } { - UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "doc:nodocstatus:update:to:update")); + UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:update")); Routable result = sendMessageAndGetResult(message); assertThat(result, instanceOf(UpdateDocumentMessage.class)); UpdateDocumentMessage outputMsg = (UpdateDocumentMessage)result; - assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("doc:nodocstatus:update:to:update")); + assertThat(outputMsg.getDocumentUpdate().getId().toString(), is("id:nodocstatus:foo::update:to:update")); } { - UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "doc:nodocstatus:update:to:nothing")); + UpdateDocumentMessage message = new UpdateDocumentMessage(new DocumentUpdate(getType(), "id:nodocstatus:foo::update:to:nothing")); assertTrue(sendMessage(FOOBAR, message)); Reply reply = driver.client().awaitReply(60, TimeUnit.SECONDS); assertNotNull(reply); @@ -187,30 +187,30 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum while (it.hasNext()) { DocumentOperation op = it.next(); String id = op.getId().toString(); - if ("doc:nodocstatus:put:to:put".equals(id)) { + if ("id:nodocstatus:foo::put:to:put".equals(id)) { Document doc = ((DocumentPut)op).getDocument(); doc.setFieldValue("foostring", new StringFieldValue("banana")); - } else if ("doc:nodocstatus:put:to:remove".equals(id)) { + } else if ("id:nodocstatus:foo::put:to:remove".equals(id)) { it.set(new DocumentRemove(new DocumentId(id))); - } else if ("doc:nodocstatus:put:to:update".equals(id)) { + } else if ("id:nodocstatus:foo::put:to:update".equals(id)) { it.set(new DocumentUpdate(getType(), id)); - } else if ("doc:nodocstatus:put:to:nothing".equals(id)) { + } else if ("id:nodocstatus:foo::put:to:nothing".equals(id)) { it.remove(); - } else if ("doc:nodocstatus:remove:to:put".equals(id)) { + } else if ("id:nodocstatus:foo::remove:to:put".equals(id)) { it.set(new DocumentPut(getType(), op.getId())); - } else if ("doc:nodocstatus:remove:to:remove".equals(id)) { + } else if ("id:nodocstatus:foo::remove:to:remove".equals(id)) { //nada - } else if ("doc:nodocstatus:remove:to:update".equals(id)) { + } else if ("id:nodocstatus:foo::remove:to:update".equals(id)) { it.set(new DocumentUpdate(getType(), id)); - } else if ("doc:nodocstatus:remove:to:nothing".equals(id)) { + } else if ("id:nodocstatus:foo::remove:to:nothing".equals(id)) { it.remove(); - } else if ("doc:nodocstatus:update:to:put".equals(id)) { + } else if ("id:nodocstatus:foo::update:to:put".equals(id)) { it.set(new DocumentPut(getType(), op.getId())); - } else if ("doc:nodocstatus:update:to:remove".equals(id)) { + } else if ("id:nodocstatus:foo::update:to:remove".equals(id)) { it.set(new DocumentRemove(new DocumentId(id))); - } else if ("doc:nodocstatus:update:to:update".equals(id)) { + } else if ("id:nodocstatus:foo::update:to:update".equals(id)) { //nada - } else if ("doc:nodocstatus:update:to:nothing".equals(id)) { + } else if ("id:nodocstatus:foo::update:to:nothing".equals(id)) { it.remove(); } else if ("id:12345:6789:multiop:nodocstatus:keep:this".equals(id)) { //nada 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 358518d4461..96ea96b9e78 100644 --- a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java +++ b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java @@ -54,7 +54,7 @@ public class SchemaMappingAndAccessesTest { type.addField("guitarist", DataType.STRING); type.addField("year", DataType.INT); type.addField("labels", DataType.getArray(DataType.STRING)); - Document doc = new Document(type, new DocumentId("doc:map:test:1")); + Document doc = new Document(type, new DocumentId("id:map:album::1")); doc.setFieldValue("title", new StringFieldValue("Black Rock")); StringFieldValue joe = new StringFieldValue("Joe Bonamassa"); joe.setSpanTree(new SpanTree("mytree").annotate(person)); @@ -291,7 +291,7 @@ public class SchemaMappingAndAccessesTest { assertEquals(mapped.getFieldValue(new com.yahoo.document.Field("title")), doc.getFieldValue((new com.yahoo.document.Field("title")))); mapped.setFieldValue("title", "foo"); assertEquals(doc.getFieldValue("title").getWrappedValue(), "foo"); - assertEquals(mapped.getWrappedDocumentOperation().getId().toString(), "doc:map:test:1"); + assertEquals(mapped.getWrappedDocumentOperation().getId().toString(), "id:map:album::1"); assertEquals(doc, mapped); assertEquals(doc.toString(), mapped.toString()); assertEquals(doc.hashCode(), mapped.hashCode()); @@ -302,9 +302,9 @@ public class SchemaMappingAndAccessesTest { mapped.setLastModified(56l); assertEquals(doc.getLastModified(), (Long)56l); assertEquals(mapped.getLastModified(), (Long)56l); - mapped.setId(new DocumentId("doc:map:test:2")); - assertEquals(mapped.getId().toString(), "doc:map:test:2"); - assertEquals(doc.getId().toString(), "doc:map:test:2"); + mapped.setId(new DocumentId("id:map:album::2")); + assertEquals(mapped.getId().toString(), "id:map:album::2"); + assertEquals(doc.getId().toString(), "id:map:album::2"); assertEquals(doc.getHeader(), mapped.getHeader()); assertEquals(doc.getBody(), mapped.getBody()); assertEquals(doc.getSerializedSize(), mapped.getSerializedSize()); @@ -320,15 +320,20 @@ public class SchemaMappingAndAccessesTest { mapped.clear(); assertNull(mapped.getFieldValue("title")); assertNull(doc.getFieldValue("title")); - mapped.setDataType(new DocumentType("newType")); - assertEquals(doc.getDataType().getName(), "newType"); + try { + mapped.setDataType(new DocumentType("newType")); + fail("Should not be able to set new type"); + } catch (IllegalArgumentException e) { + assertEquals("Trying to set a document type (newType) that doesn't match the document id (id:map:album::2).", e.getMessage()); + } + assertEquals(doc.getDataType().getName(), "album"); } @Test public void testMappedDocUpdateAPI() { Document doc = getDoc(); DocumentType type = doc.getDataType(); - DocumentUpdate dud = new DocumentUpdate(type, new DocumentId("doc:map:test:1")); + DocumentUpdate dud = new DocumentUpdate(type, new DocumentId("id:map:album::1")); com.yahoo.document.Field title = type.getField("title"); FieldUpdate assignSingle = FieldUpdate.createAssign(title, new StringFieldValue("something")); Map<String, String> fieldMap = new HashMap<>(); @@ -349,7 +354,7 @@ public class SchemaMappingAndAccessesTest { assertEquals(pup.hashCode(), dud.hashCode()); assertEquals(pup.toString(), dud.toString()); assertEquals(pup.size(), dud.size()); - assertEquals(pup.getWrappedDocumentOperation().getId().toString(), "doc:map:test:1"); + assertEquals(pup.getWrappedDocumentOperation().getId().toString(), "id:map:album::1"); } @Test @@ -367,7 +372,7 @@ public class SchemaMappingAndAccessesTest { storeStructType.addField(new com.yahoo.document.Field("materials", materialsStructType)); docType.addField("store", storeStructType); - Document doc = new Document(docType, new DocumentId("doc:map:test:1")); + Document doc = new Document(docType, new DocumentId("id:map:album::1")); doc.setFieldValue("title", new StringFieldValue("Black Rock")); doc.setFieldValue("artist", new StringFieldValue("Joe Bonamassa")); Struct material = new Struct(materialsStructType); @@ -581,7 +586,7 @@ public class SchemaMappingAndAccessesTest { public static class TestRemovingMappingStructInArrayProcessor extends DocumentProcessor { public Progress process(Processing processing) { - Document document = ((DocumentPut)processing.getDocumentOperations().get(0)).getDocument();; + Document document = ((DocumentPut)processing.getDocumentOperations().get(0)).getDocument(); document.removeFieldValue("name"); return Progress.DONE; } diff --git a/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java b/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java index 41f578baaf0..c4f65987692 100644 --- a/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java @@ -42,10 +42,10 @@ public class SplitterJoinerTestCase { /**** Create documents: ****/ - Document inner1 = new Document(manager.getDocumentType("docindoc"), "doc:inner:number:one"); + Document inner1 = new Document(manager.getDocumentType("docindoc"), "id:inner:docindoc::one"); inner1.setFieldValue("name", new StringFieldValue("Donald Duck")); inner1.setFieldValue("content", new StringFieldValue("Lives in Duckburg")); - Document inner2 = new Document(manager.getDocumentType("docindoc"), "doc:inner:number:two"); + Document inner2 = new Document(manager.getDocumentType("docindoc"), "id:inner:docindoc::number:two"); inner2.setFieldValue("name", new StringFieldValue("Uncle Scrooge")); inner2.setFieldValue("content", new StringFieldValue("Lives in Duckburg, too.")); @@ -53,7 +53,7 @@ public class SplitterJoinerTestCase { innerArray.add(inner1); innerArray.add(inner2); - Document outer = new Document(manager.getDocumentType("outerdoc"), "doc:outer:the:only:one"); + Document outer = new Document(manager.getDocumentType("outerdoc"), "id:outer:outerdoc::the:only:one"); outer.setFieldValue("innerdocuments", innerArray); /**** End create documents ****/ 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 cfaee10a07d..6e4057c57a0 100644 --- a/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java +++ b/docprocs/src/test/java/com/yahoo/docprocs/indexing/DocumentScriptTestCase.java @@ -180,7 +180,7 @@ public class DocumentScriptTestCase { } DocumentUpdate executeWithUpdate(String fieldName, FieldPathUpdate updateIn) { - DocumentUpdate update = new DocumentUpdate(type, "doc:scheme:"); + DocumentUpdate update = new DocumentUpdate(type, "id:ns:documentType::"); update.addFieldPathUpdate(updateIn); return newScript(type, fieldName).execute(ADAPTER_FACTORY, update); } @@ -240,7 +240,7 @@ public class DocumentScriptTestCase { private static FieldValue processDocument(FieldValue fieldValue) { DocumentType docType = new DocumentType("myDocumentType"); docType.addField("myField", fieldValue.getDataType()); - Document doc = new Document(docType, "doc:scheme:"); + Document doc = new Document(docType, "id:ns:myDocumentType::"); doc.setFieldValue("myField", fieldValue.clone()); doc = newScript(docType).execute(ADAPTER_FACTORY, doc); return doc.getFieldValue("myField"); @@ -249,7 +249,7 @@ public class DocumentScriptTestCase { private static ValueUpdate<?> processFieldUpdate(FieldValue fieldValue) { DocumentType docType = new DocumentType("myDocumentType"); docType.addField("myField", fieldValue.getDataType()); - DocumentUpdate update = new DocumentUpdate(docType, "doc:scheme:"); + DocumentUpdate update = new DocumentUpdate(docType, "id:ns:myDocumentType::"); update.addFieldUpdate(FieldUpdate.createAssign(docType.getField("myField"), fieldValue)); update = newScript(docType).execute(ADAPTER_FACTORY, update); return update.getFieldUpdate("myField").getValueUpdate(0); @@ -258,7 +258,7 @@ public class DocumentScriptTestCase { private static ValueUpdate<?> processPathUpdate(FieldValue fieldValue) { DocumentType docType = new DocumentType("myDocumentType"); docType.addField("myField", fieldValue.getDataType()); - DocumentUpdate update = new DocumentUpdate(docType, "doc:scheme:"); + DocumentUpdate update = new DocumentUpdate(docType, "id:ns:myDocumentType::"); update.addFieldPathUpdate(new AssignFieldPathUpdate(docType, "myField", fieldValue)); update = newScript(docType).execute(ADAPTER_FACTORY, update); return update.getFieldUpdate("myField").getValueUpdate(0); @@ -299,7 +299,7 @@ public class DocumentScriptTestCase { } private static Document newDocument(FieldValue documentFieldValue, FieldValue extraFieldValue) { - Document document = new Document(newDocumentType(), "doc:scheme:"); + Document document = new Document(newDocumentType(), "id:ns:documentType::"); if (documentFieldValue != null) { document.setFieldValue("documentField", documentFieldValue); } @@ -311,7 +311,7 @@ public class DocumentScriptTestCase { private static DocumentUpdate newFieldUpdate(FieldValue documentFieldValue, FieldValue extraFieldValue) { DocumentType type = newDocumentType(); - DocumentUpdate update = new DocumentUpdate(type, "doc:scheme:"); + DocumentUpdate update = new DocumentUpdate(type, "id:ns:documentType::"); if (documentFieldValue != null) { update.addFieldUpdate(FieldUpdate.createAssign(type.getField("documentField"), documentFieldValue)); } @@ -323,7 +323,7 @@ public class DocumentScriptTestCase { private static DocumentUpdate newPathUpdate(FieldValue documentFieldValue, FieldValue extraFieldValue) { DocumentType type = newDocumentType(); - DocumentUpdate update = new DocumentUpdate(type, "doc:scheme:"); + DocumentUpdate update = new DocumentUpdate(type, "id:ns:documentType::"); if (documentFieldValue != null) { update.addFieldPathUpdate(new AssignFieldPathUpdate(type, "documentField", documentFieldValue)); } 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 5979672524d..8ad2ff0aaad 100644 --- a/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java +++ b/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java @@ -33,7 +33,7 @@ public class IndexingProcessorTestCase { @Test public void requireThatIndexerProcessesDocuments() { - Document input = new Document(indexer.getDocumentTypeManager().getDocumentType("music"), "doc:scheme:"); + Document input = new Document(indexer.getDocumentTypeManager().getDocumentType("music"), "id:ns:music::"); input.setFieldValue("artist", new StringFieldValue("69")); DocumentOperation op = process(new DocumentPut(input)); assertTrue(op instanceof DocumentPut); @@ -45,7 +45,7 @@ public class IndexingProcessorTestCase { @Test public void requireThatIndexerForwardsDocumentsOfUnknownType() { - Document input = new Document(new DocumentType("unknown"), "doc:scheme:"); + Document input = new Document(new DocumentType("unknown"), "id:ns:unknown::"); DocumentOperation output = process(new DocumentPut(input)); assertTrue(output instanceof DocumentPut); assertSame(input, ((DocumentPut)output).getDocument()); @@ -54,7 +54,7 @@ public class IndexingProcessorTestCase { @Test public void requireThatIndexerProcessesUpdates() { DocumentType inputType = indexer.getDocumentTypeManager().getDocumentType("music"); - DocumentUpdate input = new DocumentUpdate(inputType, "doc:scheme:"); + DocumentUpdate input = new DocumentUpdate(inputType, "id:ns:music::"); input.addFieldUpdate(FieldUpdate.createAssign(inputType.getField("isbn"), new StringFieldValue("isbnmarker"))); input.addFieldUpdate(FieldUpdate.createAssign(inputType.getField("artist"), new StringFieldValue("69"))); DocumentOperation output = process(input); @@ -98,7 +98,7 @@ public class IndexingProcessorTestCase { @Test public void requireThatEmptyDocumentUpdateOutputDoesNotThrow() { DocumentType inputType = indexer.getDocumentTypeManager().getDocumentType("music"); - DocumentUpdate input = new DocumentUpdate(inputType, "doc:scheme:"); + DocumentUpdate input = new DocumentUpdate(inputType, "id:ns:music::"); Processing proc = new Processing(); proc.getDocumentOperations().add(input); indexer.process(proc); @@ -107,7 +107,7 @@ public class IndexingProcessorTestCase { @Test public void requireThatIndexerForwardsUpdatesOfUnknownType() { - DocumentUpdate input = new DocumentUpdate(new DocumentType("unknown"), "doc:scheme:"); + DocumentUpdate input = new DocumentUpdate(new DocumentType("unknown"), "id:ns:music::"); DocumentOperation output = process(input); assertSame(input, output); } |