summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/searchdefinition/parser
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2022-03-18 14:10:43 +0000
committerArne H Juul <arnej@yahooinc.com>2022-03-18 14:33:44 +0000
commite5e4662259cd3ffd9d35a66e4283990eb69a81d0 (patch)
tree6aaf9d10ab16ca4ef6c4511365e0bf6593b7c34a /config-model/src/main/java/com/yahoo/searchdefinition/parser
parent113ebf98906fc150154bd2f362d14b8e19d5226f (diff)
do inherit last
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/parser')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java
index a9532c080ee..3e91281c65a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java
@@ -107,11 +107,6 @@ public class ConvertParsedSchemas {
ConvertParsedFields fieldConverter)
{
SDDocumentType document = new SDDocumentType(parsed.name());
- for (String inherit : parsed.getInherited()) {
- var parent = convertedDocuments.get(inherit);
- assert(parent != null);
- document.inherit(parent);
- }
for (var struct : parsed.getStructs()) {
var structProxy = fieldConverter.convertStructDeclaration(schema, document, struct);
document.addType(structProxy);
@@ -125,6 +120,11 @@ public class ConvertParsedSchemas {
document.setFieldId(sdf, field.idOverride());
}
}
+ for (String inherit : parsed.getInherited()) {
+ var parent = convertedDocuments.get(inherit);
+ assert(parent != null);
+ document.inherit(parent);
+ }
convertedDocuments.put(parsed.name(), document);
schema.addDocument(document);
}