diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-02-28 12:50:16 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2022-02-28 12:50:16 +0100 |
| commit | bc0b204c89a1227489b6632e17bcf394f1d2f0fc (patch) | |
| tree | 7fe87062ba35f7927ff5e8576702ee37eea210e8 /config-model | |
| parent | 1af7b7470742445943fa2870fc0bd80666143f04 (diff) | |
Nicer error message
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java | 3 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java | 17 |
2 files changed, 10 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java index 24a8d81c754..656f78ba2a9 100644 --- a/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/config/model/builder/xml/ConfigModelBuilder.java @@ -80,9 +80,8 @@ public abstract class ConfigModelBuilder<MODEL extends ConfigModel> extends Abst private static String getIdString(Element spec) { String idString = XmlHelper.getIdString(spec); - if (idString == null || idString.isEmpty()) { + if (idString.isEmpty()) idString = spec.getTagName(); - } return idString; } 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 6960a0a8afd..26b4b78fcaa 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java @@ -965,12 +965,13 @@ public class RankProfile implements Cloneable { Map<String, RankingExpressionFunction> compiledFunctions = new LinkedHashMap<>(); Map.Entry<String, RankingExpressionFunction> entry; // Compile all functions. Why iterate in such a complicated way? - // Because some functions (imported models adding generated macros) may add other functions during compiling. + // Because some functions (imported models adding generated functions) may add other functions during compiling. // A straightforward iteration will either miss those functions, or may cause a ConcurrentModificationException while (null != (entry = findUncompiledFunction(functions.get(), compiledFunctions.keySet()))) { RankingExpressionFunction rankingExpressionFunction = entry.getValue(); RankingExpressionFunction compiled = compile(rankingExpressionFunction, queryProfiles, featureTypes, - importedModels, getConstants(), inlineFunctions, expressionTransforms); + importedModels, getConstants(), inlineFunctions, + expressionTransforms); compiledFunctions.put(entry.getKey(), compiled); } return compiledFunctions; @@ -986,12 +987,12 @@ public class RankProfile implements Cloneable { } private RankingExpressionFunction compile(RankingExpressionFunction function, - QueryProfileRegistry queryProfiles, - Map<Reference, TensorType> featureTypes, - ImportedMlModels importedModels, - Map<String, Value> constants, - Map<String, RankingExpressionFunction> inlineFunctions, - ExpressionTransforms expressionTransforms) { + QueryProfileRegistry queryProfiles, + Map<Reference, TensorType> featureTypes, + ImportedMlModels importedModels, + Map<String, Value> constants, + Map<String, RankingExpressionFunction> inlineFunctions, + ExpressionTransforms expressionTransforms) { if (function == null) return null; RankProfileTransformContext context = new RankProfileTransformContext(this, |