consistent tagOwner()

4 files changed, 7 insertions, 6 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 b22c33c527d..9711419feee 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
@@ -194,7 +194,7 @@ public class ConvertParsedTypes {
         if (resolved == null) {
             throw new IllegalArgumentException("no struct named " + name + " in context " + context);
         }
-        String structId = resolved.getOwner() + "->" + resolved.name();
+        String structId = resolved.getOwnerName() + "->" + resolved.name();
         var struct = structsFromSchemas.get(structId);
         assert(struct != null);
         return struct;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAnnotation.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAnnotation.java
index 096effa6810..6f3d5a36616 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAnnotation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedAnnotation.java
@@ -32,6 +32,6 @@ class ParsedAnnotation extends ParsedBlock {
     void tagOwner(ParsedDocument owner) {
         verifyThat(ownedBy == null, "already owned by", ownedBy);
         this.ownedBy = owner;
-        getStruct().ifPresent(s -> s.tagOwner(owner.name()));
+        getStruct().ifPresent(s -> s.tagOwner(owner));
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java
index 679ed72c6f2..5f79098afbe 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocument.java
@@ -58,7 +58,7 @@ public class ParsedDocument extends ParsedBlock {
         String sName = struct.name();
         verifyThat(! docStructs.containsKey(sName), "already has struct", sName);
         docStructs.put(sName, struct);
-        struct.tagOwner(name());
+        struct.tagOwner(this);
     }
 
     void addAnnotation(ParsedAnnotation annotation) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java
index b5f297cf5da..753c13b5a5a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedStruct.java
@@ -16,7 +16,7 @@ public class ParsedStruct extends ParsedBlock {
     private final List<String> inherited = new ArrayList<>();
     private final Map<String, ParsedField> fields = new LinkedHashMap<>();
     private final ParsedType asParsedType;
-    private String ownedBy = null;
+    private ParsedDocument ownedBy = null;
 
     public ParsedStruct(String name) {
         super(name, "struct");
@@ -26,7 +26,8 @@ public class ParsedStruct extends ParsedBlock {
 
     List<ParsedField> getFields() { return List.copyOf(fields.values()); }
     List<String> getInherited() { return List.copyOf(inherited); }
-    String getOwner() { return ownedBy; }
+    ParsedDocument getOwnerDoc() { return ownedBy; }
+    String getOwnerName() { return ownedBy.name(); }
 
     void addField(ParsedField field) {
         String fieldName = field.name();
@@ -39,7 +40,7 @@ public class ParsedStruct extends ParsedBlock {
         inherited.add(other);
     }
 
-    void tagOwner(String document) {
+    void tagOwner(ParsedDocument document) {
         verifyThat(ownedBy == null, "already owned by document "+ownedBy);
         this.ownedBy = document;
     }