Remove document::UrlDataType from backend.

9 files changed, 99 insertions, 229 deletions

diff --git a/document/src/tests/CMakeLists.txt b/document/src/tests/CMakeLists.txt
index 5e1e8024935..108ceb6ae24 100644
--- a/document/src/tests/CMakeLists.txt
+++ b/document/src/tests/CMakeLists.txt
@@ -29,7 +29,6 @@ vespa_add_executable(document_gtest_runner_app TEST
     testdocmantest.cpp
     teststringutil.cpp
     testxml.cpp
-    urltypetest.cpp
     weightedsetfieldvaluetest.cpp
     DEPENDS
     document
diff --git a/document/src/tests/data/inheritancetest.cfg b/document/src/tests/data/inheritancetest.cfg
index 127ececd217..4278909633f 100644
--- a/document/src/tests/data/inheritancetest.cfg
+++ b/document/src/tests/data/inheritancetest.cfg
@@ -171,7 +171,7 @@ documenttype[2].datatype[4].sstruct.field[07].name "summaryfeatures"
 documenttype[2].datatype[4].sstruct.field[08].datatype 2
 documenttype[2].datatype[4].sstruct.field[08].id 567626448
 documenttype[2].datatype[4].sstruct.field[08].name "title"
-documenttype[2].datatype[4].sstruct.field[09].datatype 111553393
+documenttype[2].datatype[4].sstruct.field[09].datatype 10
 documenttype[2].datatype[4].sstruct.field[09].id 2119414873
 documenttype[2].datatype[4].sstruct.field[09].name "url"
 documenttype[2].datatype[4].sstruct.field[10].datatype 0
diff --git a/document/src/tests/struct_anno/documentmanager.cfg b/document/src/tests/struct_anno/documentmanager.cfg
deleted file mode 100644
index fec3f3587aa..00000000000
--- a/document/src/tests/struct_anno/documentmanager.cfg
+++ /dev/null
@@ -1,97 +0,0 @@
-doctype[3]
-doctype[0].name "document"
-doctype[0].idx 10000
-doctype[0].contentstruct 10001
-doctype[0].primitivetype[0].idx 10002
-doctype[0].primitivetype[0].internalid 0
-doctype[0].primitivetype[0].name "int"
-doctype[0].primitivetype[1].idx 10003
-doctype[0].primitivetype[1].internalid 5
-doctype[0].primitivetype[1].name "double"
-doctype[0].primitivetype[2].idx 10004
-doctype[0].primitivetype[2].internalid 2
-doctype[0].primitivetype[2].name "string"
-doctype[0].annotationtype[0].idx 10005
-doctype[0].annotationtype[0].name "proximity_break"
-doctype[0].annotationtype[0].internalid 8
-doctype[0].annotationtype[0].datatype 10003
-doctype[0].annotationtype[1].idx 10006
-doctype[0].annotationtype[1].name "normalized"
-doctype[0].annotationtype[1].internalid 4
-doctype[0].annotationtype[1].datatype 10004
-doctype[0].annotationtype[2].idx 10007
-doctype[0].annotationtype[2].name "reading"
-doctype[0].annotationtype[2].internalid 5
-doctype[0].annotationtype[2].datatype 10004
-doctype[0].annotationtype[3].idx 10008
-doctype[0].annotationtype[3].name "term"
-doctype[0].annotationtype[3].internalid 1
-doctype[0].annotationtype[3].datatype 10004
-doctype[0].annotationtype[4].idx 10009
-doctype[0].annotationtype[4].name "transformed"
-doctype[0].annotationtype[4].internalid 7
-doctype[0].annotationtype[4].datatype 10004
-doctype[0].annotationtype[5].idx 10010
-doctype[0].annotationtype[5].name "canonical"
-doctype[0].annotationtype[5].internalid 3
-doctype[0].annotationtype[5].datatype 10004
-doctype[0].annotationtype[6].idx 10011
-doctype[0].annotationtype[6].name "token_type"
-doctype[0].annotationtype[6].internalid 2
-doctype[0].annotationtype[6].datatype 10002
-doctype[0].annotationtype[7].idx 10012
-doctype[0].annotationtype[7].name "special_token"
-doctype[0].annotationtype[7].internalid 9
-doctype[0].annotationtype[8].idx 10013
-doctype[0].annotationtype[8].name "stem"
-doctype[0].annotationtype[8].internalid 6
-doctype[0].annotationtype[8].datatype 10004
-doctype[0].structtype[0].idx 10001
-doctype[0].structtype[0].name document.header
-doctype[1].name "simple_def_search"
-doctype[1].idx 10014
-doctype[1].inherits[0].idx 10000
-doctype[1].contentstruct 10015
-doctype[1].structtype[0].idx 10016
-doctype[1].structtype[0].name url
-doctype[1].structtype[0].field[0].name "all"
-doctype[1].structtype[0].field[0].internalid 135568216
-doctype[1].structtype[0].field[0].type 10004
-doctype[1].structtype[0].field[1].name "fragment"
-doctype[1].structtype[0].field[1].internalid 1627287815
-doctype[1].structtype[0].field[1].type 10004
-doctype[1].structtype[0].field[2].name "host"
-doctype[1].structtype[0].field[2].internalid 145719016
-doctype[1].structtype[0].field[2].type 10004
-doctype[1].structtype[0].field[3].name "path"
-doctype[1].structtype[0].field[3].internalid 426212419
-doctype[1].structtype[0].field[3].type 10004
-doctype[1].structtype[0].field[4].name "port"
-doctype[1].structtype[0].field[4].internalid 980088860
-doctype[1].structtype[0].field[4].type 10004
-doctype[1].structtype[0].field[5].name "query"
-doctype[1].structtype[0].field[5].internalid 1326965074
-doctype[1].structtype[0].field[5].type 10004
-doctype[1].structtype[0].field[6].name "scheme"
-doctype[1].structtype[0].field[6].internalid 302257388
-doctype[1].structtype[0].field[6].type 10004
-doctype[1].structtype[1].idx 10015
-doctype[1].structtype[1].name simple_def_search.header
-doctype[1].structtype[1].field[0].name "my_url"
-doctype[1].structtype[1].field[0].internalid 1127377169
-doctype[1].structtype[1].field[0].type 10016
-doctype[1].structtype[1].field[1].name "rankfeatures"
-doctype[1].structtype[1].field[1].internalid 1883197392
-doctype[1].structtype[1].field[1].type 10004
-doctype[1].structtype[1].field[2].name "summaryfeatures"
-doctype[1].structtype[1].field[2].internalid 1840337115
-doctype[1].structtype[1].field[2].type 10004
-doctype[2].name "simple_def"
-doctype[2].idx 10017
-doctype[2].inherits[0].idx 10000
-doctype[2].contentstruct 10018
-doctype[2].structtype[0].idx 10018
-doctype[2].structtype[0].name simple_def.header
-doctype[2].structtype[0].field[0].name "my_url"
-doctype[2].structtype[0].field[0].internalid 1127377169
-doctype[2].structtype[0].field[0].type 10016
diff --git a/document/src/tests/struct_anno/documenttypes.cfg b/document/src/tests/struct_anno/documenttypes.cfg
index 5c5031d077c..dbba579030e 100644
--- a/document/src/tests/struct_anno/documenttypes.cfg
+++ b/document/src/tests/struct_anno/documenttypes.cfg
@@ -6,8 +6,8 @@ documenttype[0].version 0
 documenttype[0].headerstruct -1267268530
 documenttype[0].bodystruct 1968090595
 documenttype[0].inherits[0]
-documenttype[0].datatype[2]
-documenttype[0].datatype[0].id -1267268530
+documenttype[0].datatype[3]
+documenttype[0].datatype[0].id 111553393
 documenttype[0].datatype[0].type STRUCT
 documenttype[0].datatype[0].array.element.id 0
 documenttype[0].datatype[0].map.key.id 0
@@ -16,23 +16,35 @@ documenttype[0].datatype[0].wset.key.id 0
 documenttype[0].datatype[0].wset.createifnonexistent false
 documenttype[0].datatype[0].wset.removeifzero false
 documenttype[0].datatype[0].annotationref.annotation.id 0
-documenttype[0].datatype[0].sstruct.name "simple_def_search.header"
+documenttype[0].datatype[0].sstruct.name "url"
 documenttype[0].datatype[0].sstruct.version 0
 documenttype[0].datatype[0].sstruct.compression.type NONE
 documenttype[0].datatype[0].sstruct.compression.level 0
 documenttype[0].datatype[0].sstruct.compression.threshold 90
 documenttype[0].datatype[0].sstruct.compression.minsize 0
-documenttype[0].datatype[0].sstruct.field[3]
-documenttype[0].datatype[0].sstruct.field[0].name "my_url"
-documenttype[0].datatype[0].sstruct.field[0].id 1127377169
-documenttype[0].datatype[0].sstruct.field[0].datatype 111553393
-documenttype[0].datatype[0].sstruct.field[1].name "rankfeatures"
-documenttype[0].datatype[0].sstruct.field[1].id 1883197392
+documenttype[0].datatype[0].sstruct.field[7]
+documenttype[0].datatype[0].sstruct.field[0].name "all"
+documenttype[0].datatype[0].sstruct.field[0].id 135568216
+documenttype[0].datatype[0].sstruct.field[0].datatype 2
+documenttype[0].datatype[0].sstruct.field[1].name "fragment"
+documenttype[0].datatype[0].sstruct.field[1].id 1627287815
 documenttype[0].datatype[0].sstruct.field[1].datatype 2
-documenttype[0].datatype[0].sstruct.field[2].name "summaryfeatures"
-documenttype[0].datatype[0].sstruct.field[2].id 1840337115
+documenttype[0].datatype[0].sstruct.field[2].name "host"
+documenttype[0].datatype[0].sstruct.field[2].id 145719016
 documenttype[0].datatype[0].sstruct.field[2].datatype 2
-documenttype[0].datatype[1].id 1968090595
+documenttype[0].datatype[0].sstruct.field[3].name "path"
+documenttype[0].datatype[0].sstruct.field[3].id 426212419
+documenttype[0].datatype[0].sstruct.field[3].datatype 2
+documenttype[0].datatype[0].sstruct.field[4].name "port"
+documenttype[0].datatype[0].sstruct.field[4].id 980088860
+documenttype[0].datatype[0].sstruct.field[4].datatype 2
+documenttype[0].datatype[0].sstruct.field[5].name "query"
+documenttype[0].datatype[0].sstruct.field[5].id 1326965074
+documenttype[0].datatype[0].sstruct.field[5].datatype 2
+documenttype[0].datatype[0].sstruct.field[6].name "scheme"
+documenttype[0].datatype[0].sstruct.field[6].id 302257388
+documenttype[0].datatype[0].sstruct.field[6].datatype 2
+documenttype[0].datatype[1].id -1267268530
 documenttype[0].datatype[1].type STRUCT
 documenttype[0].datatype[1].array.element.id 0
 documenttype[0].datatype[1].map.key.id 0
@@ -41,13 +53,38 @@ documenttype[0].datatype[1].wset.key.id 0
 documenttype[0].datatype[1].wset.createifnonexistent false
 documenttype[0].datatype[1].wset.removeifzero false
 documenttype[0].datatype[1].annotationref.annotation.id 0
-documenttype[0].datatype[1].sstruct.name "simple_def_search.body"
+documenttype[0].datatype[1].sstruct.name "simple_def_search.header"
 documenttype[0].datatype[1].sstruct.version 0
 documenttype[0].datatype[1].sstruct.compression.type NONE
 documenttype[0].datatype[1].sstruct.compression.level 0
 documenttype[0].datatype[1].sstruct.compression.threshold 90
 documenttype[0].datatype[1].sstruct.compression.minsize 0
-documenttype[0].datatype[1].sstruct.field[0]
+documenttype[0].datatype[1].sstruct.field[3]
+documenttype[0].datatype[1].sstruct.field[0].name "my_url"
+documenttype[0].datatype[1].sstruct.field[0].id 1127377169
+documenttype[0].datatype[1].sstruct.field[0].datatype 111553393
+documenttype[0].datatype[1].sstruct.field[1].name "rankfeatures"
+documenttype[0].datatype[1].sstruct.field[1].id 1883197392
+documenttype[0].datatype[1].sstruct.field[1].datatype 2
+documenttype[0].datatype[1].sstruct.field[2].name "summaryfeatures"
+documenttype[0].datatype[1].sstruct.field[2].id 1840337115
+documenttype[0].datatype[1].sstruct.field[2].datatype 2
+documenttype[0].datatype[2].id 1968090595
+documenttype[0].datatype[2].type STRUCT
+documenttype[0].datatype[2].array.element.id 0
+documenttype[0].datatype[2].map.key.id 0
+documenttype[0].datatype[2].map.value.id 0
+documenttype[0].datatype[2].wset.key.id 0
+documenttype[0].datatype[2].wset.createifnonexistent false
+documenttype[0].datatype[2].wset.removeifzero false
+documenttype[0].datatype[2].annotationref.annotation.id 0
+documenttype[0].datatype[2].sstruct.name "simple_def_search.body"
+documenttype[0].datatype[2].sstruct.version 0
+documenttype[0].datatype[2].sstruct.compression.type NONE
+documenttype[0].datatype[2].sstruct.compression.level 0
+documenttype[0].datatype[2].sstruct.compression.threshold 90
+documenttype[0].datatype[2].sstruct.compression.minsize 0
+documenttype[0].datatype[2].sstruct.field[0]
 documenttype[0].annotationtype[0]
 documenttype[1].id -1049517126
 documenttype[1].name "simple_def"
@@ -55,8 +92,8 @@ documenttype[1].version 0
 documenttype[1].headerstruct 166307397
 documenttype[1].bodystruct 1008689562
 documenttype[1].inherits[0]
-documenttype[1].datatype[2]
-documenttype[1].datatype[0].id 166307397
+documenttype[1].datatype[3]
+documenttype[1].datatype[0].id 111553393
 documenttype[1].datatype[0].type STRUCT
 documenttype[1].datatype[0].array.element.id 0
 documenttype[1].datatype[0].map.key.id 0
@@ -65,17 +102,35 @@ documenttype[1].datatype[0].wset.key.id 0
 documenttype[1].datatype[0].wset.createifnonexistent false
 documenttype[1].datatype[0].wset.removeifzero false
 documenttype[1].datatype[0].annotationref.annotation.id 0
-documenttype[1].datatype[0].sstruct.name "simple_def.header"
+documenttype[1].datatype[0].sstruct.name "url"
 documenttype[1].datatype[0].sstruct.version 0
 documenttype[1].datatype[0].sstruct.compression.type NONE
 documenttype[1].datatype[0].sstruct.compression.level 0
 documenttype[1].datatype[0].sstruct.compression.threshold 90
 documenttype[1].datatype[0].sstruct.compression.minsize 0
-documenttype[1].datatype[0].sstruct.field[1]
-documenttype[1].datatype[0].sstruct.field[0].name "my_url"
-documenttype[1].datatype[0].sstruct.field[0].id 1127377169
-documenttype[1].datatype[0].sstruct.field[0].datatype 111553393
-documenttype[1].datatype[1].id 1008689562
+documenttype[1].datatype[0].sstruct.field[7]
+documenttype[1].datatype[0].sstruct.field[0].name "all"
+documenttype[1].datatype[0].sstruct.field[0].id 135568216
+documenttype[1].datatype[0].sstruct.field[0].datatype 2
+documenttype[1].datatype[0].sstruct.field[1].name "fragment"
+documenttype[1].datatype[0].sstruct.field[1].id 1627287815
+documenttype[1].datatype[0].sstruct.field[1].datatype 2
+documenttype[1].datatype[0].sstruct.field[2].name "host"
+documenttype[1].datatype[0].sstruct.field[2].id 145719016
+documenttype[1].datatype[0].sstruct.field[2].datatype 2
+documenttype[1].datatype[0].sstruct.field[3].name "path"
+documenttype[1].datatype[0].sstruct.field[3].id 426212419
+documenttype[1].datatype[0].sstruct.field[3].datatype 2
+documenttype[1].datatype[0].sstruct.field[4].name "port"
+documenttype[1].datatype[0].sstruct.field[4].id 980088860
+documenttype[1].datatype[0].sstruct.field[4].datatype 2
+documenttype[1].datatype[0].sstruct.field[5].name "query"
+documenttype[1].datatype[0].sstruct.field[5].id 1326965074
+documenttype[1].datatype[0].sstruct.field[5].datatype 2
+documenttype[1].datatype[0].sstruct.field[6].name "scheme"
+documenttype[1].datatype[0].sstruct.field[6].id 302257388
+documenttype[1].datatype[0].sstruct.field[6].datatype 2
+documenttype[1].datatype[1].id 166307397
 documenttype[1].datatype[1].type STRUCT
 documenttype[1].datatype[1].array.element.id 0
 documenttype[1].datatype[1].map.key.id 0
@@ -84,11 +139,30 @@ documenttype[1].datatype[1].wset.key.id 0
 documenttype[1].datatype[1].wset.createifnonexistent false
 documenttype[1].datatype[1].wset.removeifzero false
 documenttype[1].datatype[1].annotationref.annotation.id 0
-documenttype[1].datatype[1].sstruct.name "simple_def.body"
+documenttype[1].datatype[1].sstruct.name "simple_def.header"
 documenttype[1].datatype[1].sstruct.version 0
 documenttype[1].datatype[1].sstruct.compression.type NONE
 documenttype[1].datatype[1].sstruct.compression.level 0
 documenttype[1].datatype[1].sstruct.compression.threshold 90
 documenttype[1].datatype[1].sstruct.compression.minsize 0
-documenttype[1].datatype[1].sstruct.field[0]
+documenttype[1].datatype[1].sstruct.field[1]
+documenttype[1].datatype[1].sstruct.field[0].name "my_url"
+documenttype[1].datatype[1].sstruct.field[0].id 1127377169
+documenttype[1].datatype[1].sstruct.field[0].datatype 111553393
+documenttype[1].datatype[2].id 1008689562
+documenttype[1].datatype[2].type STRUCT
+documenttype[1].datatype[2].array.element.id 0
+documenttype[1].datatype[2].map.key.id 0
+documenttype[1].datatype[2].map.value.id 0
+documenttype[1].datatype[2].wset.key.id 0
+documenttype[1].datatype[2].wset.createifnonexistent false
+documenttype[1].datatype[2].wset.removeifzero false
+documenttype[1].datatype[2].annotationref.annotation.id 0
+documenttype[1].datatype[2].sstruct.name "simple_def.body"
+documenttype[1].datatype[2].sstruct.version 0
+documenttype[1].datatype[2].sstruct.compression.type NONE
+documenttype[1].datatype[2].sstruct.compression.level 0
+documenttype[1].datatype[2].sstruct.compression.threshold 90
+documenttype[1].datatype[2].sstruct.compression.minsize 0
+documenttype[1].datatype[2].sstruct.field[0]
 documenttype[1].annotationtype[0]
diff --git a/document/src/tests/urltypetest.cpp b/document/src/tests/urltypetest.cpp
deleted file mode 100644
index 5ed8a0c29d2..00000000000
--- a/document/src/tests/urltypetest.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/document/datatype/urldatatype.h>
-#include <gtest/gtest.h>
-
-namespace document {
-
-TEST(UrlTypeTest, requireThatNameIsCorrect)
-{
-    const StructDataType &type = UrlDataType::getInstance();
-    EXPECT_EQ(vespalib::string("url"), type.getName());
-}
-
-TEST(UrlTypeTest, requireThatExpectedFieldsAreThere)
-{
-    const StructDataType &type = UrlDataType::getInstance();
-    Field field = type.getField("all");
-    EXPECT_EQ(*DataType::STRING, field.getDataType());
-
-    field = type.getField("scheme");
-    EXPECT_EQ(*DataType::STRING, field.getDataType());
-
-    field = type.getField("host");
-    EXPECT_EQ(*DataType::STRING, field.getDataType());
-
-    field = type.getField("port");
-    EXPECT_EQ(*DataType::STRING, field.getDataType());
-
-    field = type.getField("path");
-    EXPECT_EQ(*DataType::STRING, field.getDataType());
-
-    field = type.getField("query");
-    EXPECT_EQ(*DataType::STRING, field.getDataType());
-
-    field = type.getField("fragment");
-    EXPECT_EQ(*DataType::STRING, field.getDataType());
-}
-
-} // document
diff --git a/document/src/vespa/document/datatype/CMakeLists.txt b/document/src/vespa/document/datatype/CMakeLists.txt
index 7f3f6268bff..fc9a2007a59 100644
--- a/document/src/vespa/document/datatype/CMakeLists.txt
+++ b/document/src/vespa/document/datatype/CMakeLists.txt
@@ -14,7 +14,6 @@ vespa_add_library(document_datatypes OBJECT
     structdatatype.cpp
     structureddatatype.cpp
     tensor_data_type.cpp
-    urldatatype.cpp
     weightedsetdatatype.cpp
     referencedatatype.cpp
     DEPENDS
diff --git a/document/src/vespa/document/datatype/urldatatype.cpp b/document/src/vespa/document/datatype/urldatatype.cpp
deleted file mode 100644
index 6fd65666237..00000000000
--- a/document/src/vespa/document/datatype/urldatatype.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "urldatatype.h"
-
-namespace document {
-
-const vespalib::string UrlDataType::STRUCT_NAME("url");
-const vespalib::string UrlDataType::FIELD_ALL("all");
-const vespalib::string UrlDataType::FIELD_SCHEME("scheme");
-const vespalib::string UrlDataType::FIELD_HOST("host");
-const vespalib::string UrlDataType::FIELD_PORT("port");
-const vespalib::string UrlDataType::FIELD_PATH("path");
-const vespalib::string UrlDataType::FIELD_QUERY("query");
-const vespalib::string UrlDataType::FIELD_FRAGMENT("fragment");
-
-StructDataType::UP
-UrlDataType::createInstance()
-{
-    auto type = std::make_unique<StructDataType>(UrlDataType::STRUCT_NAME);
-    type->addField(Field(UrlDataType::FIELD_ALL,     *DataType::STRING));
-    type->addField(Field(UrlDataType::FIELD_SCHEME,  *DataType::STRING));
-    type->addField(Field(UrlDataType::FIELD_HOST,    *DataType::STRING));
-    type->addField(Field(UrlDataType::FIELD_PORT,    *DataType::STRING));
-    type->addField(Field(UrlDataType::FIELD_PATH,    *DataType::STRING));
-    type->addField(Field(UrlDataType::FIELD_QUERY,   *DataType::STRING));
-    type->addField(Field(UrlDataType::FIELD_FRAGMENT,*DataType::STRING));
-    return type;
-}
-
-const StructDataType &
-UrlDataType::getInstance()
-{
-    static StructDataType::UP instance = createInstance();
-    return *instance;
-}
-
-} // document
diff --git a/document/src/vespa/document/datatype/urldatatype.h b/document/src/vespa/document/datatype/urldatatype.h
deleted file mode 100644
index 5efe5fbb2c0..00000000000
--- a/document/src/vespa/document/datatype/urldatatype.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include <vespa/document/datatype/structdatatype.h>
-
-namespace document {
-
-class UrlDataType {
-private:
-    UrlDataType() { /* hide */ }
-    static StructDataType::UP createInstance();
-
-public:
-    static const vespalib::string STRUCT_NAME;
-    static const int              STRUCT_VERSION;
-    static const vespalib::string FIELD_ALL;
-    static const vespalib::string FIELD_SCHEME;
-    static const vespalib::string FIELD_HOST;
-    static const vespalib::string FIELD_PORT;
-    static const vespalib::string FIELD_PATH;
-    static const vespalib::string FIELD_QUERY;
-    static const vespalib::string FIELD_FRAGMENT;
-
-    static const StructDataType &getInstance();
-};
-
-} // document
-
diff --git a/document/src/vespa/document/repo/documenttyperepo.cpp b/document/src/vespa/document/repo/documenttyperepo.cpp
index c9473c90934..e0db118be11 100644
--- a/document/src/vespa/document/repo/documenttyperepo.cpp
+++ b/document/src/vespa/document/repo/documenttyperepo.cpp
@@ -8,7 +8,6 @@
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/datatype/mapdatatype.h>
 #include <vespa/document/datatype/positiondatatype.h>
-#include <vespa/document/datatype/urldatatype.h>
 #include <vespa/document/datatype/weightedsetdatatype.h>
 #include <vespa/document/datatype/referencedatatype.h>
 #include <vespa/document/datatype/tensor_data_type.h>
@@ -369,7 +368,6 @@ addDefaultDocument(DocumentTypeMap &type_map) {
     for (size_t i = 0; i < default_types.size(); ++i) {
         data_types->repo.addDataType(*default_types[i]);
     }
-    data_types->repo.addDataType(UrlDataType::getInstance());
     data_types->repo.addDataType(PositionDataType::getInstance());
     data_types->doc_type = std::make_unique<DocumentType>("document", typeId);