update expected results

* drop lots of duplicate data types

11 files changed, 5 insertions, 232 deletions

diff --git a/config-model/src/test/configmodel/types/documentmanager.cfg b/config-model/src/test/configmodel/types/documentmanager.cfg
index bfeb5a18d8e..7a983693c22 100644
--- a/config-model/src/test/configmodel/types/documentmanager.cfg
+++ b/config-model/src/test/configmodel/types/documentmanager.cfg
@@ -94,40 +94,6 @@ doctype[1].arraytype[10].idx 10042
 doctype[1].arraytype[10].elementtype 10003
 doctype[1].arraytype[11].idx 10045
 doctype[1].arraytype[11].elementtype 10041
-doctype[1].arraytype[12].idx 10051
-doctype[1].arraytype[12].elementtype 10052
-doctype[1].arraytype[13].idx 10052
-doctype[1].arraytype[13].elementtype 10053
-doctype[1].arraytype[14].idx 10053
-doctype[1].arraytype[14].elementtype 10012
-doctype[1].arraytype[15].idx 10054
-doctype[1].arraytype[15].elementtype 10055
-doctype[1].arraytype[16].idx 10055
-doctype[1].arraytype[16].elementtype 10012
-doctype[1].arraytype[17].idx 10056
-doctype[1].arraytype[17].elementtype 10057
-doctype[1].arraytype[18].idx 10058
-doctype[1].arraytype[18].elementtype 10059
-doctype[1].arraytype[19].idx 10059
-doctype[1].arraytype[19].elementtype 10012
-doctype[1].arraytype[20].idx 10060
-doctype[1].arraytype[20].elementtype 10061
-doctype[1].arraytype[21].idx 10062
-doctype[1].arraytype[21].elementtype 10003
-doctype[1].arraytype[22].idx 10063
-doctype[1].arraytype[22].elementtype 10007
-doctype[1].arraytype[23].idx 10064
-doctype[1].arraytype[23].elementtype 10041
-doctype[1].arraytype[24].idx 10065
-doctype[1].arraytype[24].elementtype 10023
-doctype[1].arraytype[25].idx 10066
-doctype[1].arraytype[25].elementtype 10012
-doctype[1].arraytype[26].idx 10068
-doctype[1].arraytype[26].elementtype 10069
-doctype[1].arraytype[27].idx 10069
-doctype[1].arraytype[27].elementtype 10012
-doctype[1].arraytype[28].idx 10075
-doctype[1].arraytype[28].elementtype 10007
 doctype[1].maptype[0].idx 10025
 doctype[1].maptype[0].keytype 10012
 doctype[1].maptype[0].valuetype 10012
@@ -164,42 +130,6 @@ doctype[1].maptype[10].valuetype 10047
 doctype[1].maptype[11].idx 10048
 doctype[1].maptype[11].keytype 10012
 doctype[1].maptype[11].valuetype 10008
-doctype[1].maptype[12].idx 10057
-doctype[1].maptype[12].keytype 10007
-doctype[1].maptype[12].valuetype 10058
-doctype[1].maptype[13].idx 10061
-doctype[1].maptype[13].keytype 10012
-doctype[1].maptype[13].valuetype 10012
-doctype[1].maptype[14].idx 10067
-doctype[1].maptype[14].keytype 10007
-doctype[1].maptype[14].valuetype 10068
-doctype[1].maptype[15].idx 10070
-doctype[1].maptype[15].keytype 10007
-doctype[1].maptype[15].valuetype 10004
-doctype[1].maptype[16].idx 10071
-doctype[1].maptype[16].keytype 10007
-doctype[1].maptype[16].valuetype 10047
-doctype[1].maptype[17].idx 10072
-doctype[1].maptype[17].keytype 10007
-doctype[1].maptype[17].valuetype 10008
-doctype[1].maptype[18].idx 10073
-doctype[1].maptype[18].keytype 10007
-doctype[1].maptype[18].valuetype 10041
-doctype[1].maptype[19].idx 10074
-doctype[1].maptype[19].keytype 10012
-doctype[1].maptype[19].valuetype 10075
-doctype[1].maptype[20].idx 10076
-doctype[1].maptype[20].keytype 10012
-doctype[1].maptype[20].valuetype 10005
-doctype[1].maptype[21].idx 10077
-doctype[1].maptype[21].keytype 10012
-doctype[1].maptype[21].valuetype 10007
-doctype[1].maptype[22].idx 10078
-doctype[1].maptype[22].keytype 10012
-doctype[1].maptype[22].valuetype 10008
-doctype[1].maptype[23].idx 10079
-doctype[1].maptype[23].keytype 10012
-doctype[1].maptype[23].valuetype 10012
 doctype[1].wsettype[0].idx 10018
 doctype[1].wsettype[0].elementtype 10012
 doctype[1].wsettype[0].createifnonexistent false
@@ -228,18 +158,6 @@ doctype[1].wsettype[6].idx 10050
 doctype[1].wsettype[6].elementtype 10012
 doctype[1].wsettype[6].createifnonexistent true
 doctype[1].wsettype[6].removeifzero true
-doctype[1].wsettype[7].idx 10080
-doctype[1].wsettype[7].elementtype 10012
-doctype[1].wsettype[7].createifnonexistent false
-doctype[1].wsettype[7].removeifzero false
-doctype[1].wsettype[8].idx 10081
-doctype[1].wsettype[8].elementtype 10012
-doctype[1].wsettype[8].createifnonexistent true
-doctype[1].wsettype[8].removeifzero false
-doctype[1].wsettype[9].idx 10082
-doctype[1].wsettype[9].elementtype 10012
-doctype[1].wsettype[9].createifnonexistent false
-doctype[1].wsettype[9].removeifzero true
 doctype[1].structtype[0].idx 10023
 doctype[1].structtype[0].name "sct"
 doctype[1].structtype[0].field[0].name "s1"
diff --git a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg
index f30914ebbf6..640655c53b6 100644
--- a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg
@@ -45,9 +45,7 @@ doctype[].inherits[].idx 10000
 doctype[].contentstruct 10016
 doctype[].arraytype[].idx 10017
 doctype[].arraytype[].elementtype 10018
-doctype[].arraytype[].idx 10020
-doctype[].arraytype[].elementtype 10018
-doctype[].annotationtype[].idx 10021
+doctype[].annotationtype[].idx 10020
 doctype[].annotationtype[].name "my_anno"
 doctype[].annotationtype[].internalid -160036815
 doctype[].annotationtype[].datatype 10019
@@ -62,4 +60,4 @@ doctype[].structtype[].idx 10019
 doctype[].structtype[].name "annotation.my_anno"
 doctype[].structtype[].field[].name "my_annofield"
 doctype[].structtype[].field[].internalid 718266337
-doctype[].structtype[].field[].type 10020
+doctype[].structtype[].field[].type 10017
diff --git a/config-model/src/test/derived/arrays/documentmanager.cfg b/config-model/src/test/derived/arrays/documentmanager.cfg
index fc9f42afab2..7da3b44f43c 100644
--- a/config-model/src/test/derived/arrays/documentmanager.cfg
+++ b/config-model/src/test/derived/arrays/documentmanager.cfg
@@ -57,18 +57,10 @@ doctype[].arraytype[].idx 10018
 doctype[].arraytype[].elementtype 10007
 doctype[].arraytype[].idx 10019
 doctype[].arraytype[].elementtype 10012
-doctype[].arraytype[].idx 10021
-doctype[].arraytype[].elementtype 10007
-doctype[].arraytype[].idx 10022
-doctype[].arraytype[].elementtype 10012
 doctype[].wsettype[].idx 10020
 doctype[].wsettype[].elementtype 10012
 doctype[].wsettype[].createifnonexistent false
 doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10023
-doctype[].wsettype[].elementtype 10012
-doctype[].wsettype[].createifnonexistent false
-doctype[].wsettype[].removeifzero false
 doctype[].structtype[].idx 10016
 doctype[].structtype[].name "arrays.header"
 doctype[].structtype[].field[].name "tags"
diff --git a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg
index aeca3f9fd74..373e0211253 100644
--- a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg
+++ b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg
@@ -73,18 +73,6 @@ doctype[].arraytype[].idx 10025
 doctype[].arraytype[].elementtype 10004
 doctype[].arraytype[].idx 10027
 doctype[].arraytype[].elementtype 10012
-doctype[].arraytype[].idx 10029
-doctype[].arraytype[].elementtype 10003
-doctype[].arraytype[].idx 10030
-doctype[].arraytype[].elementtype 10004
-doctype[].arraytype[].idx 10031
-doctype[].arraytype[].elementtype 10005
-doctype[].arraytype[].idx 10032
-doctype[].arraytype[].elementtype 10007
-doctype[].arraytype[].idx 10033
-doctype[].arraytype[].elementtype 10008
-doctype[].arraytype[].idx 10034
-doctype[].arraytype[].elementtype 10012
 doctype[].wsettype[].idx 10018
 doctype[].wsettype[].elementtype 10003
 doctype[].wsettype[].createifnonexistent false
@@ -109,30 +97,6 @@ doctype[].wsettype[].idx 10028
 doctype[].wsettype[].elementtype 10012
 doctype[].wsettype[].createifnonexistent false
 doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10035
-doctype[].wsettype[].elementtype 10003
-doctype[].wsettype[].createifnonexistent false
-doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10036
-doctype[].wsettype[].elementtype 10004
-doctype[].wsettype[].createifnonexistent false
-doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10037
-doctype[].wsettype[].elementtype 10005
-doctype[].wsettype[].createifnonexistent false
-doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10038
-doctype[].wsettype[].elementtype 10007
-doctype[].wsettype[].createifnonexistent false
-doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10039
-doctype[].wsettype[].elementtype 10008
-doctype[].wsettype[].createifnonexistent false
-doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10040
-doctype[].wsettype[].elementtype 10012
-doctype[].wsettype[].createifnonexistent false
-doctype[].wsettype[].removeifzero false
 doctype[].structtype[].idx 10016
 doctype[].structtype[].name "prefetch.header"
 doctype[].structtype[].field[].name "singlebyte"
diff --git a/config-model/src/test/derived/complex/documentmanager.cfg b/config-model/src/test/derived/complex/documentmanager.cfg
index dd243a88f69..da4f2fc0942 100644
--- a/config-model/src/test/derived/complex/documentmanager.cfg
+++ b/config-model/src/test/derived/complex/documentmanager.cfg
@@ -75,10 +75,6 @@ doctype[].arraytype[].idx 10017
 doctype[].arraytype[].elementtype 10005
 doctype[].arraytype[].idx 10018
 doctype[].arraytype[].elementtype 10007
-doctype[].arraytype[].idx 10019
-doctype[].arraytype[].elementtype 10005
-doctype[].arraytype[].idx 10020
-doctype[].arraytype[].elementtype 10007
 doctype[].structtype[].idx 10016
 doctype[].structtype[].name "complex.header"
 doctype[].structtype[].field[].name "title"
diff --git a/config-model/src/test/derived/namecollision/documentmanager.cfg b/config-model/src/test/derived/namecollision/documentmanager.cfg
index e520c1144fa..73730595574 100644
--- a/config-model/src/test/derived/namecollision/documentmanager.cfg
+++ b/config-model/src/test/derived/namecollision/documentmanager.cfg
@@ -52,8 +52,6 @@ doctype[].contentstruct 10018
 doctype[].fieldsets{[document]}.fields[] "structarray"
 doctype[].arraytype[].idx 10019
 doctype[].arraytype[].elementtype 10020
-doctype[].arraytype[].idx 10021
-doctype[].arraytype[].elementtype 10020
 doctype[].structtype[].idx 10020
 doctype[].structtype[].name "collision"
 doctype[].structtype[].idx 10018
diff --git a/config-model/src/test/derived/streamingstruct/documentmanager.cfg b/config-model/src/test/derived/streamingstruct/documentmanager.cfg
index cc2ee0b3979..30dd3fc1d35 100644
--- a/config-model/src/test/derived/streamingstruct/documentmanager.cfg
+++ b/config-model/src/test/derived/streamingstruct/documentmanager.cfg
@@ -66,14 +66,9 @@ doctype[].arraytype[].idx 10021
 doctype[].arraytype[].elementtype 10017
 doctype[].arraytype[].idx 10022
 doctype[].arraytype[].elementtype 10017
-doctype[].arraytype[].idx 10023
-doctype[].arraytype[].elementtype 10017
 doctype[].maptype[].idx 10018
 doctype[].maptype[].keytype 10008
 doctype[].maptype[].valuetype 10012
-doctype[].maptype[].idx 10024
-doctype[].maptype[].keytype 10008
-doctype[].maptype[].valuetype 10012
 doctype[].structtype[].idx 10017
 doctype[].structtype[].name "s1"
 doctype[].structtype[].field[].name "f1"
diff --git a/config-model/src/test/derived/structandfieldset/documentmanager.cfg b/config-model/src/test/derived/structandfieldset/documentmanager.cfg
index f30377a5b7e..85df5249e3a 100644
--- a/config-model/src/test/derived/structandfieldset/documentmanager.cfg
+++ b/config-model/src/test/derived/structandfieldset/documentmanager.cfg
@@ -49,8 +49,6 @@ doctype[].fieldsets{[document]}.fields[] "people"
 doctype[].fieldsets{[document]}.fields[] "tag"
 doctype[].arraytype[].idx 10017
 doctype[].arraytype[].elementtype 10018
-doctype[].arraytype[].idx 10019
-doctype[].arraytype[].elementtype 10018
 doctype[].structtype[].idx 10018
 doctype[].structtype[].name "person"
 doctype[].structtype[].field[].name "first_name"
diff --git a/config-model/src/test/derived/structanyorder/documentmanager.cfg b/config-model/src/test/derived/structanyorder/documentmanager.cfg
index 2b06c6d7214..b3b6a2587c1 100644
--- a/config-model/src/test/derived/structanyorder/documentmanager.cfg
+++ b/config-model/src/test/derived/structanyorder/documentmanager.cfg
@@ -47,12 +47,10 @@ doctype[].fieldsets{[document]}.fields[] "structarrayfield"
 doctype[].fieldsets{[document]}.fields[] "structfield"
 doctype[].arraytype[].idx 10019
 doctype[].arraytype[].elementtype 10017
-doctype[].arraytype[].idx 10020
-doctype[].arraytype[].elementtype 10017
-doctype[].annotationtype[].idx 10022
+doctype[].annotationtype[].idx 10021
 doctype[].annotationtype[].name "banana"
 doctype[].annotationtype[].internalid -269517759
-doctype[].annotationtype[].datatype 10021
+doctype[].annotationtype[].datatype 10020
 doctype[].structtype[].idx 10018
 doctype[].structtype[].name "foo"
 doctype[].structtype[].field[].name "s1"
@@ -80,7 +78,7 @@ doctype[].structtype[].field[].type 10017
 doctype[].structtype[].field[].name "structarrayfield"
 doctype[].structtype[].field[].internalid 335048518
 doctype[].structtype[].field[].type 10019
-doctype[].structtype[].idx 10021
+doctype[].structtype[].idx 10020
 doctype[].structtype[].name "annotation.banana"
 doctype[].structtype[].field[].name "b"
 doctype[].structtype[].field[].internalid 1964392128
diff --git a/config-model/src/test/derived/types/documentmanager.cfg b/config-model/src/test/derived/types/documentmanager.cfg
index 3ee8b5cb38c..f74ce87e6cb 100644
--- a/config-model/src/test/derived/types/documentmanager.cfg
+++ b/config-model/src/test/derived/types/documentmanager.cfg
@@ -95,40 +95,6 @@ doctype[].arraytype[].idx 10042
 doctype[].arraytype[].elementtype 10003
 doctype[].arraytype[].idx 10045
 doctype[].arraytype[].elementtype 10041
-doctype[].arraytype[].idx 10051
-doctype[].arraytype[].elementtype 10052
-doctype[].arraytype[].idx 10052
-doctype[].arraytype[].elementtype 10053
-doctype[].arraytype[].idx 10053
-doctype[].arraytype[].elementtype 10012
-doctype[].arraytype[].idx 10054
-doctype[].arraytype[].elementtype 10055
-doctype[].arraytype[].idx 10055
-doctype[].arraytype[].elementtype 10012
-doctype[].arraytype[].idx 10056
-doctype[].arraytype[].elementtype 10057
-doctype[].arraytype[].idx 10058
-doctype[].arraytype[].elementtype 10059
-doctype[].arraytype[].idx 10059
-doctype[].arraytype[].elementtype 10012
-doctype[].arraytype[].idx 10060
-doctype[].arraytype[].elementtype 10061
-doctype[].arraytype[].idx 10062
-doctype[].arraytype[].elementtype 10003
-doctype[].arraytype[].idx 10063
-doctype[].arraytype[].elementtype 10007
-doctype[].arraytype[].idx 10064
-doctype[].arraytype[].elementtype 10041
-doctype[].arraytype[].idx 10065
-doctype[].arraytype[].elementtype 10023
-doctype[].arraytype[].idx 10066
-doctype[].arraytype[].elementtype 10012
-doctype[].arraytype[].idx 10068
-doctype[].arraytype[].elementtype 10069
-doctype[].arraytype[].idx 10069
-doctype[].arraytype[].elementtype 10012
-doctype[].arraytype[].idx 10075
-doctype[].arraytype[].elementtype 10007
 doctype[].maptype[].idx 10025
 doctype[].maptype[].keytype 10012
 doctype[].maptype[].valuetype 10012
@@ -165,42 +131,6 @@ doctype[].maptype[].valuetype 10047
 doctype[].maptype[].idx 10048
 doctype[].maptype[].keytype 10012
 doctype[].maptype[].valuetype 10008
-doctype[].maptype[].idx 10057
-doctype[].maptype[].keytype 10007
-doctype[].maptype[].valuetype 10058
-doctype[].maptype[].idx 10061
-doctype[].maptype[].keytype 10012
-doctype[].maptype[].valuetype 10012
-doctype[].maptype[].idx 10067
-doctype[].maptype[].keytype 10007
-doctype[].maptype[].valuetype 10068
-doctype[].maptype[].idx 10070
-doctype[].maptype[].keytype 10007
-doctype[].maptype[].valuetype 10004
-doctype[].maptype[].idx 10071
-doctype[].maptype[].keytype 10007
-doctype[].maptype[].valuetype 10047
-doctype[].maptype[].idx 10072
-doctype[].maptype[].keytype 10007
-doctype[].maptype[].valuetype 10008
-doctype[].maptype[].idx 10073
-doctype[].maptype[].keytype 10007
-doctype[].maptype[].valuetype 10041
-doctype[].maptype[].idx 10074
-doctype[].maptype[].keytype 10012
-doctype[].maptype[].valuetype 10075
-doctype[].maptype[].idx 10076
-doctype[].maptype[].keytype 10012
-doctype[].maptype[].valuetype 10005
-doctype[].maptype[].idx 10077
-doctype[].maptype[].keytype 10012
-doctype[].maptype[].valuetype 10007
-doctype[].maptype[].idx 10078
-doctype[].maptype[].keytype 10012
-doctype[].maptype[].valuetype 10008
-doctype[].maptype[].idx 10079
-doctype[].maptype[].keytype 10012
-doctype[].maptype[].valuetype 10012
 doctype[].wsettype[].idx 10018
 doctype[].wsettype[].elementtype 10012
 doctype[].wsettype[].createifnonexistent false
@@ -229,18 +159,6 @@ doctype[].wsettype[].idx 10050
 doctype[].wsettype[].elementtype 10012
 doctype[].wsettype[].createifnonexistent true
 doctype[].wsettype[].removeifzero true
-doctype[].wsettype[].idx 10080
-doctype[].wsettype[].elementtype 10012
-doctype[].wsettype[].createifnonexistent false
-doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10081
-doctype[].wsettype[].elementtype 10012
-doctype[].wsettype[].createifnonexistent true
-doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10082
-doctype[].wsettype[].elementtype 10012
-doctype[].wsettype[].createifnonexistent false
-doctype[].wsettype[].removeifzero true
 doctype[].structtype[].idx 10023
 doctype[].structtype[].name "sct"
 doctype[].structtype[].field[].name "s1"
diff --git a/config-model/src/test/examples/structresult.cfg b/config-model/src/test/examples/structresult.cfg
index 4f69fd8b43c..34383084625 100644
--- a/config-model/src/test/examples/structresult.cfg
+++ b/config-model/src/test/examples/structresult.cfg
@@ -48,8 +48,6 @@ doctype[1].fieldsets{[document]}.fields[1] "arraystruct"
 doctype[1].fieldsets{[document]}.fields[2] "mystruct"
 doctype[1].arraytype[0].idx 10018
 doctype[1].arraytype[0].elementtype 10017
-doctype[1].arraytype[1].idx 10020
-doctype[1].arraytype[1].elementtype 10017
 doctype[1].structtype[0].idx 10017
 doctype[1].structtype[0].name "foo"
 doctype[1].structtype[0].field[0].name "fubar"