From 3f66466af5e58bc37c46b533dfd087c45b210d9b Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 20 Feb 2018 18:59:45 +0100 Subject: Revert "Bratseth/typecheck all 2" --- .../main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/derived') 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 expressionMacros = new LinkedHashMap<>(); for (Map.Entry macro : macros.entrySet()) { - expressionMacros.put(macro.getKey(), macro.getValue().asExpressionFunction()); + expressionMacros.put(macro.getKey(), macro.getValue().toExpressionMacro()); } Map 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 -- cgit v1.2.3