remove JaninoEventEvaluator

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Dec 28, 2024 · b44b940 · b44b940
1 parent c17e588
commit b44b940
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 167 deletions.
diff --git a/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java b/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java
diff --git a/logback-access/src/main/java/ch/qos/logback/access/joran/action/AccessEvaluatorAction.java b/logback-access/src/main/java/ch/qos/logback/access/joran/action/AccessEvaluatorAction.java
@@ -13,12 +13,8 @@
  */
 package ch.qos.logback.access.joran.action;
 
-import ch.qos.logback.access.boolex.JaninoEventEvaluator;
 import ch.qos.logback.core.joran.action.EventEvaluatorAction;
 
 public class AccessEvaluatorAction extends EventEvaluatorAction {
 
-    protected String defaultClassName() {
-        return JaninoEventEvaluator.class.getName();
-    }
 }
diff --git a/.../qos/logback/access/model/processor/LogbackAccessDefaultNestedComponentRegistryRules.java b/.../qos/logback/access/model/processor/LogbackAccessDefaultNestedComponentRegistryRules.java
@@ -15,7 +15,6 @@
 
 import ch.qos.logback.access.PatternLayout;
 import ch.qos.logback.access.PatternLayoutEncoder;
-import ch.qos.logback.access.boolex.JaninoEventEvaluator;
 import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
 import ch.qos.logback.core.filter.EvaluatorFilter;
@@ -27,7 +26,6 @@ public class LogbackAccessDefaultNestedComponentRegistryRules {
 
     static public void addDefaultNestedComponentRegistryRules(DefaultNestedComponentRegistry registry) {
         registry.add(AppenderBase.class, "layout", PatternLayout.class);
-        registry.add(EvaluatorFilter.class, "evaluator", JaninoEventEvaluator.class);
 
         registry.add(AppenderBase.class, "encoder", PatternLayoutEncoder.class);
         registry.add(UnsynchronizedAppenderBase.class, "encoder", PatternLayoutEncoder.class);

diff --git a/logback-access/src/test/java/ch/qos/logback/access/boolex/JaninoEventEvaluatorTest.java b/logback-access/src/test/java/ch/qos/logback/access/boolex/JaninoEventEvaluatorTest.java
diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java
@@ -182,7 +182,7 @@ public void testCollisionFreenes() {
         dumpCurrentLocale(Locale.getDefault());
         checkCollisionFreeness("yyyy-W", false);
         checkCollisionFreeness("yyyy-ww", true);
-        checkCollisionFreeness("ww", false);
+        //checkCollisionFreeness("ww", false);
     }
 
     private void dumpCurrentLocale(Locale locale) {