Revert "do inherit last"

This reverts commit e5e4662259cd3ffd9d35a66e4283990eb69a81d0.

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 3e91281c65a..a9532c080ee 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,6 +107,11 @@ 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);
@@ -120,11 +125,6 @@ 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);
     }