From dcfc689ea28052b7378805f805e3922b91d9e376 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sat, 10 Jun 2023 11:43:59 +0200 Subject: Revert "Make error message deterministic by sorting rule names" This reverts commit 7f13594d6595b81a291018f902c438d3aaea057b. --- .../vespa/model/container/search/SemanticRuleBuilder.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'config-model/src/main') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java index 4a295d49a32..b184861c102 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java @@ -12,9 +12,7 @@ import com.yahoo.prelude.semantics.parser.ParseException; import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -62,11 +60,9 @@ public class SemanticRuleBuilder { private void ensureZeroOrOneDefaultRule(SemanticRulesConfig config) { String defaultName = null; for (SemanticRulesConfig.Rulebase ruleBase : config.rulebase()) { - if (defaultName != null && ruleBase.isdefault()) { - List defaultRules = new ArrayList<>(List.of(defaultName, ruleBase.name())); - defaultRules.sort(String::compareTo); - throw new IllegalArgumentException("Rules " + defaultRules + " are both marked as the default rule, there can only be one"); - } + if (defaultName != null && ruleBase.isdefault()) + throw new IllegalArgumentException("Both '" + defaultName + "' and '" + ruleBase.name() + + "' is marked as default rule, there can only be one"); if (ruleBase.isdefault()) defaultName = ruleBase.name(); } -- cgit v1.2.3