diff options
| author | Tor Egge <Tor.Egge@online.no> | 2023-11-02 11:36:59 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2023-11-02 11:36:59 +0100 |
| commit | c0ca448ab38a60367d72e7fc6ebb4dd5ff86d4d4 (patch) | |
| tree | 7ad3490517d9816833d8eb9acb02ffd820b72790 | |
| parent | e64583fa0b618da67189152c10310293221dd8bc (diff) | |
Don't censor map indexes that start with left bracket in
readAndCensorIndexes.
| -rw-r--r-- | config-model/src/test/derived/bolding_dynamic_summary/documenttypes.cfg | 16 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/AbstractSchemaTestCase.java | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/config-model/src/test/derived/bolding_dynamic_summary/documenttypes.cfg b/config-model/src/test/derived/bolding_dynamic_summary/documenttypes.cfg index f88a22d8979..3e043d3dad8 100644 --- a/config-model/src/test/derived/bolding_dynamic_summary/documenttypes.cfg +++ b/config-model/src/test/derived/bolding_dynamic_summary/documenttypes.cfg @@ -48,14 +48,14 @@ doctype[].idx 10015 doctype[].internalid -877171244 doctype[].inherits[].idx 10000 doctype[].contentstruct 10016 -doctype[].fieldsets{[]}.fields[] "arr_1" -doctype[].fieldsets{[]}.fields[] "arr_2" -doctype[].fieldsets{[]}.fields[] "arr_3" -doctype[].fieldsets{[]}.fields[] "arr_4" -doctype[].fieldsets{[]}.fields[] "str_1" -doctype[].fieldsets{[]}.fields[] "str_2" -doctype[].fieldsets{[]}.fields[] "str_3" -doctype[].fieldsets{[]}.fields[] "str_4" +doctype[].fieldsets{[document]}.fields[] "arr_1" +doctype[].fieldsets{[document]}.fields[] "arr_2" +doctype[].fieldsets{[document]}.fields[] "arr_3" +doctype[].fieldsets{[document]}.fields[] "arr_4" +doctype[].fieldsets{[document]}.fields[] "str_1" +doctype[].fieldsets{[document]}.fields[] "str_2" +doctype[].fieldsets{[document]}.fields[] "str_3" +doctype[].fieldsets{[document]}.fields[] "str_4" doctype[].arraytype[].idx 10017 doctype[].arraytype[].elementtype 10012 doctype[].arraytype[].internalid -1486737430 diff --git a/config-model/src/test/java/com/yahoo/schema/AbstractSchemaTestCase.java b/config-model/src/test/java/com/yahoo/schema/AbstractSchemaTestCase.java index 55aa437dcb7..42005efaa8d 100644 --- a/config-model/src/test/java/com/yahoo/schema/AbstractSchemaTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/AbstractSchemaTestCase.java @@ -47,6 +47,7 @@ public abstract class AbstractSchemaTestCase { StringBuilder b = new StringBuilder(); try (BufferedReader r = IOUtils.createReader(file)) { int character; + int lastChar = -1; boolean lastWasNewline = false; boolean inBrackets = false; while (-1 != (character = r.read())) { @@ -72,8 +73,9 @@ public abstract class AbstractSchemaTestCase { inBrackets = false; if (! inBrackets) b.appendCodePoint(character); - if (character == '[') + if (character == '[' && lastChar != '{') inBrackets = true; + lastChar = character; } } return b.toString(); |