chore: replace slf4j with java.util.logging

dhis2 · Nov 28, 2023 · 131af77 · 131af77
1 parent d6b7665
commit 131af77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -234,11 +234,6 @@
             <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.30</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>

diff --git 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<RuleEffect> getEvaluatedAndErrorRuleEffects( TrackerObjectType targetType, String targetUid, Map<String, RuleVariableValue> valueMap,
                                             Map<String, List<String>> supplementaryData, List<Rule> rules )
@@ -59,7 +59,7 @@ public List<RuleEvaluationResult> getRuleEvaluationResults( TrackerObjectType ta
 
         for ( Rule rule : orderRules( rules ) )
         {
-            log.debug( "Evaluating programrule: " + rule.name() );
+            log.fine( "Evaluating programrule: " + rule.name() );
 
             try {
                 List<RuleEffect> ruleEffects = new ArrayList<>();
@@ -101,7 +101,7 @@ public List<RuleEvaluationResult> 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));
     }