fix logback-access/issues/34 by checking if dependency is a sub-model of the depender model.

ceki · ceki · commit dc35d552bbd8 · 2026-02-15T23:10:54.000+01:00
This commit has the model check for submodels of any depth. Previously only direct sub-models (only one level)
where looked into.

Signed-off-by: ceki &lt;ceki@qos.ch&gt;
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/FileCollisionAnalyserTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/FileCollisionAnalyserTest.java
@@ -110,7 +110,6 @@ public void runCollisionTest(String configFile, int fileAppenderCount, int rolli
         Appender<ILoggingEvent> fileAppender2 = aLogger.getAppender("FILE2");
         assertNull(fileAppender2);
 
-        //statusPrinter2.print(loggerContext);
 
         String expectationPattern = COLLISION_MESSAGE.replace("[", "\\[").replace("]", "\\]");
 
diff --git a/logback-core/src/main/java/ch/qos/logback/core/model/processor/DefaultProcessor.java b/logback-core/src/main/java/ch/qos/logback/core/model/processor/DefaultProcessor.java
@@ -237,7 +237,6 @@ protected int secondPhaseTraverse(Model model, ModelFilter modelFilter) {
         try {
 
             boolean allDependenciesStarted = allDependenciesStarted(model);
-
             ModelHandlerBase handler = null;
             if (model.isUnhandled() && allDependenciesStarted) {
                 handler = createHandler(model);
@@ -248,7 +247,7 @@ protected int secondPhaseTraverse(Model model, ModelFilter modelFilter) {
                 }
             }
 
-            if (!allDependenciesStarted && !dependencyIsADirectSubmodel(model)) {
+            if (!allDependenciesStarted && !dependencyIsLocatedInASubmodel(model)) {
                 return count;
             }
 
@@ -266,21 +265,31 @@ protected int secondPhaseTraverse(Model model, ModelFilter modelFilter) {
         return count;
     }
 
-    private boolean dependencyIsADirectSubmodel(Model model) {
-        List<String> dependecyNames = this.mic.getDependencyNamesForModel(model);
-        if (dependecyNames == null || dependecyNames.isEmpty()) {
+    private boolean dependencyIsLocatedInASubmodel(Model model) {
+        List<String> dependencyNames = this.mic.getDependencyNamesForModel(model);
+        if (dependencyNames == null || dependencyNames.isEmpty()) {
             return false;
         }
-        for (Model submodel : model.getSubModels()) {
-            if (submodel instanceof NamedComponentModel) {
-                NamedComponentModel namedComponentModel = (NamedComponentModel) submodel;
-                String subModelName = namedComponentModel.getName();
-                if (dependecyNames.contains(subModelName)) {
-                    return true;
-                }
+
+        return recursiveIsDependencyPredicate(dependencyNames, model);
+    }
+
+    private boolean recursiveIsDependencyPredicate(List<String> dependencyNames, Model model) {
+
+        if (model instanceof NamedComponentModel) {
+            NamedComponentModel namedComponentModel = (NamedComponentModel) model;
+            String modelName = namedComponentModel.getName();
+            if (dependencyNames.contains(modelName)) {
+                return true;
             }
         }
 
+        for(Model submodel : model.getSubModels()) {
+            boolean result = recursiveIsDependencyPredicate(dependencyNames, submodel);
+            if(result)
+                return true;
+        }
+
         return false;
     }
 
diff --git a/logback-core/src/main/java/ch/qos/logback/core/model/processor/FileCollisionAnalyser.java b/logback-core/src/main/java/ch/qos/logback/core/model/processor/FileCollisionAnalyser.java
@@ -84,16 +84,14 @@ private void checkForCollisions(ModelInterpretationContext mic, MapKey mapKey, A
 
         List<Model> matchingModels = Stream.concat(streamLevel1, streamLevel2).filter(m -> tagPredicate(m, tagName)).collect(Collectors.toList());
 
-        //List<Model> matchingModels = appenderModel.getSubModels().stream().filter(m -> tagPredicate(m, tagName)).collect(Collectors.toList());
-
         if(!matchingModels.isEmpty()) {
             ImplicitModel implicitModel = (ImplicitModel) matchingModels.get(0);
             String bodyValue = mic.subst(implicitModel.getBodyText());
 
 
-            Map<String, String> faileCollisionMap = getCollisionMapByKey(mic, mapKey);
+            Map<String, String> collisionMap = getCollisionMapByKey(mic, mapKey);
 
-            Optional<Map.Entry<String, String>> collision = faileCollisionMap.entrySet()
+            Optional<Map.Entry<String, String>> collision = collisionMap.entrySet()
                     .stream()
                     .filter(entry -> bodyValue.equals(entry.getValue()))
                     .findFirst();
@@ -105,7 +103,7 @@ private void checkForCollisions(ModelInterpretationContext mic, MapKey mapKey, A
             } else {
                 // add to collision map if and only if no collision detected
                 // reasoning: single entry is as effective as multiple entries for collision detection
-                faileCollisionMap.put(appenderName, bodyValue);
+                collisionMap.put(appenderName, bodyValue);
             }
         }
     }
