doc: -> id:

7 files changed, 19 insertions, 19 deletions

diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java
index 9aae221767f..6f72f45681e 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/AggregationTestCase.java
@@ -107,7 +107,7 @@ public class AggregationTestCase {
     }
 
     private GlobalId createGlobalId(int docId) {
-        return new GlobalId((new DocumentId("id:test:type:" + docId)).getGlobalId());
+        return new GlobalId((new DocumentId("id:test:type::" + docId)).getGlobalId());
     }
 
     @Test
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
index cc00959174a..ef5a35d2cd9 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
@@ -280,7 +280,7 @@ public class GroupingSerializationTest {
 
     private static GlobalId createGlobalId(int docId) {
         return new GlobalId(
-                new DocumentId(String.format("id:test:type:%d", docId)).getGlobalId());
+                new DocumentId(String.format("id:test:type::%d", docId)).getGlobalId());
     }
 
     private static ExpressionNode createDummyExpression() {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java
index fa8ced689c1..ee20415950e 100755
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/MergeTestCase.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals;
 public class MergeTestCase {
 
     private GlobalId createGlobalId(int docId) {
-        return new GlobalId((new DocumentId("id:test:type:" + docId)).getGlobalId());
+        return new GlobalId((new DocumentId("id:test:type::" + docId)).getGlobalId());
     }
 
     // Test merging of hits.
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessorTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessorTest.java
index 5d1772b6ac4..15b51dae243 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessorTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessorTest.java
@@ -32,10 +32,10 @@ import static org.mockito.Mockito.when;
 public class OperationProcessorTest {
 
     final Queue<Result> queue = new ArrayDeque<>();
-    final Document doc1 = new Document("doc:a:type:b", null, "data doc 1", null);
-    final Document doc1b = new Document("doc:a:type:b", null, "data doc 1b", null);
-    final Document doc2 = new Document("doc:a:type:b2", null, "data doc 2", null);
-    final Document doc3 = new Document("doc:a:type:b3", null, "data doc 3", null);
+    final Document doc1 = new Document("id:a:type::b", null, "data doc 1", null);
+    final Document doc1b = new Document("id:a:type::b", null, "data doc 1b", null);
+    final Document doc2 = new Document("id:a:type::b2", null, "data doc 2", null);
+    final Document doc3 = new Document("id:a:type::b3", null, "data doc 3", null);
 
     @Test
     public void testBasic() {
@@ -76,7 +76,7 @@ public class OperationProcessorTest {
 
         //check a, b, c, d
         Result aggregated = queue.poll();
-        assertThat(aggregated.getDocumentId(), equalTo("doc:a:type:b"));
+        assertThat(aggregated.getDocumentId(), equalTo("id:a:type::b"));
         assertThat(aggregated.getDetails().size(), is(4));
         assertThat(aggregated.getDetails().get(0).getEndpoint().getHostname(), equalTo("a"));
         assertThat(aggregated.getDetails().get(1).getEndpoint().getHostname(), equalTo("b"));
@@ -107,7 +107,7 @@ public class OperationProcessorTest {
 
         //check a, b, c, d
         aggregated = queue.poll();
-        assertThat(aggregated.getDocumentId(), equalTo("doc:a:type:b2"));
+        assertThat(aggregated.getDocumentId(), equalTo("id:a:type::b2"));
         assertThat(aggregated.getDetails().size(), is(4));
         assertThat(aggregated.getDetails().get(0).getEndpoint().getHostname(), equalTo("a"));
         assertThat(aggregated.getDetails().get(1).getEndpoint().getHostname(), equalTo("b"));
@@ -203,7 +203,7 @@ public class OperationProcessorTest {
 
         Queue<Document> documentQueue = new ArrayDeque<>();
         for (int x = 0; x < 100; x++) {
-            Document document = new Document("doc:a:type:b", null, String.valueOf(x), null);
+            Document document = new Document("id:a:type::b", null, String.valueOf(x), null);
             operationProcessor.sendDocument(document);
             documentQueue.add(document);
         }
diff --git a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java b/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java
index f791ea971c9..7497b6c941c 100644
--- a/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java
+++ b/vespa_feed_perf/src/test/java/com/yahoo/vespa/feed/perf/SimpleFeederTest.java
@@ -39,13 +39,13 @@ public class SimpleFeederTest {
     @Test
     public void requireThatXMLFeederWorks() throws Throwable {
         assertFeed("<vespafeed>" +
-                   "    <document documenttype='simple' documentid='id:scheme:simple:0'>" +
+                   "    <document documenttype='simple' documentid='id:scheme:simple::0'>" +
                    "        <my_str>foo</my_str>" +
                    "    </document>" +
-                   "    <update documenttype='simple' documentid='id:scheme:simple:1'>" +
+                   "    <update documenttype='simple' documentid='id:scheme:simple::1'>" +
                    "        <assign field='my_str'>bar</assign>" +
                    "    </update>" +
-                   "    <remove documenttype='simple' documentid='id:scheme:simple:2'/>" +
+                   "    <remove documenttype='simple' documentid='id:scheme:simple::2'/>" +
                    "</vespafeed>",
                    new MessageHandler() {
 
diff --git a/vespaclient-java/src/test/files/myfeed.xml b/vespaclient-java/src/test/files/myfeed.xml
index 3fe01a6e9bf..7011089f340 100644
--- a/vespaclient-java/src/test/files/myfeed.xml
+++ b/vespaclient-java/src/test/files/myfeed.xml
@@ -1,6 +1,6 @@
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <vespafeed>
-    <document documentid="id:test:news:foo" documenttype="news"/>
-    <update documentid="id:test:news:foo" documenttype="news"/>
-    <remove documentid="id:test:news:foo"/>
+    <document documentid="id:test:news::foo" documenttype="news"/>
+    <update documentid="id:test:news::foo" documenttype="news"/>
+    <remove documentid="id:test:news::foo"/>
 </vespafeed>
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java
index a0471ceae7b..44083ab74a9 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java
@@ -158,11 +158,11 @@ public class VespaFeederTestCase {
 
         assertEquals(3, f.sessionFactory.messages.size());
         assertEquals(DocumentProtocol.Priority.LOW_1, ((PutDocumentMessage)f.sessionFactory.messages.get(0)).getPriority());
-        assertEquals("id:test:news:foo", ((PutDocumentMessage) f.sessionFactory.messages.get(0)).getDocumentPut().getDocument().getId().toString());
+        assertEquals("id:test:news::foo", ((PutDocumentMessage) f.sessionFactory.messages.get(0)).getDocumentPut().getDocument().getId().toString());
         DocumentUpdate update = ((UpdateDocumentMessage) f.sessionFactory.messages.get(1)).getDocumentUpdate();
-        assertEquals("id:test:news:foo", update.getId().toString());
+        assertEquals("id:test:news::foo", update.getId().toString());
         assertFalse(update.getCreateIfNonExistent());
-        assertEquals("id:test:news:foo", ((RemoveDocumentMessage) f.sessionFactory.messages.get(2)).getDocumentId().toString());
+        assertEquals("id:test:news::foo", ((RemoveDocumentMessage) f.sessionFactory.messages.get(2)).getDocumentId().toString());
 
         assertTrue(f.outputStream.toString().contains("Messages sent to vespa"));
     }