Remove the use and testing of legacy groupdoc/userdoc/orderdoc document ids.

3 files changed, 42 insertions, 36 deletions

diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java
index 8cc916ec77b..6f527aae17a 100644
--- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java
@@ -4,7 +4,6 @@ package com.yahoo.docproc;
 import com.yahoo.container.StatisticsConfig;
 import com.yahoo.docproc.jdisc.metric.NullMetric;
 import com.yahoo.document.DataType;
-import com.yahoo.document.Document;
 import com.yahoo.document.DocumentId;
 import com.yahoo.document.DocumentOperation;
 import com.yahoo.document.DocumentPut;
@@ -12,7 +11,7 @@ import com.yahoo.document.DocumentRemove;
 import com.yahoo.document.DocumentType;
 import com.yahoo.document.DocumentUpdate;
 import com.yahoo.document.datatypes.StringFieldValue;
-import com.yahoo.document.idstring.UserDocIdString;
+import com.yahoo.document.idstring.IdIdString;
 import com.yahoo.statistics.StatisticsImpl;
 import org.junit.Test;
 
@@ -44,10 +43,15 @@ public class SimpleDocumentProcessorTestCase {
         return processing;
     }
 
-    @Test
-    public void requireThatProcessingMultipleOperationsWork() {
+    private static DocumentType createTestType() {
         DocumentType type = new DocumentType("foobar");
         type.addField("title", DataType.STRING);
+        return type;
+    }
+
+    @Test
+    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"),
@@ -63,13 +67,12 @@ public class SimpleDocumentProcessorTestCase {
         assertThat(p.getDocumentOperations().get(1) instanceof DocumentUpdate, is(true));
         assertThat(p.getDocumentOperations().get(2) instanceof DocumentRemove, is(true));
         assertThat(p.getDocumentOperations().get(2).getId().toString(),
-                   is("userdoc:foobar:1234:something"));
+                   is("id:foobar:foobar::12345"));
     }
 
     @Test
     public void requireThatProcessingSingleOperationWorks() {
-        DocumentType type = new DocumentType("foobar");
-        type.addField("title", DataType.STRING);
+        DocumentType type = createTestType();
 
         Processing p = getProcessing(new DocumentPut(type, "doc:this:is:a:document"));
         DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor());
@@ -83,8 +86,7 @@ public class SimpleDocumentProcessorTestCase {
 
     @Test
     public void requireThatThrowingTerminatesIteration() {
-        DocumentType type = new DocumentType("foobar");
-        type.addField("title", DataType.STRING);
+        DocumentType type = createTestType();
 
         Processing p = getProcessing(new DocumentPut(type, "doc:this:is:a:document"),
                                      new DocumentRemove(new DocumentId("doc:this:is:a:remove")),
@@ -120,7 +122,7 @@ public class SimpleDocumentProcessorTestCase {
 
         @Override
         public void process(DocumentRemove remove) {
-            remove.getId().setId(new UserDocIdString("foobar", 1234L, "something"));
+            remove.getId().setId(new IdIdString("foobar", "foobar", "", "12345"));
         }
 
         @Override
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 2158901b009..47ce05ebace 100644
--- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java
@@ -52,22 +52,22 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan
 
     private void putToManyAllInSameBucket() throws InterruptedException {
         assertPutMessages(createPutDocumentMessage(), TOMANYALLINSAMEBUCKET,
-                          "userdoc:123456:11111:foo:er:bra",
-                          "userdoc:123456:11111:foo:trallala",
-                          "userdoc:123456:11111:foo:a");
+                          "id:123456:baz:n=11111:foo:er:bra",
+                          "id:123456:baz:n=11111:foo:trallala",
+                          "id:123456:baz:n=11111:foo:a");
     }
 
     private void putToManySomeInSameBucket() throws InterruptedException {
         assertPutMessages(createPutDocumentMessage(), TOMANYSOMEINSAMEBUCKET,
-                          "userdoc:123456:7890:bar:er:bra",
+                          "id:123456:baz:n=7890:bar:er:bra",
                           "doc:foo:bar:er:ja",
-                          "userdoc:567890:1234:a",
+                          "id:567890:baz:n=1234:a",
                           "doc:foo:bar:hahahhaa",
-                          "userdoc:123456:7890:a:a",
+                          "id:123456:baz:n=7890:a:a",
                           "doc:foo:bar:aa",
-                          "userdoc:567890:1234:bar:ala",
+                          "id:567890:baz:n=1234:bar:ala",
                           "doc:foo:bar:sdfgsaa",
-                          "userdoc:123456:7890:bar:tralsfa",
+                          "id:123456:baz:n=7890:bar:tralsfa",
                           "doc:foo:bar:dfshaa");
     }
 
@@ -181,15 +181,15 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan
         public Progress process(Processing processing) {
             List<DocumentOperation> operations = processing.getDocumentOperations();
             operations.clear();
-            operations.add(new DocumentPut(type, "userdoc:123456:7890:bar:er:bra"));
+            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, "userdoc:567890:1234:a"));
+            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, "userdoc:123456:7890:a:a"));
+            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, "userdoc:567890:1234:bar:ala"));
+            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, "userdoc:123456:7890:bar:tralsfa"));
+            operations.add(new DocumentPut(type, "id:123456:baz:n=7890:bar:tralsfa"));
             operations.add(new DocumentPut(type, "doc:foo:bar:dfshaa"));
             return Progress.DONE;
         }
@@ -202,9 +202,9 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan
         public Progress process(Processing processing) {
             List<DocumentOperation> docs = processing.getDocumentOperations();
             docs.clear();
-            docs.add(new DocumentPut(type, "userdoc:123456:11111:foo:er:bra"));
-            docs.add(new DocumentPut(type, "userdoc:123456:11111:foo:trallala"));
-            docs.add(new DocumentPut(type, "userdoc:123456:11111:foo:a"));
+            docs.add(new DocumentPut(type, "id:123456:baz:n=11111:foo:er:bra"));
+            docs.add(new DocumentPut(type, "id:123456:baz:n=11111:foo:trallala"));
+            docs.add(new DocumentPut(type, "id:123456:baz:n=11111:foo:a"));
             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 efa05273c8d..4eb102d8aad 100644
--- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java
@@ -5,10 +5,20 @@ import com.yahoo.collections.Pair;
 import com.yahoo.docproc.CallStack;
 import com.yahoo.docproc.DocumentProcessor;
 import com.yahoo.docproc.Processing;
-import com.yahoo.document.*;
+import com.yahoo.document.DataType;
+import com.yahoo.document.Document;
+import com.yahoo.document.DocumentId;
+import com.yahoo.document.DocumentOperation;
+import com.yahoo.document.DocumentPut;
+import com.yahoo.document.DocumentRemove;
+import com.yahoo.document.DocumentType;
+import com.yahoo.document.DocumentUpdate;
 import com.yahoo.document.datatypes.StringFieldValue;
-import com.yahoo.document.update.FieldUpdate;
-import com.yahoo.documentapi.messagebus.protocol.*;
+import com.yahoo.documentapi.messagebus.protocol.DocumentMessage;
+import com.yahoo.documentapi.messagebus.protocol.DocumentReply;
+import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage;
+import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage;
+import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentMessage;
 import com.yahoo.messagebus.Message;
 import com.yahoo.messagebus.Reply;
 import com.yahoo.messagebus.Routable;
@@ -202,14 +212,8 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum
                     //nada
                 } else if ("doc:nodocstatus:update:to:nothing".equals(id)) {
                     it.remove();
-                } else if ("userdoc:12345:6789:multiop:nodocstatus:keep:this".equals(id)) {
+                } else if ("id:12345:6789:multiop:nodocstatus:keep:this".equals(id)) {
                     //nada
-                } else if ("userdoc:12345:6789:multiop:nodocstatus:skip:this".equals(id)) {
-                    it.remove();
-                } else if ("userdoc:test:12345:batch:nodocstatus:keep:this".equals(id)) {
-                    //nada
-                } else if ("userdoc:test:12345:batch:nodocstatus:skip:this".equals(id)) {
-                    it.remove();
                 }
             }
             return Progress.DONE;