Reapply "produce new "doctype" config for document types"

This reverts commit 8c25dd8f1eee02a34e45c026924434a0b551a2ae.

1 files changed, 97 insertions, 108 deletions

diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
index c3ea1318d33..7a67640adfe 100644
--- a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
+++ b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
@@ -1,110 +1,99 @@
 enablecompression false
 usev8geopositions false
-documenttype[].id -94853056
-documenttype[].name "child_a"
-documenttype[].version 0
-documenttype[].headerstruct 867409663
-documenttype[].bodystruct 0
-documenttype[].inherits[].id 8
-documenttype[].datatype[].id 867409663
-documenttype[].datatype[].type STRUCT
-documenttype[].datatype[].array.element.id 0
-documenttype[].datatype[].map.key.id 0
-documenttype[].datatype[].map.value.id 0
-documenttype[].datatype[].wset.key.id 0
-documenttype[].datatype[].wset.createifnonexistent false
-documenttype[].datatype[].wset.removeifzero false
-documenttype[].datatype[].annotationref.annotation.id 0
-documenttype[].datatype[].sstruct.name "child_a.header"
-documenttype[].datatype[].sstruct.version 0
-documenttype[].datatype[].sstruct.compression.type NONE
-documenttype[].datatype[].sstruct.compression.level 0
-documenttype[].datatype[].sstruct.compression.threshold 95
-documenttype[].datatype[].sstruct.compression.minsize 200
-documenttype[].datatype[].sstruct.field[].name "ref_from_a"
-documenttype[].datatype[].sstruct.field[].id 300427062
-documenttype[].datatype[].sstruct.field[].datatype 427398467
-documenttype[].datatype[].sstruct.field[].detailedtype ""
-documenttype[].fieldsets{[document]}.fields[] "ref_from_a"
-documenttype[].referencetype[].id 427398467
-documenttype[].referencetype[].target_type_id 1175161836
-documenttype[].id -94852095
-documenttype[].name "child_b"
-documenttype[].version 0
-documenttype[].headerstruct 670896158
-documenttype[].bodystruct 0
-documenttype[].inherits[].id 8
-documenttype[].inherits[].id -94853056
-documenttype[].datatype[].id 670896158
-documenttype[].datatype[].type STRUCT
-documenttype[].datatype[].array.element.id 0
-documenttype[].datatype[].map.key.id 0
-documenttype[].datatype[].map.value.id 0
-documenttype[].datatype[].wset.key.id 0
-documenttype[].datatype[].wset.createifnonexistent false
-documenttype[].datatype[].wset.removeifzero false
-documenttype[].datatype[].annotationref.annotation.id 0
-documenttype[].datatype[].sstruct.name "child_b.header"
-documenttype[].datatype[].sstruct.version 0
-documenttype[].datatype[].sstruct.compression.type NONE
-documenttype[].datatype[].sstruct.compression.level 0
-documenttype[].datatype[].sstruct.compression.threshold 95
-documenttype[].datatype[].sstruct.compression.minsize 200
-documenttype[].datatype[].sstruct.field[].name "ref_from_b"
-documenttype[].datatype[].sstruct.field[].id 185778735
-documenttype[].datatype[].sstruct.field[].datatype 427398467
-documenttype[].datatype[].sstruct.field[].detailedtype ""
-documenttype[].fieldsets{[document]}.fields[] "ref_from_a"
-documenttype[].fieldsets{[document]}.fields[] "ref_from_b"
-documenttype[].id -94851134
-documenttype[].name "child_c"
-documenttype[].version 0
-documenttype[].headerstruct 474382653
-documenttype[].bodystruct 0
-documenttype[].inherits[].id 8
-documenttype[].inherits[].id -94852095
-documenttype[].datatype[].id 474382653
-documenttype[].datatype[].type STRUCT
-documenttype[].datatype[].array.element.id 0
-documenttype[].datatype[].map.key.id 0
-documenttype[].datatype[].map.value.id 0
-documenttype[].datatype[].wset.key.id 0
-documenttype[].datatype[].wset.createifnonexistent false
-documenttype[].datatype[].wset.removeifzero false
-documenttype[].datatype[].annotationref.annotation.id 0
-documenttype[].datatype[].sstruct.name "child_c.header"
-documenttype[].datatype[].sstruct.version 0
-documenttype[].datatype[].sstruct.compression.type NONE
-documenttype[].datatype[].sstruct.compression.level 0
-documenttype[].datatype[].sstruct.compression.threshold 95
-documenttype[].datatype[].sstruct.compression.minsize 200
-documenttype[].fieldsets{[document]}.fields[] "ref_from_a"
-documenttype[].fieldsets{[document]}.fields[] "ref_from_b"
-documenttype[].importedfield[].name "from_a_int_field"
-documenttype[].importedfield[].name "from_b_int_field"
-documenttype[].id 1175161836
-documenttype[].name "parent"
-documenttype[].version 0
-documenttype[].headerstruct 836075987
-documenttype[].bodystruct 0
-documenttype[].inherits[].id 8
-documenttype[].datatype[].id 836075987
-documenttype[].datatype[].type STRUCT
-documenttype[].datatype[].array.element.id 0
-documenttype[].datatype[].map.key.id 0
-documenttype[].datatype[].map.value.id 0
-documenttype[].datatype[].wset.key.id 0
-documenttype[].datatype[].wset.createifnonexistent false
-documenttype[].datatype[].wset.removeifzero false
-documenttype[].datatype[].annotationref.annotation.id 0
-documenttype[].datatype[].sstruct.name "parent.header"
-documenttype[].datatype[].sstruct.version 0
-documenttype[].datatype[].sstruct.compression.type NONE
-documenttype[].datatype[].sstruct.compression.level 0
-documenttype[].datatype[].sstruct.compression.threshold 95
-documenttype[].datatype[].sstruct.compression.minsize 200
-documenttype[].datatype[].sstruct.field[].name "int_field"
-documenttype[].datatype[].sstruct.field[].id 2128822283
-documenttype[].datatype[].sstruct.field[].datatype 0
-documenttype[].datatype[].sstruct.field[].detailedtype ""
-documenttype[].fieldsets{[document]}.fields[] "int_field"
+doctype[].name "document"
+doctype[].idx 10000
+doctype[].internalid 8
+doctype[].contentstruct 10001
+doctype[].primitivetype[].idx 10002
+doctype[].primitivetype[].name "bool"
+doctype[].primitivetype[].idx 10003
+doctype[].primitivetype[].name "byte"
+doctype[].primitivetype[].idx 10004
+doctype[].primitivetype[].name "double"
+doctype[].primitivetype[].idx 10005
+doctype[].primitivetype[].name "float"
+doctype[].primitivetype[].idx 10006
+doctype[].primitivetype[].name "float16"
+doctype[].primitivetype[].idx 10007
+doctype[].primitivetype[].name "int"
+doctype[].primitivetype[].idx 10008
+doctype[].primitivetype[].name "long"
+doctype[].primitivetype[].idx 10010
+doctype[].primitivetype[].name "predicate"
+doctype[].primitivetype[].idx 10011
+doctype[].primitivetype[].name "raw"
+doctype[].primitivetype[].idx 10012
+doctype[].primitivetype[].name "string"
+doctype[].primitivetype[].idx 10014
+doctype[].primitivetype[].name "uri"
+doctype[].wsettype[].idx 10013
+doctype[].wsettype[].elementtype 10012
+doctype[].wsettype[].createifnonexistent true
+doctype[].wsettype[].removeifzero true
+doctype[].wsettype[].internalid 18
+doctype[].structtype[].idx 10001
+doctype[].structtype[].name "document.header"
+doctype[].structtype[].internalid -284186494
+doctype[].structtype[].idx 10009
+doctype[].structtype[].name "position"
+doctype[].structtype[].field[].name "x"
+doctype[].structtype[].field[].internalid 914677694
+doctype[].structtype[].field[].type 10007
+doctype[].structtype[].field[].name "y"
+doctype[].structtype[].field[].internalid 900009410
+doctype[].structtype[].field[].type 10007
+doctype[].structtype[].internalid 1381038251
+doctype[].name "child_a"
+doctype[].idx 10015
+doctype[].internalid -94853056
+doctype[].inherits[].idx 10000
+doctype[].contentstruct 10016
+doctype[].fieldsets{[document]}.fields[] "ref_from_a"
+doctype[].documentref[].idx 10017
+doctype[].documentref[].targettype 10018
+doctype[].documentref[].internalid 427398467
+doctype[].structtype[].idx 10016
+doctype[].structtype[].name "child_a.header"
+doctype[].structtype[].field[].name "ref_from_a"
+doctype[].structtype[].field[].internalid 300427062
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].internalid 867409663
+doctype[].name "child_b"
+doctype[].idx 10019
+doctype[].internalid -94852095
+doctype[].inherits[].idx 10000
+doctype[].inherits[].idx 10015
+doctype[].contentstruct 10020
+doctype[].fieldsets{[document]}.fields[] "ref_from_a"
+doctype[].fieldsets{[document]}.fields[] "ref_from_b"
+doctype[].structtype[].idx 10020
+doctype[].structtype[].name "child_b.header"
+doctype[].structtype[].field[].name "ref_from_b"
+doctype[].structtype[].field[].internalid 185778735
+doctype[].structtype[].field[].type 10017
+doctype[].structtype[].internalid 670896158
+doctype[].name "child_c"
+doctype[].idx 10021
+doctype[].internalid -94851134
+doctype[].inherits[].idx 10000
+doctype[].inherits[].idx 10019
+doctype[].contentstruct 10022
+doctype[].fieldsets{[document]}.fields[] "ref_from_a"
+doctype[].fieldsets{[document]}.fields[] "ref_from_b"
+doctype[].importedfield[].name "from_a_int_field"
+doctype[].importedfield[].name "from_b_int_field"
+doctype[].structtype[].idx 10022
+doctype[].structtype[].name "child_c.header"
+doctype[].structtype[].internalid 474382653
+doctype[].name "parent"
+doctype[].idx 10018
+doctype[].internalid 1175161836
+doctype[].inherits[].idx 10000
+doctype[].contentstruct 10023
+doctype[].fieldsets{[document]}.fields[] "int_field"
+doctype[].structtype[].idx 10023
+doctype[].structtype[].name "parent.header"
+doctype[].structtype[].field[].name "int_field"
+doctype[].structtype[].field[].internalid 2128822283
+doctype[].structtype[].field[].type 10007
+doctype[].structtype[].internalid 836075987