From 1b052ad7d9c97297504f246276f4d60114d53e07 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 16 Aug 2019 11:39:21 +0200 Subject: doc: -> id: --- .../local/test/LocalDocumentApiTestCase.java | 2 +- .../protocol/test/PolicyFactoryTestCase.java | 2 +- .../messagebus/protocol/test/PolicyTestCase.java | 54 +++++++++++----------- .../protocol/test/storagepolicy/Simulator.java | 2 +- .../test/MessageBusVisitorSessionTestCase.java | 10 ++-- .../test/AbstractDocumentApiTestCase.java | 42 ++++++++--------- 6 files changed, 56 insertions(+), 56 deletions(-) (limited to 'documentapi/src') 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 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 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 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 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); -- cgit v1.2.3