In Context, remove collision map

Signed-off-by: ceki <ceki@qos.ch>

Author: ceki

logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java

@@ -376,7 +376,6 @@ public void reset() {
         resetCount++;
         super.reset();
         initEvaluatorMap();
-        initCollisionMaps();
         root.recursiveReset();
         resetTurboFilterList();
         cancelScheduledTasks();

logback-classic/src/test/java/ch/qos/logback/classic/LoggerContextTest.java

@@ -15,14 +15,10 @@
 
 import ch.qos.logback.classic.turbo.NOPTurboFilter;
 import ch.qos.logback.core.CoreConstants;
-import ch.qos.logback.core.rolling.helper.FileNamePattern;
 import ch.qos.logback.core.status.StatusManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.Map;
-
-import static ch.qos.logback.core.CoreConstants.FA_FILENAME_COLLISION_MAP;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class LoggerContextTest {
@@ -236,21 +232,6 @@ public void evaluatorMapPostReset() {
         assertNotNull(lc.getObject(CoreConstants.EVALUATOR_MAP));
     }
 
-    @SuppressWarnings("unchecked")
-    @Test
-    public void collisionMapsPostReset() {
-        lc.reset();
-
-        Map<String, String> fileCollisions = (Map<String, String>) lc.getObject(FA_FILENAME_COLLISION_MAP);
-        assertNotNull(fileCollisions);
-        assertTrue(fileCollisions.isEmpty());
-
-        Map<String, FileNamePattern> filenamePatternCollisionMap = (Map<String, FileNamePattern>) lc.getObject(
-                        CoreConstants.RFA_FILENAME_PATTERN_COLLISION_MAP);
-        assertNotNull(filenamePatternCollisionMap);
-        assertTrue(filenamePatternCollisionMap.isEmpty());
-    }
-
     // http://jira.qos.ch/browse/LOGBACK-142
     @Test
     public void concurrentModification() {

logback-core/src/main/java/ch/qos/logback/core/ContextBase.java

@@ -14,9 +14,7 @@
 package ch.qos.logback.core;
 
 import static ch.qos.logback.core.CoreConstants.CONTEXT_NAME_KEY;
-import static ch.qos.logback.core.CoreConstants.FA_FILENAME_COLLISION_MAP;
 import static ch.qos.logback.core.CoreConstants.HOSTNAME_KEY;
-import static ch.qos.logback.core.CoreConstants.RFA_FILENAME_PATTERN_COLLISION_MAP;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -65,7 +63,6 @@ public class ContextBase implements Context, LifeCycle {
     private volatile boolean started;
 
     public ContextBase() {
-        initCollisionMaps();
     }
 
     public StatusManager getStatusManager() {
@@ -103,11 +100,6 @@ public void putProperty(String key, String val) {
         }
     }
 
-    protected void initCollisionMaps() {
-        putObject(FA_FILENAME_COLLISION_MAP, new HashMap<String, String>());
-        putObject(RFA_FILENAME_PATTERN_COLLISION_MAP, new HashMap<String, FileNamePattern>());
-    }
-
     @Override
     public void addSubstitutionProperty(String key, String value) {
         if (key == null || value == null) {

logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java

@@ -99,23 +99,6 @@ public class CoreConstants {
      */
     public static final String EVALUATOR_MAP = "EVALUATOR_MAP";
 
-    /**
-     * Key used to locate a map Files used by FileAppender instances in context's
-     * object map.
-     * 
-     * Said map consists of entries of the type (appender name, File option)
-     */
-    public static final String FA_FILENAME_COLLISION_MAP = "FA_FILENAMES_MAP";
-
-    /**
-     * Key used to locate a collision map for RollingFileAppender instances in
-     * context's object map.
-     * 
-     * The collision map consists of entities of the type (appender name,
-     * FileNamePattern option)
-     */
-    public static final String RFA_FILENAME_PATTERN_COLLISION_MAP = "RFA_FILENAME_PATTERN_COLLISION_MAP";
-
     /**
      * By convention, we assume that the static method named "valueOf" taking a
      * string argument can restore a given object from its string representation.

logback-core/src/main/java/ch/qos/logback/core/FileAppender.java

@@ -137,42 +137,8 @@ public void stop() {
             return;
 
         super.stop();
-
-        Map<String, String> map = ContextUtil.getFilenameCollisionMap(context);
-        if (map == null || getName() == null)
-            return;
-
-        map.remove(getName());
     }
 
-//    protected boolean checkForFileCollisionInPreviousFileAppenders() {
-//        boolean collisionsDetected = false;
-//        if (fileName == null) {
-//            return false;
-//        }
-//        @SuppressWarnings("unchecked")
-//        Map<String, String> previousFilesMap = (Map<String, String>) context
-//                .getObject(CoreConstants.FA_FILENAME_COLLISION_MAP);
-//        if (previousFilesMap == null) {
-//            return collisionsDetected;
-//        }
-//        for (Entry<String, String> entry : previousFilesMap.entrySet()) {
-//            if (fileName.equals(entry.getValue())) {
-//                addErrorForCollision("File", entry.getValue(), entry.getKey());
-//                collisionsDetected = true;
-//            }
-//        }
-//        if (name != null) {
-//            previousFilesMap.put(getName(), fileName);
-//        }
-//        return collisionsDetected;
-//    }
-//
-//    protected void addErrorForCollision(String optionName, String optionValue, String appenderName) {
-//        addError("'" + optionName + "' option has the same value \"" + optionValue + "\" as that given for appender ["
-//                + appenderName + "] defined earlier.");
-//    }
-
     /**
      * <p>
      * Sets and <i>opens</i> the file where the log output will go. The specified

logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java

@@ -119,37 +119,6 @@ private boolean checkForFileAndPatternCollisions() {
         return false;
     }
 
-//    private boolean checkForCollisionsInPreviousRollingFileAppenders() {
-//        boolean collisionResult = false;
-//        if (triggeringPolicy instanceof RollingPolicyBase) {
-//            final RollingPolicyBase base = (RollingPolicyBase) triggeringPolicy;
-//            final FileNamePattern fileNamePattern = base.fileNamePattern;
-//            boolean collisionsDetected = innerCheckForFileNamePatternCollisionInPreviousRFA(fileNamePattern);
-//            if (collisionsDetected)
-//                collisionResult = true;
-//        }
-//        return collisionResult;
-//    }
-
-//    private boolean innerCheckForFileNamePatternCollisionInPreviousRFA(FileNamePattern fileNamePattern) {
-//        boolean collisionsDetected = false;
-//        @SuppressWarnings("unchecked") Map<String, FileNamePattern> map = (Map<String, FileNamePattern>) context.getObject(
-//                        CoreConstants.RFA_FILENAME_PATTERN_COLLISION_MAP);
-//        if (map == null) {
-//            return collisionsDetected;
-//        }
-//        for (Entry<String, FileNamePattern> entry : map.entrySet()) {
-//            if (fileNamePattern.equals(entry.getValue())) {
-//                //addErrorForCollision("FileNamePattern", entry.getValue().toString(), entry.getKey());
-//                collisionsDetected = true;
-//            }
-//        }
-//        if (name != null) {
-//            map.put(name, fileNamePattern);
-//        }
-//        return collisionsDetected;
-//    }
-
     private void initializeLengthCounter() {
         if(getLengthCounter() != null && currentlyActiveFile.exists()) {
             long currentFileLength = currentlyActiveFile.length();
@@ -169,11 +138,6 @@ public void stop() {
             rollingPolicy.stop();
         if (triggeringPolicy != null)
             triggeringPolicy.stop();
-
-        Map<String, FileNamePattern> map = ContextUtil.getFilenamePatternCollisionMap(context);
-        if (map != null && getName() != null)
-            map.remove(getName());
-
     }
 
     @Override

logback-core/src/main/java/ch/qos/logback/core/util/ContextUtil.java

@@ -13,9 +13,6 @@
  */
 package ch.qos.logback.core.util;
 
-import static ch.qos.logback.core.CoreConstants.FA_FILENAME_COLLISION_MAP;
-import static ch.qos.logback.core.CoreConstants.RFA_FILENAME_PATTERN_COLLISION_MAP;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -48,23 +45,6 @@ public void addProperties(Properties props) {
 
     }
 
-    public static Map<String, String> getFilenameCollisionMap(Context context) {
-        if (context == null)
-            return null;
-        @SuppressWarnings("unchecked")
-        Map<String, String> map = (Map<String, String>) context.getObject(FA_FILENAME_COLLISION_MAP);
-        return map;
-    }
-
-    public static Map<String, FileNamePattern> getFilenamePatternCollisionMap(Context context) {
-        if (context == null)
-            return null;
-        @SuppressWarnings("unchecked")
-        Map<String, FileNamePattern> map = (Map<String, FileNamePattern>) context
-                .getObject(RFA_FILENAME_PATTERN_COLLISION_MAP);
-        return map;
-    }
-
     public void addGroovyPackages(List<String> frameworkPackages) {
         addFrameworkPackage(frameworkPackages, GROOVY_RUNTIME_PACKAGE);
     }