Revert "doc: -> id:"

4 files changed, 55 insertions, 55 deletions

diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
index 6e975a707cc..e33dbfe8898 100644..100755
--- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
@@ -338,7 +338,7 @@ public class VespaXMLReaderTestCase {
 
         // empty string
         FeedOperation op = parser.read();
-        assertEquals("id:ns:news::http://news6b", op.getDocument().getId().toString());
+        assertEquals("doc:news:http://news6b", op.getDocument().getId().toString());
 
         // int array with text
         try {
@@ -397,7 +397,7 @@ public class VespaXMLReaderTestCase {
         }
 
         op = parser.read();
-        assertEquals("id:ns:news::http://news6j", op.getDocument().getId().toString());
+        assertEquals("doc:news:http://news6j", op.getDocument().getId().toString());
 
         op = parser.read();
         assertEquals(FeedOperation.Type.INVALID, op.getType());
@@ -514,13 +514,13 @@ public class VespaXMLReaderTestCase {
             FeedOperation op = parser.read();
 
             assertEquals(FeedOperation.Type.REMOVE, op.getType());
-            assertEquals("id:ns:news::http://news9a", op.getRemove().toString());
+            assertEquals("doc:news:http://news9a", op.getRemove().toString());
         }
         {
             FeedOperation op = parser.read();
 
             assertEquals(FeedOperation.Type.REMOVE, op.getType());
-            assertEquals("id:ns:news::http://news9b", op.getRemove().toString());
+            assertEquals("doc:news:http://news9b", op.getRemove().toString());
         }
         {
             // Remove without documentid. Not supported.
@@ -648,7 +648,7 @@ public class VespaXMLReaderTestCase {
         }
         {
             FeedOperation op = parser.read();
-            assertEquals("id:ns:news::http://news10e", op.getRemove().toString());
+            assertEquals("doc:news:http://news10e", op.getRemove().toString());
         }
         {
             // Illegal remove without documentid attribute
@@ -773,7 +773,7 @@ public class VespaXMLReaderTestCase {
             RemoveFieldPathUpdate ass = (RemoveFieldPathUpdate)updates.next();
             assertEquals("bytearr", ass.getOriginalFieldPath());
         }
-        Document doc = new Document(manager.getDocumentType("news"), new DocumentId("id:ns:news::test"));
+        Document doc = new Document(manager.getDocumentType("news"), new DocumentId("doc:test:test:test"));
         docUpdate.applyTo(doc);
     }
 
@@ -798,7 +798,7 @@ public class VespaXMLReaderTestCase {
         Document doc = op.getDocument();
 
         assertEquals("outerdoc", doc.getDataType().getName());
-        assertEquals("id:outer:outerdoc::this:is:outer:doc", doc.getId().toString());
+        assertEquals("doc:outer:this:is:outer:doc", doc.getId().toString());
         assertEquals(1, doc.getFieldCount());
 
         Array lst = (Array)doc.getFieldValue("innerdocuments");
@@ -833,7 +833,7 @@ public class VespaXMLReaderTestCase {
         String input =
                 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
                         "<vespafeed>\n" +
-                        "    <document documenttype=\"foo\" documentid=\"id:ns:foo::baz\"> \n" +
+                        "    <document documenttype=\"foo\" documentid=\"doc:foo:bar:baz\"> \n" +
                         "        <title binaryencoding=\"base64\">testTitle</title>\n" +
                         "    </document>\n" +
                         "</vespafeed>\n";
@@ -854,7 +854,7 @@ public class VespaXMLReaderTestCase {
         String input =
                 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
                         "<vespafeed>\n" +
-                        "    <document documenttype=\"foo\" documentid=\"id:ns:foo::baz\"> \n" +
+                        "    <document documenttype=\"foo\" documentid=\"doc:foo:bar:baz\"> \n" +
                         "        <title>test\uFDDFTitle</title>\n" +
                         "    </document>\n" +
                         "</vespafeed>\n";
diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlFieldReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlFieldReaderTestCase.java
index 29621426a85..99960b205b0 100644
--- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlFieldReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlFieldReaderTestCase.java
@@ -41,21 +41,21 @@ public class VespaXmlFieldReaderTestCase {
     public void requireThatArrayItemDeserializeExceptionIncludesFieldName() throws Exception {
         assertThrows(new Field("my_field", DataType.getArray(DataType.BYTE)),
                      "<item>-129</item>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 74)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 70)");
     }
 
     @Test
     public void requireThatMapKeyDeserializeExceptionIncludesFieldName() throws Exception {
         assertThrows(new Field("my_field", DataType.getMap(DataType.BYTE, DataType.STRING)),
                      "<item><key>-129</key><value>foo</value></item>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 78)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 74)");
     }
 
     @Test
     public void requireThatMapValueDeserializeExceptionIncludesFieldName() throws Exception {
         assertThrows(new Field("my_field", DataType.getMap(DataType.STRING, DataType.BYTE)),
                      "<item><key>foo</key><value>-129</value></item>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 96)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 92)");
     }
 
     @Test
@@ -64,14 +64,14 @@ public class VespaXmlFieldReaderTestCase {
         structType.addField(new Field("my_byte", DataType.BYTE));
         assertThrows(new Field("my_field", structType),
                      "<my_byte>-129</my_byte>",
-                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 80)");
+                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 76)");
     }
 
     @Test
     public void requireThatWSetItemDeserializeExceptionIncludesFieldName() throws Exception {
         assertThrows(new Field("my_field", DataType.getWeightedSet(DataType.BYTE)),
                      "<item>-129</item>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 74)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 70)");
     }
 
     @Test
@@ -141,10 +141,10 @@ public class VespaXmlFieldReaderTestCase {
         docType.addField(field);
         docManager.register(docType);
 
-        String documentXml = "<document id='id:ns:my_type::' type='my_type'><" + field.getName() + ">" +
+        String documentXml = "<document id='doc:scheme:' type='my_type'><" + field.getName() + ">" +
                              fieldXml + "</" + field.getName() + "></document>";
         InputStream in = new ByteArrayInputStream(documentXml.getBytes(StandardCharsets.UTF_8));
-        Document doc = new Document(docType, "id:ns:my_type::");
+        Document doc = new Document(docType, "doc:scheme:");
         try {
             new VespaXMLFieldReader(in, docManager).read(null, doc);
             fail();
@@ -155,11 +155,11 @@ public class VespaXmlFieldReaderTestCase {
 
     private static void assertReadable(Predicate predicate) throws Exception {
         assertRead(predicate,
-                   "<document id='id:ns:my_type::' type='my_type'>" +
+                   "<document id='doc:scheme:' type='my_type'>" +
                    "  <my_predicate>" + predicate + "</my_predicate>" +
                    "</document>");
         assertRead(predicate,
-                   "<document id='id:ns:my_type::' type='my_type'>" +
+                   "<document id='doc:scheme:' type='my_type'>" +
                    "  <my_predicate binaryencoding='base64'>" +
                    Base64.encodeBase64String(BinaryFormat.encode(predicate)) +
                    "  </my_predicate>" +
@@ -173,7 +173,7 @@ public class VespaXmlFieldReaderTestCase {
         docManager.register(docType);
 
         InputStream in = new ByteArrayInputStream(documentXml.getBytes(StandardCharsets.UTF_8));
-        Document doc = new Document(docType, "id:ns:my_type::");
+        Document doc = new Document(docType, "doc:scheme:");
         new VespaXMLFieldReader(in, docManager).read(null, doc);
         FieldValue value = doc.getFieldValue("my_predicate");
         assertTrue(value instanceof PredicateFieldValue);
diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlUpdateReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlUpdateReaderTestCase.java
index a6e14f25bea..424e8bb1bca 100644
--- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlUpdateReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXmlUpdateReaderTestCase.java
@@ -79,7 +79,7 @@ public class VespaXmlUpdateReaderTestCase {
     public void requireThatDeserializeExceptionIncludesFieldName() throws Exception {
         assertThrows(new Field("my_field", DataType.BYTE),
                      "<assign field='my_field'>-129</assign>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 82)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 79)");
     }
 
     @Test
@@ -87,19 +87,19 @@ public class VespaXmlUpdateReaderTestCase {
         Field field = new Field("my_field", DataType.getArray(DataType.BYTE));
         assertThrows(field,
                      "<assign field='my_field'><item>-129</item></assign>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 86)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 83)");
         assertThrows(field,
                      "<assign fieldpath='my_field'><item>-129</item></assign>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 90)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 87)");
         assertThrows(field,
                      "<add field='my_field'><item>-129</item></add>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 83)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 80)");
         assertThrows(field,
                      "<add fieldpath='my_field'><item>-129</item></add>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 87)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 84)");
         assertThrows(field,
                      "<remove field='my_field'><item>-129</item></remove>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 86)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 83)");
     }
 
     @Test
@@ -107,19 +107,19 @@ public class VespaXmlUpdateReaderTestCase {
         Field field = new Field("my_field", DataType.getMap(DataType.BYTE, DataType.STRING));
         assertThrows(field,
                      "<assign field='my_field'><item><key>-129</key><value>foo</value></item></assign>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 90)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 87)");
         assertThrows(field,
                      "<assign fieldpath='my_field'><item><key>-129</key><value>foo</value></item></assign>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 94)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 91)");
         assertThrows(field,
                      "<add field='my_field'><item><key>-129</key><value>foo</value></item></add>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 87)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 84)");
         assertThrows(field,
                      "<add fieldpath='my_field'><item><key>-129</key><value>foo</value></item></add>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 91)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 88)");
         assertThrows(field,
                      "<remove field='my_field'><item><key>-129</key><value>foo</value></item></remove>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 90)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 87)");
         try {
             readUpdate(field, "<remove fieldpath='my_field{-129}' />");
             fail();
@@ -133,19 +133,19 @@ public class VespaXmlUpdateReaderTestCase {
         Field field = new Field("my_field", DataType.getMap(DataType.STRING, DataType.BYTE));
         assertThrows(field,
                      "<assign field='my_field'><item><key>foo</key><value>-129</value></item></assign>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 108)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 105)");
         assertThrows(field,
                      "<assign fieldpath='my_field'><item><key>foo</key><value>-129</value></item></assign>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 112)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 109)");
         assertThrows(field,
                      "<add field='my_field'><item><key>foo</key><value>-129</value></item></add>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 105)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 102)");
         assertThrows(field,
                      "<add fieldpath='my_field'><item><key>foo</key><value>-129</value></item></add>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 109)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 106)");
         assertThrows(field,
                      "<remove field='my_field'><item><key>foo</key><value>-129</value></item></remove>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 108)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 105)");
     }
 
     @Test
@@ -155,19 +155,19 @@ public class VespaXmlUpdateReaderTestCase {
         Field field = new Field("my_field", structType);
         assertThrows(field,
                      "<assign field='my_field'><my_byte>-129</my_byte></assign>",
-                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 92)");
+                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 89)");
         assertThrows(field,
                      "<assign fieldpath='my_field'><my_byte>-129</my_byte></assign>",
-                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 96)");
+                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 93)");
         assertThrows(field,
                      "<add field='my_field'><my_byte>-129</my_byte></add>",
-                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 89)");
+                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 86)");
         assertThrows(field,
                      "<add fieldpath='my_field'><my_byte>-129</my_byte></add>",
-                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 93)");
+                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 90)");
         assertThrows(field,
                      "<remove field='my_field'><my_byte>-129</my_byte></remove>",
-                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 92)");
+                     "Field 'my_byte': Invalid byte \"-129\". (at line 1, column 89)");
     }
 
     @Test
@@ -175,19 +175,19 @@ public class VespaXmlUpdateReaderTestCase {
         Field field = new Field("my_field", DataType.getWeightedSet(DataType.BYTE));
         assertThrows(field,
                      "<assign field='my_field'><item>-129</item></assign>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 86)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 83)");
         assertThrows(field,
                      "<assign fieldpath='my_field'><item>-129</item></assign>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 90)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 87)");
         assertThrows(field,
                      "<add field='my_field'><item>-129</item></add>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 83)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 80)");
         assertThrows(field,
                      "<add fieldpath='my_field'><item>-129</item></add>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 87)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 84)");
         assertThrows(field,
                      "<remove field='my_field'><item>-129</item></remove>",
-                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 86)");
+                     "Field 'my_field': Invalid byte \"-129\". (at line 1, column 83)");
         try {
             readUpdate(field, "<remove fieldpath='my_field{-129}' />");
             fail();
@@ -206,12 +206,12 @@ public class VespaXmlUpdateReaderTestCase {
 
     @Test
     public void requireThatCreateIfNonExistentFlagIsValidated() throws Exception {
-        String documentXml = "<update id='id:ns:my_doc::' type='my_type' create-if-non-existent='illegal'></update>";
+        String documentXml = "<update id='doc:scheme:' type='my_type' create-if-non-existent='illegal'></update>";
         try {
             readUpdateHelper(null, documentXml);
             fail();
         } catch (DeserializationException e) {
-            assertEquals(printStackTrace(e), "'create-if-non-existent' must be either 'true' or 'false', was 'illegal' (at line 1, column 77)", e.getMessage());
+            assertEquals(printStackTrace(e), "'create-if-non-existent' must be either 'true' or 'false', was 'illegal' (at line 1, column 74)", e.getMessage());
         }
     }
 
@@ -231,12 +231,12 @@ public class VespaXmlUpdateReaderTestCase {
     }
 
     private static DocumentUpdate readUpdate(Field field, String fieldXml) throws Exception {
-        String documentXml = "<update id='id:ns:my_doc::' type='my_type'>" + fieldXml + "</update>";
+        String documentXml = "<update id='doc:scheme:' type='my_type'>" + fieldXml + "</update>";
         return readUpdateHelper(field, documentXml);
     }
 
     private static DocumentUpdate readUpdate(boolean createIfNonExistent) throws Exception {
-        String documentXml = "<update id='id:ns:my_doc::' type='my_type' create-if-non-existent='" + (createIfNonExistent ? "true" : "false") + "'></update>";
+        String documentXml = "<update id='doc:scheme:' type='my_type' create-if-non-existent='" + (createIfNonExistent ? "true" : "false") + "'></update>";
         return readUpdateHelper(null, documentXml);
     }
 
@@ -249,7 +249,7 @@ public class VespaXmlUpdateReaderTestCase {
         docManager.register(docType);
 
         InputStream in = new ByteArrayInputStream(documentXml.getBytes(StandardCharsets.UTF_8));
-        DocumentUpdate doc = new DocumentUpdate(docType, "id:ns:my_doc::");
+        DocumentUpdate doc = new DocumentUpdate(docType, "doc:scheme:");
         VespaXMLUpdateReader reader = new VespaXMLUpdateReader(in, docManager);
         reader.reader.next(); // initialize reader
         reader.read(doc);
diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java
index 298960ff8ba..73984f1746c 100644
--- a/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/XMLNumericFieldErrorMsgTestCase.java
@@ -38,7 +38,7 @@ public class XMLNumericFieldErrorMsgTestCase {
         DocumentTypeManager dtm = setupTypes();
         try {
             VespaXMLDocumentReader documentReader = new VespaXMLDocumentReader(
-                    new ByteArrayInputStream(("<document id=\"id:ns:doctype::bar\" type=\"doctype\">" +
+                    new ByteArrayInputStream(("<document id=\"doc:foo:bar\" type=\"doctype\">" +
                                               "  <floatfield></floatfield>" +
                                               "</document>").getBytes(StandardCharsets.UTF_8)), dtm);
             new Document(documentReader);
@@ -53,7 +53,7 @@ public class XMLNumericFieldErrorMsgTestCase {
         DocumentTypeManager dtm = setupTypes();
         try {
             VespaXMLDocumentReader documentReader = new VespaXMLDocumentReader(
-                    new ByteArrayInputStream(("<document id=\"id:ns:doctype::bar\" type=\"doctype\">" +
+                    new ByteArrayInputStream(("<document id=\"doc:foo:bar\" type=\"doctype\">" +
                                               "  <doublefield></doublefield>" +
                                               "</document>").getBytes(StandardCharsets.UTF_8)), dtm);
             new Document(documentReader);
@@ -68,7 +68,7 @@ public class XMLNumericFieldErrorMsgTestCase {
         DocumentTypeManager dtm = setupTypes();
         try {
             VespaXMLDocumentReader documentReader = new VespaXMLDocumentReader(
-                    new ByteArrayInputStream(("<document id=\"id:ns:doctype::bar\" type=\"doctype\">" +
+                    new ByteArrayInputStream(("<document id=\"doc:foo:bar\" type=\"doctype\">" +
                                               "  <longfield></longfield>" +
                                               "</document>").getBytes(StandardCharsets.UTF_8)), dtm);
             new Document(documentReader);
@@ -83,7 +83,7 @@ public class XMLNumericFieldErrorMsgTestCase {
         DocumentTypeManager dtm = setupTypes();
         try {
             VespaXMLDocumentReader documentReader = new VespaXMLDocumentReader(
-                    new ByteArrayInputStream(("<document id=\"id:ns:doctype::bar\" type=\"doctype\">" +
+                    new ByteArrayInputStream(("<document id=\"doc:foo:bar\" type=\"doctype\">" +
                                               "  <intfield></intfield>" +
                                               "</document>").getBytes(StandardCharsets.UTF_8)), dtm);
             new Document(documentReader);
@@ -98,7 +98,7 @@ public class XMLNumericFieldErrorMsgTestCase {
         DocumentTypeManager dtm = setupTypes();
         try {
             VespaXMLDocumentReader documentReader = new VespaXMLDocumentReader(
-                    new ByteArrayInputStream(("<document id=\"id:ns:doctype::bar\" type=\"doctype\">" +
+                    new ByteArrayInputStream(("<document id=\"doc:foo:bar\" type=\"doctype\">" +
                                               "  <bytefield></bytefield>" +
                                               "</document>").getBytes(StandardCharsets.UTF_8)), dtm);
             new Document(documentReader);