diff options
author | Jon Bratseth <bratseth@vespa.ai> | 2023-10-07 09:50:15 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@vespa.ai> | 2023-10-07 09:50:15 +0200 |
commit | b379c30b870594defd4ef5631ac09b2897aefcd1 (patch) | |
tree | 19a0d27dad179e58aed005dd89d53c3f1be158db /config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java | |
parent | 56263ccd8371b22e62f9db146e0c0bc3dffe7777 (diff) |
Support inheriting multiple document summaries
Diffstat (limited to 'config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java index 40ec84ec8bc..39a1d21965f 100644 --- a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedSchemas.java @@ -139,12 +139,7 @@ public class ConvertParsedSchemas { private void convertDocumentSummary(Schema schema, ParsedDocumentSummary parsed, TypeResolver typeContext) { var docsum = new DocumentSummary(parsed.name(), schema); - var inheritList = parsed.getInherited(); - if (inheritList.size() == 1) { - docsum.setInherited(inheritList.get(0)); - } else if (inheritList.size() != 0) { - throw new IllegalArgumentException("document-summary "+parsed.name()+" cannot inherit more than once"); - } + parsed.getInherited().forEach(inherited -> docsum.addInherited(inherited)); if (parsed.getFromDisk()) { docsum.setFromDisk(true); } |