diff options
| author | Arne H Juul <arnej@yahooinc.com> | 2022-03-16 08:26:46 +0000 |
|---|---|---|
| committer | Arne H Juul <arnej@yahooinc.com> | 2022-03-16 09:29:52 +0000 |
| commit | f5b958de6c8473dc7e09a6675af4c63d504827d8 (patch) | |
| tree | 4f138981f9980e383c84fddc2d24130e8449a458 /config-model/src/main/java/com/yahoo/searchdefinition/parser | |
| parent | d7fa54525e3d535c7f93b531bd0c620d6fdb0312 (diff) | |
simplify after refactoring
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/parser')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java index 1067081a477..80d37423fc5 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java @@ -107,8 +107,7 @@ public class ConvertParsedTypes { fillAnnotationStruct(annotation); } for (var struct : doc.getStructs()) { - String structId = doc.name() + "->" + struct.name(); - var toFill = structsFromSchemas.get(structId); + var toFill = findStructFromParsed(struct); // evil ugliness for (ParsedField field : struct.getFields()) { if (! field.hasIdOverride()) { @@ -124,8 +123,8 @@ public class ConvertParsedTypes { toFill.addField(f); } } - for (String inherit : struct.getInherited()) { - var parent = findStructFromSchemas(inherit, doc); + for (var inherit : struct.getResolvedInherits()) { + var parent = findStructFromParsed(inherit); // ensure a nice, compatible exception message for (var field : toFill.getFields()) { if (parent.hasField(field)) { |