Revert "Revert "Disallow complex types as keys for nested types in arrays""

This reverts commit bb42d0c6f30de25b9ca6b8e232b6920aeb51a7d1.

Reason for system tests failing was changes in the system tests, not
this PR.

3 files changed, 14 insertions, 14 deletions

diff --git a/config-model/src/test/configmodel/types/documentmanager.cfg b/config-model/src/test/configmodel/types/documentmanager.cfg
index 6b01934307a..aaaebccecfd 100644
--- a/config-model/src/test/configmodel/types/documentmanager.cfg
+++ b/config-model/src/test/configmodel/types/documentmanager.cfg
@@ -212,11 +212,11 @@ datatype[24].structtype[0].field[27].detailedtype ""
 datatype[24].structtype[0].field[28].name "summaryfeatures"
 datatype[24].structtype[0].field[28].datatype 2
 datatype[24].structtype[0].field[28].detailedtype ""
-datatype[25].id 171503364
-datatype[25].maptype[0].keytype 1707615575
-datatype[25].maptype[0].valtype 0
-datatype[26].id 1100964733
-datatype[26].arraytype[0].datatype 171503364
+datatype[25].id -372512406
+datatype[25].maptype[0].keytype 0
+datatype[25].maptype[0].valtype 1707615575
+datatype[26].id 1416345047
+datatype[26].arraytype[0].datatype -372512406
 datatype[27].id 348447225
 datatype[27].structtype[0].name "types.body"
 datatype[27].structtype[0].version 0
@@ -225,7 +225,7 @@ datatype[27].structtype[0].compresslevel 0
 datatype[27].structtype[0].compressthreshold 95
 datatype[27].structtype[0].compressminsize 800
 datatype[27].structtype[0].field[0].name "complexarray"
-datatype[27].structtype[0].field[0].datatype 1100964733
+datatype[27].structtype[0].field[0].datatype 1416345047
 datatype[27].structtype[0].field[0].detailedtype ""
 datatype[28].id -853072901
 datatype[28].documenttype[0].name "types"
diff --git a/config-model/src/test/configmodel/types/documenttypes.cfg b/config-model/src/test/configmodel/types/documenttypes.cfg
index dc7962adec7..97785618e8e 100644
--- a/config-model/src/test/configmodel/types/documenttypes.cfg
+++ b/config-model/src/test/configmodel/types/documenttypes.cfg
@@ -560,11 +560,11 @@ documenttype[0].datatype[23].sstruct.field[28].id 1840337115
 documenttype[0].datatype[23].sstruct.field[28].id_v6 1981648971
 documenttype[0].datatype[23].sstruct.field[28].datatype 2
 documenttype[0].datatype[23].sstruct.field[28].detailedtype ""
-documenttype[0].datatype[24].id 171503364
+documenttype[0].datatype[24].id -372512406
 documenttype[0].datatype[24].type MAP
 documenttype[0].datatype[24].array.element.id 0
-documenttype[0].datatype[24].map.key.id 1707615575
-documenttype[0].datatype[24].map.value.id 0
+documenttype[0].datatype[24].map.key.id 0
+documenttype[0].datatype[24].map.value.id 1707615575
 documenttype[0].datatype[24].wset.key.id 0
 documenttype[0].datatype[24].wset.createifnonexistent false
 documenttype[0].datatype[24].wset.removeifzero false
@@ -575,9 +575,9 @@ documenttype[0].datatype[24].sstruct.compression.type NONE
 documenttype[0].datatype[24].sstruct.compression.level 0
 documenttype[0].datatype[24].sstruct.compression.threshold 95
 documenttype[0].datatype[24].sstruct.compression.minsize 200
-documenttype[0].datatype[25].id 1100964733
+documenttype[0].datatype[25].id 1416345047
 documenttype[0].datatype[25].type ARRAY
-documenttype[0].datatype[25].array.element.id 171503364
+documenttype[0].datatype[25].array.element.id -372512406
 documenttype[0].datatype[25].map.key.id 0
 documenttype[0].datatype[25].map.value.id 0
 documenttype[0].datatype[25].wset.key.id 0
@@ -606,9 +606,9 @@ documenttype[0].datatype[26].sstruct.compression.level 0
 documenttype[0].datatype[26].sstruct.compression.threshold 95
 documenttype[0].datatype[26].sstruct.compression.minsize 200
 documenttype[0].datatype[26].sstruct.field[0].name "complexarray"
-documenttype[0].datatype[26].sstruct.field[0].id 1028383787
+documenttype[0].datatype[26].sstruct.field[0].id 795629533
 documenttype[0].datatype[26].sstruct.field[0].id_v6 658530305
-documenttype[0].datatype[26].sstruct.field[0].datatype 1100964733
+documenttype[0].datatype[26].sstruct.field[0].datatype 1416345047
 documenttype[0].datatype[26].sstruct.field[0].detailedtype ""
 documenttype[0].fieldsets{[document]}.fields[0] "Folders"
 documenttype[0].fieldsets{[document]}.fields[1] "abyte"
diff --git a/config-model/src/test/configmodel/types/types.sd b/config-model/src/test/configmodel/types/types.sd
index c55c5611bc5..f34a6776b11 100644
--- a/config-model/src/test/configmodel/types/types.sd
+++ b/config-model/src/test/configmodel/types/types.sd
@@ -92,7 +92,7 @@ search types {
 
     field arrarr type array<array<array<string>>> {header}
     field maparr type array<map<string, string>> {header}
-    field complexarray type array< map<array<array<string>>, int> > {body}
+    field complexarray type array< map<int, array<array<string>>> > {body}
 
     struct mystruct {
       field bytearr type array<byte>{}