diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-06-17 06:52:03 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2022-06-17 06:57:45 +0000 |
commit | 2f87b5f065f79dc742f7221234b0081600aa97f1 (patch) | |
tree | 4f7ea3e469f3517b011e31d7e3c1ffb313a6419e /config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.java | |
parent | a90639a4c194cbf486d20eba8969340a4ce461ad (diff) |
remove TemporarySDDocumentType
* track converted structs as we make them
* inherit directly instead of by name
* remove code to deal with the no-longer-needed temporaries
Diffstat (limited to 'config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.java b/config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.java index abe14b3689f..02d10bcb487 100644 --- a/config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ParsedStruct.java @@ -27,8 +27,13 @@ public class ParsedStruct extends ParsedBlock { List<ParsedField> getFields() { return List.copyOf(fields.values()); } List<String> getInherited() { return List.copyOf(inherited); } - ParsedDocument getOwnerDoc() { return ownedBy; } - String getOwnerName() { return ownedBy.name(); } + ParsedDocument getOwnerDoc() { + verifyThat(ownedBy != null, "not owned by any document"); + return ownedBy; + } + String getOwnerName() { return getOwnerDoc().name(); } + String getFullName() { return name() + " @ " + getOwnerName(); } + List<ParsedStruct> getResolvedInherits() { assert(inherited.size() == resolvedInherits.size()); return List.copyOf(resolvedInherits); |