diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-09-07 21:49:17 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-09-07 21:49:17 +0200 |
commit | e0dd46186f2dead2fdc5666ee8063b3e1af33f69 (patch) | |
tree | 7c5f90608dd1ba17d362741277bf85185c088e69 /config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java | |
parent | fa5f599c6ce501a6af11d527292a5f7c982fa1c3 (diff) |
Use fully qualified rank-profile names
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java index 4c4cc3b524f..17b5953b824 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java @@ -217,17 +217,22 @@ public class RankProfile implements Cloneable { } } else { List<String> children = new ArrayList<>(); - children.add(getName()); + children.add(createFullyQualifiedName()); verifyNoInheritanceCycle(children, inherited); } } return inherited; } + private String createFullyQualifiedName() { + return (search != null) + ? (search.getName() + "." + getName()) + : getName(); + } private void verifyNoInheritanceCycle(List<String> children, RankProfile parent) { - children.add(parent.getName()); + children.add(parent.createFullyQualifiedName()); String root = children.get(0); - if (root.equals(parent.getName())) { + if (root.equals(parent.createFullyQualifiedName())) { throw new IllegalArgumentException("There is a cycle in the inheritance for rank-profile '" + root + "' = " + children); } if (parent.getInherited() != null) { |