summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLester Solbakken <lesters@yahoo-inc.com>2017-10-05 09:33:00 +0200
committerLester Solbakken <lesters@yahoo-inc.com>2017-10-05 09:33:00 +0200
commita7851e22759b8299fe83459cc306746cf1227eee (patch)
tree808b0885c5939880521278d68d7872e97ea950e3
parent66478ff38e8d38dd1109af7034de30f70d88c5b7 (diff)
MacroShadower: Log to DeployLogger
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/MacroShadower.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/MacroShadower.java b/config-model/src/main/java/com/yahoo/searchdefinition/MacroShadower.java
index 9e847492a81..e63b1caa97b 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/MacroShadower.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/MacroShadower.java
@@ -1,11 +1,14 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.searchdefinition;
+import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.config.model.application.provider.BaseDeployLogger;
import com.yahoo.searchlib.rankingexpression.RankingExpression;
import com.yahoo.searchlib.rankingexpression.rule.*;
import com.yahoo.searchlib.rankingexpression.transform.ExpressionTransformer;
import java.util.Map;
+import java.util.logging.Level;
import java.util.logging.Logger;
/**
@@ -23,7 +26,7 @@ import java.util.logging.Logger;
*/
class MacroShadower extends ExpressionTransformer {
- private static final Logger log = Logger.getLogger(MacroShadower.class.getName());
+ private static final DeployLogger logger = new BaseDeployLogger();
private final Map<String, RankProfile.Macro> macros;
@@ -58,11 +61,11 @@ class MacroShadower extends ExpressionTransformer {
int functionArity = function.getFunction().arity();
int macroArity = macro.getFormalParams() != null ? macro.getFormalParams().size() : 0;
if (functionArity != macroArity) {
- log.warning("Macro \"" + name + "\" has the same name as a built-in function. Due to different number of arguments, the built-in function will be used.");
+ logger.log(Level.WARNING, "Macro \"" + name + "\" has the same name as a built-in function. Due to different number of arguments, the built-in function will be used.");
return transformChildren(function);
}
- log.warning("Macro \"" + name + "\" shadows the built-in function with the same name.");
+ logger.log(Level.WARNING, "Macro \"" + name + "\" shadows the built-in function with the same name.");
ReferenceNode node = new ReferenceNode(name, function.children(), null);
return transformChildren(node);
}