diff --git a/pom.xml b/pom.xml index 6aa82a42..3e237bd4 100644 --- a/pom.xml +++ b/pom.xml @@ -234,11 +234,6 @@ 4.13.1 test - - org.slf4j - slf4j-simple - 1.7.30 - org.apache.commons commons-math3 diff --git a/src/main/java/org/hisp/dhis/rules/RuleConditionEvaluator.java b/src/main/java/org/hisp/dhis/rules/RuleConditionEvaluator.java index 4f3d3e39..65b9dc9c 100644 --- a/src/main/java/org/hisp/dhis/rules/RuleConditionEvaluator.java +++ b/src/main/java/org/hisp/dhis/rules/RuleConditionEvaluator.java @@ -10,18 +10,18 @@ import org.hisp.dhis.rules.models.RuleEvaluationResult; import org.hisp.dhis.rules.models.RuleValueType; import org.hisp.dhis.rules.models.TrackerObjectType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; public class RuleConditionEvaluator { - private static final Logger log = LoggerFactory.getLogger( RuleConditionEvaluator.class.getName() ); + private static final Logger log = Logger.getLogger( RuleConditionEvaluator.class.getName() ); public List getEvaluatedAndErrorRuleEffects( TrackerObjectType targetType, String targetUid, Map valueMap, Map> supplementaryData, List rules ) @@ -59,7 +59,7 @@ public List getRuleEvaluationResults( TrackerObjectType ta for ( Rule rule : orderRules( rules ) ) { - log.debug( "Evaluating programrule: " + rule.name() ); + log.fine( "Evaluating programrule: " + rule.name() ); try { List ruleEffects = new ArrayList<>(); @@ -101,7 +101,7 @@ public List getRuleEvaluationResults( TrackerObjectType ta for (RuleEvaluationResult ruleEvaluationResult : ruleEvaluationResults) { - log.debug("Rule " + ruleEvaluationResult.rule().name() + " with id " + ruleEvaluationResult.rule().uid() + + log.fine("Rule " + ruleEvaluationResult.rule().name() + " with id " + ruleEvaluationResult.rule().uid() + " executed for " + targetType.getName() + "(" + targetUid + ")" + " with condition (" + ruleEvaluationResult.rule().condition() + ")" + " was evaluated " + ruleEvaluationResult.evaluatedAs()); @@ -146,7 +146,7 @@ else if(e instanceof IllegalExpressionException) " raised an unexpected exception: " + e.getMessage(); } - log.error(errorMessage); + log.log(Level.SEVERE, errorMessage); ruleEvaluationResults.add(RuleEvaluationResult.errorRule(rule, errorMessage)); }