doc: -> id:

6 files changed, 56 insertions, 56 deletions

diff --git a/documentapi/src/test/java/com/yahoo/documentapi/local/test/LocalDocumentApiTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/local/test/LocalDocumentApiTestCase.java
index a9f80ef73ad..252bf739951 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/local/test/LocalDocumentApiTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/local/test/LocalDocumentApiTestCase.java
@@ -47,7 +47,7 @@ public class LocalDocumentApiTestCase extends AbstractDocumentApiTestCase {
         AsyncSession session = access.createAsyncSession(new AsyncParameters());
 
         DocumentType type = access.getDocumentTypeManager().getDocumentType("music");
-        DocumentUpdate docUp = new DocumentUpdate(type, new DocumentId("doc:music:2"));
+        DocumentUpdate docUp = new DocumentUpdate(type, new DocumentId("id:ns:music::2"));
 
         Result result = session.update(docUp);
         assertTrue(result.isSuccess());
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java
index 1f8a783d417..3e5daa08bd3 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java
@@ -76,7 +76,7 @@ public class PolicyFactoryTestCase {
     }
 
     private static Message createMessage() {
-        Message msg = new RemoveDocumentMessage(new DocumentId("doc:scheme:"));
+        Message msg = new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::"));
         msg.getTrace().setLevel(9);
         return msg;
     }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
index 53980242f2c..4fd46963ac1 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
@@ -111,7 +111,7 @@ public class PolicyTestCase {
     public void testAND() {
         PolicyTestFrame frame = new PolicyTestFrame(manager);
         frame.setMessage(new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
-                                                             new DocumentId("doc:scheme:")))));
+                                                             new DocumentId("id:ns:testdoc::")))));
         frame.setHop(new HopSpec("test", "[AND]")
                      .addRecipient("foo")
                      .addRecipient("bar"));
@@ -143,14 +143,14 @@ public class PolicyTestCase {
 
     @Test
     public void requireThatExternPolicyWithUnknownPatternSelectsNone() throws Exception {
-        PolicyTestFrame frame = newPutDocumentFrame("doc:scheme:");
+        PolicyTestFrame frame = newPutDocumentFrame("id:ns:testdoc::");
         setupExternPolicy(frame, new Slobrok(), "foo/bar");
         frame.assertSelect(null);
     }
 
     @Test
     public void requireThatExternPolicySelectsFromExternSlobrok() throws Exception {
-        PolicyTestFrame frame = newPutDocumentFrame("doc:scheme:");
+        PolicyTestFrame frame = newPutDocumentFrame("id:ns:testdoc::");
         Slobrok slobrok = new Slobrok();
         List<TestServer> servers = new ArrayList<>();
         for (int i = 0; i < 10; ++i) {
@@ -178,7 +178,7 @@ public class PolicyTestCase {
 
     @Test
     public void requireThatExternPolicyMergesOneReplyAsProtocol() throws Exception {
-        PolicyTestFrame frame = newPutDocumentFrame("doc:scheme:");
+        PolicyTestFrame frame = newPutDocumentFrame("id:ns:testdoc::");
         Slobrok slobrok = new Slobrok();
         TestServer server = new TestServer("docproc/cluster.default/0", null, slobrok,
                                            new DocumentProtocol(manager));
@@ -208,7 +208,7 @@ public class PolicyTestCase {
         DestinationSession ds = dst.mb.createDestinationSession("session", true, new Receptor());
 
         // Send message from local node to remote cluster and resolve route there.
-        Message msg = new RemoveDocumentMessage(new DocumentId("doc:scheme:"));
+        Message msg = new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::"));
         msg.getTrace().setLevel(9);
         msg.setRoute(Route.parse("[Extern:tcp/localhost:" + slobrok.port() + ";itr/session] default"));
 
@@ -246,7 +246,7 @@ public class PolicyTestCase {
         Receptor dstHandler = new Receptor();
         DestinationSession dstSession = dstServer.mb.createDestinationSession("session", true, dstHandler);
 
-        Message msg = new RemoveDocumentMessage(new DocumentId("doc:scheme:"));
+        Message msg = new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::"));
         msg.setRoute(Route.parse("[Extern:" + spec + ";dst/session]"));
         assertTrue(srcSession.send(msg).isAccepted());
         assertNotNull(msg = dstHandler.getMessage(TIMEOUT));
@@ -267,7 +267,7 @@ public class PolicyTestCase {
         dstHandler = new Receptor();
         dstSession = dstServer.mb.createDestinationSession("session", true, dstHandler);
 
-        msg = new RemoveDocumentMessage(new DocumentId("doc:scheme:"));
+        msg = new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::"));
         msg.setRoute(Route.parse("[Extern:" + spec + ";dst/session]"));
         assertTrue(srcSession.send(msg).isAccepted());
         assertNotNull(msg = dstHandler.getMessage(TIMEOUT));
@@ -289,7 +289,7 @@ public class PolicyTestCase {
         // Test select with proper address.
         PolicyTestFrame frame = new PolicyTestFrame("docproc/cluster.default", manager);
         frame.setMessage(new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
-                                                             new DocumentId("doc:scheme:0")))));
+                                                             new DocumentId("id:ns:testdoc::0")))));
         for (int i = 0; i < 10; ++i) {
             frame.getNetwork().registerSession(i + "/chain.default");
         }
@@ -323,7 +323,7 @@ public class PolicyTestCase {
 
         // Test merge behavior.
         frame.setMessage(new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
-                                                             new DocumentId("doc:scheme:")))));
+                                                             new DocumentId("id:ns:testdoc::")))));
         frame.setHop(new HopSpec("test", "[LocalService]"));
         frame.assertMergeOneReply("*");
 
@@ -334,12 +334,12 @@ public class PolicyTestCase {
     public void testLocalServiceCache() {
         PolicyTestFrame fooFrame = new PolicyTestFrame("docproc/cluster.default", manager);
         HopSpec fooHop = new HopSpec("foo", "docproc/cluster.default/[LocalService]/chain.foo");
-        fooFrame.setMessage(new RemoveDocumentMessage(new DocumentId("doc:scheme:foo")));
+        fooFrame.setMessage(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::foo")));
         fooFrame.setHop(fooHop);
 
         PolicyTestFrame barFrame = new PolicyTestFrame(fooFrame);
         HopSpec barHop = new HopSpec("bar", "docproc/cluster.default/[LocalService]/chain.bar");
-        barFrame.setMessage(new RemoveDocumentMessage(new DocumentId("doc:scheme:bar")));
+        barFrame.setMessage(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::bar")));
         barFrame.setHop(barHop);
 
         fooFrame.getMessageBus().setupRouting(
@@ -368,13 +368,13 @@ public class PolicyTestCase {
         PolicyTestFrame frame = new PolicyTestFrame(manager);
         frame.setHop(new HopSpec("test", getDocumentRouteSelectorRawConfig())
                 .addRecipient("foo").addRecipient("bar"));
-        frame.setMessage(new GetDocumentMessage(new DocumentId("doc:scheme:yarn"), "[all]"));
+        frame.setMessage(new GetDocumentMessage(new DocumentId("id:ns:testdoc::yarn"), "[all]"));
         List<RoutingNode> selected = frame.select(2);
         for (int i = 0, len = selected.size(); i < len; ++i) {
             Document doc = null;
             if (i == 0) {
                 doc = new Document(manager.getDocumentType("testdoc"),
-                                   new DocumentId("doc:scheme:yarn"));
+                                   new DocumentId("id:ns:testdoc::yarn"));
                 doc.setLastModified(123456L);
             }
             GetDocumentReply reply = new GetDocumentReply(null);
@@ -450,7 +450,7 @@ public class PolicyTestCase {
     public void testSubsetService() {
         PolicyTestFrame frame = new PolicyTestFrame("docproc/cluster.default", manager);
         frame.setMessage(new PutDocumentMessage(new DocumentPut(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
-                                                             new DocumentId("doc:scheme:"))))));
+                                                             new DocumentId("id:ns:testdoc::"))))));
 
         // Test requerying for adding nodes.
         frame.setHop(new HopSpec("test", "docproc/cluster.default/[SubsetService:2]/chain.default"));
@@ -509,12 +509,12 @@ public class PolicyTestCase {
     public void testSubsetServiceCache() {
         PolicyTestFrame fooFrame = new PolicyTestFrame("docproc/cluster.default", manager);
         HopSpec fooHop = new HopSpec("foo", "docproc/cluster.default/[SubsetService:2]/chain.foo");
-        fooFrame.setMessage(new RemoveDocumentMessage(new DocumentId("doc:scheme:foo")));
+        fooFrame.setMessage(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::foo")));
         fooFrame.setHop(fooHop);
 
         PolicyTestFrame barFrame = new PolicyTestFrame(fooFrame);
         HopSpec barHop = new HopSpec("bar", "docproc/cluster.default/[SubsetService:2]/chain.bar");
-        barFrame.setMessage(new RemoveDocumentMessage(new DocumentId("doc:scheme:bar")));
+        barFrame.setMessage(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::bar")));
         barFrame.setHop(barHop);
 
         fooFrame.getMessageBus().setupRouting(
@@ -569,19 +569,19 @@ public class PolicyTestCase {
                                          "route[1].selector \"other\"\n" +
                                          "route[1].feed \"myfeed\"\n]").addRecipient("foo").addRecipient("bar"));
 
-        frame.setMessage(new GetDocumentMessage(new DocumentId("doc:scheme:"), "fieldSet"));
+        frame.setMessage(new GetDocumentMessage(new DocumentId("id:ns:testdoc::"), "fieldSet"));
         frame.assertSelect(Arrays.asList("bar", "foo"));
 
         Message put = new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
-                                                          new DocumentId("doc:scheme:"))));
+                                                          new DocumentId("id:ns:testdoc::"))));
         frame.setMessage(put);
         frame.assertSelect(Arrays.asList("foo"));
 
-        frame.setMessage(new RemoveDocumentMessage(new DocumentId("doc:scheme:")));
+        frame.setMessage(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::")));
         frame.assertSelect(Arrays.asList("bar", "foo"));
 
         frame.setMessage(new UpdateDocumentMessage(new DocumentUpdate(manager.getDocumentType("testdoc"),
-                                                                      new DocumentId("doc:scheme:"))));
+                                                                      new DocumentId("id:ns:testdoc::"))));
         frame.assertSelect(Arrays.asList("foo"));
 
         frame.setMessage(put);
@@ -602,10 +602,10 @@ public class PolicyTestCase {
                 "route[1].selector \"(other AND (other.intfield / 1000 > 0))\"\n" +
                 "route[1].feed \"myfeed\"\n]").addRecipient("foo").addRecipient("bar"));
 
-        frame.setMessage(new GetDocumentMessage(new DocumentId("doc:scheme:"), "fieldSet"));
+        frame.setMessage(new GetDocumentMessage(new DocumentId("id:ns:testdoc::"), "fieldSet"));
         frame.assertSelect(Arrays.asList("bar", "foo"));
 
-        Document doc = new Document(manager.getDocumentType("testdoc"), new DocumentId("doc:scheme:"));
+        Document doc = new Document(manager.getDocumentType("testdoc"), new DocumentId("id:ns:testdoc::"));
         doc.setFieldValue("intfield", 3000);
         Message put = new PutDocumentMessage(new DocumentPut(doc));
         frame.setMessage(put);
@@ -636,7 +636,7 @@ public class PolicyTestCase {
         assertEquals(0, reply.getNumErrors());
 
         frame.setMessage(new UpdateDocumentMessage(new DocumentUpdate(manager.getDocumentType("testdoc"),
-                                                                      new DocumentId("doc:scheme:"))));
+                                                                      new DocumentId("id:ns:testdoc::"))));
         frame.assertSelect(Arrays.asList("docproc/cluster.foo"));
 
         frame.destroy();
@@ -646,7 +646,7 @@ public class PolicyTestCase {
     public void testLoadBalancer() {
         PolicyTestFrame frame = new PolicyTestFrame("docproc/cluster.default", manager);
         frame.setMessage(new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
-                                                             new DocumentId("doc:scheme:")))));
+                                                             new DocumentId("id:ns:testdoc::")))));
         frame.getNetwork().registerSession("0/chain.default");
         assertTrue(frame.waitSlobrok("docproc/cluster.default/*/chain.default", 1));
         frame.setHop(new HopSpec("test", "[LoadBalancer:cluster=docproc/cluster.default;session=chain.default]"));
@@ -659,7 +659,7 @@ public class PolicyTestCase {
         // Test select with proper address.
         PolicyTestFrame frame = new PolicyTestFrame("docproc/cluster.default", manager);
         frame.setMessage(new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
-                                                             new DocumentId("doc:scheme:")))));
+                                                             new DocumentId("id:ns:testdoc::")))));
         for (int i = 0; i < 10; ++i) {
             frame.getNetwork().registerSession(i + "/chain.default");
         }
@@ -693,12 +693,12 @@ public class PolicyTestCase {
     public void testRoundRobinCache() {
         PolicyTestFrame fooFrame = new PolicyTestFrame("docproc/cluster.default", manager);
         HopSpec fooHop = new HopSpec("foo", "[RoundRobin]").addRecipient("docproc/cluster.default/0/chain.foo");
-        fooFrame.setMessage(new RemoveDocumentMessage(new DocumentId("doc:scheme:foo")));
+        fooFrame.setMessage(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::foo")));
         fooFrame.setHop(fooHop);
 
         PolicyTestFrame barFrame = new PolicyTestFrame(fooFrame);
         HopSpec barHop = new HopSpec("bar", "[RoundRobin]").addRecipient("docproc/cluster.default/0/chain.bar");
-        barFrame.setMessage(new RemoveDocumentMessage(new DocumentId("doc:scheme:bar")));
+        barFrame.setMessage(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::bar")));
         barFrame.setHop(barHop);
 
         fooFrame.getMessageBus().setupRouting(
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/Simulator.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/Simulator.java
index f0e31295d3f..68405b002c8 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/Simulator.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/Simulator.java
@@ -168,7 +168,7 @@ public abstract class Simulator extends StoragePolicyTestEnvironment {
             String docId[] = new String[params.getParallellRequests()];
             RoutingNode targets[] = new RoutingNode[params.getParallellRequests()];
             for (int i=0; i<params.getParallellRequests(); ++i) {
-                docId[i] = "doc:ns:" + (step * params.getParallellRequests() + i);
+                docId[i] = "id:ns:testdoc::" + (step * params.getParallellRequests() + i);
                 frame.setMessage(createMessage(docId[i]));
                 targets[i] = select();
             }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java
index 161c06bce27..9d0011ef05d 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java
@@ -1106,7 +1106,7 @@ public class MessageBusVisitorSessionTestCase {
         mc.executor.expectAndProcessTasks(1);
 
         // Send a remove (so we don't have to create a new doc instance)
-        mc.receiver.send(new RemoveDocumentMessage(new DocumentId("doc:foo:bar")));
+        mc.receiver.send(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::bar")));
         mc.executor.expectAndProcessTasks(1);
 
         // Not yet ACKed
@@ -1868,7 +1868,7 @@ public class MessageBusVisitorSessionTestCase {
 
         mc.sender.getAndRemoveMessage(0);
         // Make a bogus reply that we never asked for
-        RemoveDocumentMessage msg = new RemoveDocumentMessage(new DocumentId("doc:foo:bar"));
+        RemoveDocumentMessage msg = new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::bar"));
         DocumentReply reply = msg.createReply();
         mc.sender.reply(reply);
 
@@ -1936,7 +1936,7 @@ public class MessageBusVisitorSessionTestCase {
         mc.visitorSession.start();
         mc.executor.expectAndProcessTasks(1);
 
-        mc.receiver.send(new RemoveDocumentMessage(new DocumentId("doc:foo:bar")));
+        mc.receiver.send(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::bar")));
         mc.executor.expectAndProcessTasks(1);
         assertEquals(1, mc.dataHandler.getMessages().size());
 
@@ -2082,7 +2082,7 @@ public class MessageBusVisitorSessionTestCase {
         mc.visitorSession.start();
         mc.executor.expectAndProcessTasks(1);
 
-        mc.receiver.send(new RemoveDocumentMessage(new DocumentId("doc:foo:bar")));
+        mc.receiver.send(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::bar")));
         mc.executor.expectAndProcessTasks(1);
         assertEquals(1, mc.dataHandler.getMessages().size());
 
@@ -2442,7 +2442,7 @@ public class MessageBusVisitorSessionTestCase {
         mc.visitorSession.start();
         mc.executor.expectAndProcessTasks(1);
 
-        mc.receiver.send(new RemoveDocumentMessage(new DocumentId("doc:foo:bar")));
+        mc.receiver.send(new RemoveDocumentMessage(new DocumentId("id:ns:testdoc::bar")));
         mc.executor.expectAndProcessTasks(1);
 
         assertEquals("RemoveDocumentReply(APP_FATAL_ERROR: Visitor data with no local data destination)\n",
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/test/AbstractDocumentApiTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/test/AbstractDocumentApiTestCase.java
index 97d60c3bc4b..79309907715 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/test/AbstractDocumentApiTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/test/AbstractDocumentApiTestCase.java
@@ -46,21 +46,21 @@ public abstract class AbstractDocumentApiTestCase {
         SyncSession session = access().createSyncSession(new SyncParameters.Builder().build());
 
         DocumentType type = access().getDocumentTypeManager().getDocumentType("music");
-        Document doc1 = new Document(type, new DocumentId("doc:music:1"));
-        Document doc2 = new Document(type, new DocumentId("doc:music:2"));
+        Document doc1 = new Document(type, new DocumentId("id:ns:music::1"));
+        Document doc2 = new Document(type, new DocumentId("id:ns:music::2"));
 
         session.put(new DocumentPut(doc1));
         session.put(new DocumentPut(doc2));
-        assertEquals(doc1, session.get(new DocumentId("doc:music:1")));
-        assertEquals(doc2, session.get(new DocumentId("doc:music:2")));
+        assertEquals(doc1, session.get(new DocumentId("id:ns:music::1")));
+        assertEquals(doc2, session.get(new DocumentId("id:ns:music::2")));
 
-        session.remove(new DocumentRemove(new DocumentId("doc:music:1")));
-        assertNull(session.get(new DocumentId("doc:music:1")));
-        assertEquals(doc2, session.get(new DocumentId("doc:music:2")));
+        session.remove(new DocumentRemove(new DocumentId("id:ns:music::1")));
+        assertNull(session.get(new DocumentId("id:ns:music::1")));
+        assertEquals(doc2, session.get(new DocumentId("id:ns:music::2")));
 
-        session.remove(new DocumentRemove(new DocumentId("doc:music:2")));
-        assertNull(session.get(new DocumentId("doc:music:1")));
-        assertNull(session.get(new DocumentId("doc:music:2")));
+        session.remove(new DocumentRemove(new DocumentId("id:ns:music::2")));
+        assertNull(session.get(new DocumentId("id:ns:music::1")));
+        assertNull(session.get(new DocumentId("id:ns:music::2")));
 
         session.destroy();
     }
@@ -71,8 +71,8 @@ public abstract class AbstractDocumentApiTestCase {
         HashMap<Long, Response> results = new LinkedHashMap<>();
         Result result;
         DocumentType type = access().getDocumentTypeManager().getDocumentType("music");
-        Document doc1 = new Document(type, new DocumentId("doc:music:1"));
-        Document doc2 = new Document(type, new DocumentId("doc:music:2"));
+        Document doc1 = new Document(type, new DocumentId("id:ns:music::1"));
+        Document doc2 = new Document(type, new DocumentId("id:ns:music::2"));
 
         result = session.put(doc1);
         assertTrue(result.isSuccess());
@@ -84,37 +84,37 @@ public abstract class AbstractDocumentApiTestCase {
         List<Response> responses = new ArrayList<>();
         waitForAcks(session, 2, responses);
 
-        result = session.get(new DocumentId("doc:music:1"));
+        result = session.get(new DocumentId("id:ns:music::1"));
         assertTrue(result.isSuccess());
         results.put(result.getRequestId(), new DocumentResponse(result.getRequestId(), doc1));
-        result = session.get(new DocumentId("doc:music:2"));
+        result = session.get(new DocumentId("id:ns:music::2"));
         assertTrue(result.isSuccess());
         results.put(result.getRequestId(), new DocumentResponse(result.getRequestId(), doc2));
         // These Gets shall observe the ACKed Puts sent for the same document IDs.
         waitForAcks(session, 2, responses);
 
-        result = session.remove(new DocumentId("doc:music:1"));
+        result = session.remove(new DocumentId("id:ns:music::1"));
         assertTrue(result.isSuccess());
         results.put(result.getRequestId(), new Response(result.getRequestId()));
         waitForAcks(session, 1, responses);
 
-        result = session.get(new DocumentId("doc:music:1"));
+        result = session.get(new DocumentId("id:ns:music::1"));
         assertTrue(result.isSuccess());
         results.put(result.getRequestId(), new DocumentResponse(result.getRequestId()));
-        result = session.get(new DocumentId("doc:music:2"));
+        result = session.get(new DocumentId("id:ns:music::2"));
         assertTrue(result.isSuccess());
         results.put(result.getRequestId(), new DocumentResponse(result.getRequestId(), doc2));
         waitForAcks(session, 2, responses);
 
-        result = session.remove(new DocumentId("doc:music:2"));
+        result = session.remove(new DocumentId("id:ns:music::2"));
         assertTrue(result.isSuccess());
         results.put(result.getRequestId(), new Response(result.getRequestId()));
         waitForAcks(session, 1, responses);
 
-        result = session.get(new DocumentId("doc:music:1"));
+        result = session.get(new DocumentId("id:ns:music::1"));
         assertTrue(result.isSuccess());
         results.put(result.getRequestId(), new DocumentResponse(result.getRequestId()));
-        result = session.get(new DocumentId("doc:music:2"));
+        result = session.get(new DocumentId("id:ns:music::2"));
         assertTrue(result.isSuccess());
         results.put(result.getRequestId(), new DocumentResponse(result.getRequestId()));
         waitForAcks(session, 2, responses);
@@ -132,7 +132,7 @@ public abstract class AbstractDocumentApiTestCase {
         MyHandler handler = new MyHandler();
         AsyncSession session = access().createAsyncSession(new AsyncParameters().setResponseHandler(handler));
         DocumentType type = access().getDocumentTypeManager().getDocumentType("music");
-        Document doc1 = new Document(type, new DocumentId("doc:music:1"));
+        Document doc1 = new Document(type, new DocumentId("id:ns:music::1"));
         assertTrue(session.put(doc1).isSuccess());
         assertTrue(handler.latch.await(60, TimeUnit.SECONDS));
         assertNotNull(handler.response);