diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2018-02-20 18:59:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-20 18:59:45 +0100 |
| commit | 3f66466af5e58bc37c46b533dfd087c45b210d9b (patch) | |
| tree | 1addf3b16a3caec300ce773ee60960ccd78c9570 /config-model/src/main/java/com/yahoo/searchdefinition/derived | |
| parent | 2a343e5a88a023a3f3246db2f47726e229d28fac (diff) | |
Revert "Bratseth/typecheck all 2"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/derived')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java index b02362154d9..ea02f960800 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java @@ -188,7 +188,7 @@ public class RawRankProfile implements RankProfilesConfig.Producer { if (macros.isEmpty()) return; Map<String, ExpressionFunction> expressionMacros = new LinkedHashMap<>(); for (Map.Entry<String, RankProfile.Macro> macro : macros.entrySet()) { - expressionMacros.put(macro.getKey(), macro.getValue().asExpressionFunction()); + expressionMacros.put(macro.getKey(), macro.getValue().toExpressionMacro()); } Map<String, String> macroProperties = new LinkedHashMap<>(); @@ -223,7 +223,7 @@ public class RawRankProfile implements RankProfilesConfig.Producer { // Is the feature a macro? if (context.getFunction(referenceNode.getName()) != null) { context.addFunctionSerialization(RankingExpression.propertyName(referenceNode.getName()), - referenceNode.toString(context, null, null)); + referenceNode.toString(context, null, null)); ReferenceNode newReferenceNode = new ReferenceNode("rankingExpression(" + referenceNode.getName() + ")", referenceNode.getArguments().expressions(), referenceNode.getOutput()); macroSummaryFeatures.put(referenceNode.getName(), newReferenceNode); i.remove(); // Will add the expanded one in next block |