check both old and new parsing in AnnotationsTestCase

* and update generated configs

1 files changed, 91 insertions, 88 deletions

diff --git a/config-model/src/test/derived/annotationsreference/documentmanager.cfg b/config-model/src/test/derived/annotationsreference/documentmanager.cfg
index 7ce09a97be1..94258fdb798 100644
--- a/config-model/src/test/derived/annotationsreference/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsreference/documentmanager.cfg
@@ -1,90 +1,93 @@
 enablecompression false
 usev8geopositions false
-datatype[].id 1381038251
-datatype[].structtype[].name "position"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].structtype[].field[].name "x"
-datatype[].structtype[].field[].datatype 0
-datatype[].structtype[].field[].detailedtype ""
-datatype[].structtype[].field[].name "y"
-datatype[].structtype[].field[].datatype 0
-datatype[].structtype[].field[].detailedtype ""
-datatype[].id 517946310
-datatype[].structtype[].name "annotation.banana"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].structtype[].field[].name "brand"
-datatype[].structtype[].field[].datatype 2
-datatype[].structtype[].field[].detailedtype ""
-datatype[].id 400622300
-datatype[].annotationreftype[].annotation "b"
-datatype[].id 1443829412
-datatype[].structtype[].name "annotation.a"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].structtype[].field[].name "foo"
-datatype[].structtype[].field[].datatype 400622300
-datatype[].structtype[].field[].detailedtype ""
-datatype[].id -808460615
-datatype[].annotationreftype[].annotation "banana"
-datatype[].id -770307521
-datatype[].structtype[].name "annotation.food"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].structtype[].field[].name "what"
-datatype[].structtype[].field[].datatype -808460615
-datatype[].structtype[].field[].detailedtype ""
-datatype[].id 756306917
-datatype[].annotationreftype[].annotation "cyclic"
-datatype[].id 1781099546
-datatype[].structtype[].name "annotation.cyclic"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].structtype[].field[].name "blah"
-datatype[].structtype[].field[].datatype 756306917
-datatype[].structtype[].field[].detailedtype ""
-datatype[].id 571255414
-datatype[].structtype[].name "annotationsreference.header"
-datatype[].structtype[].version 0
-datatype[].structtype[].compresstype NONE
-datatype[].structtype[].compresslevel 0
-datatype[].structtype[].compressthreshold 95
-datatype[].structtype[].compressminsize 800
-datatype[].id -1448377175
-datatype[].documenttype[].name "annotationsreference"
-datatype[].documenttype[].version 0
-datatype[].documenttype[].inherits[].name "document"
-datatype[].documenttype[].inherits[].version 0
-datatype[].documenttype[].headerstruct 571255414
-datatype[].documenttype[].bodystruct 0
-annotationtype[].id -269517759
-annotationtype[].name "banana"
-annotationtype[].datatype 517946310
-annotationtype[].id 1769416289
-annotationtype[].name "a"
-annotationtype[].datatype 1443829412
-annotationtype[].id 1966167951
-annotationtype[].name "b"
-annotationtype[].datatype -1
-annotationtype[].id 1918102169
-annotationtype[].name "food"
-annotationtype[].datatype -770307521
-annotationtype[].id -1569831750
-annotationtype[].name "cyclic"
-annotationtype[].datatype 1781099546
+doctype[].name "document"
+doctype[].idx 10000
+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[].structtype[].idx 10001
+doctype[].structtype[].name "document.header"
+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[].name "annotationsreference"
+doctype[].idx 10015
+doctype[].inherits[].idx 10000
+doctype[].contentstruct 10016
+doctype[].annotationtype[].idx 10027
+doctype[].annotationtype[].name "a"
+doctype[].annotationtype[].internalid 1769416289
+doctype[].annotationtype[].datatype 10017
+doctype[].annotationtype[].idx 10019
+doctype[].annotationtype[].name "b"
+doctype[].annotationtype[].internalid 1966167951
+doctype[].annotationtype[].datatype -1
+doctype[].annotationtype[].idx 10026
+doctype[].annotationtype[].name "banana"
+doctype[].annotationtype[].internalid -269517759
+doctype[].annotationtype[].datatype 10020
+doctype[].annotationtype[].idx 10023
+doctype[].annotationtype[].name "cyclic"
+doctype[].annotationtype[].internalid -1569831750
+doctype[].annotationtype[].datatype 10021
+doctype[].annotationtype[].idx 10028
+doctype[].annotationtype[].name "food"
+doctype[].annotationtype[].internalid 1918102169
+doctype[].annotationtype[].datatype 10024
+doctype[].annotationref[].idx 10018
+doctype[].annotationref[].annotationtype 10019
+doctype[].annotationref[].idx 10022
+doctype[].annotationref[].annotationtype 10023
+doctype[].annotationref[].idx 10025
+doctype[].annotationref[].annotationtype 10026
+doctype[].structtype[].idx 10016
+doctype[].structtype[].name "annotationsreference.header"
+doctype[].structtype[].idx 10017
+doctype[].structtype[].name "annotation.a"
+doctype[].structtype[].field[].name "foo"
+doctype[].structtype[].field[].internalid 1979988295
+doctype[].structtype[].field[].type 10018
+doctype[].structtype[].idx 10020
+doctype[].structtype[].name "annotation.banana"
+doctype[].structtype[].field[].name "brand"
+doctype[].structtype[].field[].internalid 2085058127
+doctype[].structtype[].field[].type 10012
+doctype[].structtype[].idx 10021
+doctype[].structtype[].name "annotation.cyclic"
+doctype[].structtype[].field[].name "blah"
+doctype[].structtype[].field[].internalid 874732190
+doctype[].structtype[].field[].type 10022
+doctype[].structtype[].idx 10024
+doctype[].structtype[].name "annotation.food"
+doctype[].structtype[].field[].name "what"
+doctype[].structtype[].field[].internalid 445721780
+doctype[].structtype[].field[].type 10025