From f5b958de6c8473dc7e09a6675af4c63d504827d8 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Wed, 16 Mar 2022 08:26:46 +0000 Subject: simplify after refactoring --- .../java/com/yahoo/searchdefinition/parser/ConvertParsedTypes.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/parser') 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)) { -- cgit v1.2.3