ongoing work on LOGBACK-1164 - bridge methods

Author: ceki

logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java

@@ -36,7 +36,7 @@
 
 public abstract class GenericConfigurator extends ContextAwareBase {
 
-    private final BeanDescriptionCache beanDescriptionCache = new BeanDescriptionCache();
+    private BeanDescriptionCache beanDescriptionCache;
 
     protected Interpreter interpreter;
 
@@ -104,6 +104,9 @@ public final void doConfigure(InputStream inputStream) throws JoranException {
     }
 
     protected BeanDescriptionCache getBeanDescriptionCache() {
+        if (beanDescriptionCache == null) {
+            beanDescriptionCache = new BeanDescriptionCache(getContext());
+        }
         return beanDescriptionCache;
     }
 

logback-core/src/main/java/ch/qos/logback/core/joran/util/beans/BeanDescriptionCache.java

@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import ch.qos.logback.core.Context;
 import ch.qos.logback.core.spi.ContextAwareBase;
 
 /**
@@ -21,6 +22,10 @@ public class BeanDescriptionCache extends ContextAwareBase {
     private Map<Class<?>, BeanDescription> classToBeanDescription = new HashMap<Class<?>, BeanDescription>();
     private BeanDescriptionFactory beanDescriptionFactory;
 
+    public BeanDescriptionCache(Context context) {
+        setContext(context);
+    }
+
     private BeanDescriptionFactory getBeanDescriptionFactory() {
         if (beanDescriptionFactory == null) {
             beanDescriptionFactory = new BeanDescriptionFactory(getContext());

logback-core/src/test/java/ch/qos/logback/core/joran/SimpleConfigurator.java

@@ -16,12 +16,11 @@
 import java.util.HashMap;
 
 import ch.qos.logback.core.joran.action.Action;
-import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
 import ch.qos.logback.core.joran.action.NestedBasicPropertyIA;
-import ch.qos.logback.core.joran.spi.Interpreter;
+import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
 import ch.qos.logback.core.joran.spi.ElementSelector;
+import ch.qos.logback.core.joran.spi.Interpreter;
 import ch.qos.logback.core.joran.spi.RuleStore;
-import ch.qos.logback.core.joran.util.beans.BeanDescriptionCache;
 
 public class SimpleConfigurator extends GenericConfigurator {
 
@@ -33,11 +32,11 @@ public SimpleConfigurator(HashMap<ElementSelector, Action> rules) {
 
     @Override
     protected void addImplicitRules(Interpreter interpreter) {
-        NestedComplexPropertyIA nestedIA = new NestedComplexPropertyIA(new BeanDescriptionCache());
+        NestedComplexPropertyIA nestedIA = new NestedComplexPropertyIA(getBeanDescriptionCache());
         nestedIA.setContext(context);
         interpreter.addImplicitAction(nestedIA);
 
-        NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(new BeanDescriptionCache());
+        NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(getBeanDescriptionCache());
         nestedSimpleIA.setContext(context);
         interpreter.addImplicitAction(nestedSimpleIA);
     }

logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java

@@ -17,15 +17,14 @@
 
 import ch.qos.logback.core.joran.GenericConfigurator;
 import ch.qos.logback.core.joran.action.NOPAction;
-import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
 import ch.qos.logback.core.joran.action.NestedBasicPropertyIA;
+import ch.qos.logback.core.joran.action.NestedComplexPropertyIA;
 import ch.qos.logback.core.joran.event.SaxEvent;
+import ch.qos.logback.core.joran.spi.ElementSelector;
 import ch.qos.logback.core.joran.spi.EventPlayer;
 import ch.qos.logback.core.joran.spi.Interpreter;
 import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.joran.spi.ElementSelector;
 import ch.qos.logback.core.joran.spi.RuleStore;
-import ch.qos.logback.core.joran.util.beans.BeanDescriptionCache;
 
 public class FruitConfigurator extends GenericConfigurator {
 
@@ -45,12 +44,11 @@ final public void doConfigure(final List<SaxEvent> eventList) throws JoranExcept
 
     @Override
     protected void addImplicitRules(Interpreter interpreter) {
-    	BeanDescriptionCache beanDescriptionCache=new BeanDescriptionCache();
-        NestedComplexPropertyIA nestedIA = new NestedComplexPropertyIA(beanDescriptionCache);
+        NestedComplexPropertyIA nestedIA = new NestedComplexPropertyIA(getBeanDescriptionCache());
         nestedIA.setContext(context);
         interpreter.addImplicitAction(nestedIA);
 
-        NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(beanDescriptionCache);
+        NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(getBeanDescriptionCache());
         nestedIA.setContext(context);
         interpreter.addImplicitAction(nestedSimpleIA);
     }

logback-core/src/test/java/ch/qos/logback/core/joran/util/House.java

@@ -41,10 +41,13 @@ public class House {
     List<Window> windowList = new ArrayList<Window>();
     List<SwimmingPool> largePoolList = new ArrayList<SwimmingPool>();
 
+    Orange orange;
+    
     public String getCamelCase() {
         return camelCase;
     }
 
+    
     public void setCamelCase(String camelCase) {
         this.camelCase = camelCase;
     }
@@ -150,6 +153,10 @@ public Charset getCharset() {
     public void setCharset(Charset charset) {
         this.charset = charset;
     }
+    
+    public void setOrange(Orange o) {
+        this.orange = o;
+    }
 }
 
 class Door {
@@ -177,4 +184,4 @@ class LargeSwimmingPoolImpl implements SwimmingPool {
 
 enum HouseColor {
     WHITE, BLUE
-}
+}

logback-core/src/test/java/ch/qos/logback/core/joran/util/PropertySetterTest.java

@@ -22,6 +22,7 @@
 import java.nio.charset.Charset;
 import java.nio.charset.UnsupportedCharsetException;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -32,18 +33,25 @@
 import ch.qos.logback.core.spi.FilterReply;
 import ch.qos.logback.core.status.StatusChecker;
 import ch.qos.logback.core.util.AggregationType;
+import ch.qos.logback.core.util.StatusPrinter;
 
 public class PropertySetterTest {
 
     DefaultNestedComponentRegistry defaultComponentRegistry = new DefaultNestedComponentRegistry();
 
     Context context = new ContextBase();
     House house = new House();
-    PropertySetter setter = new PropertySetter(new BeanDescriptionCache(),house);
+    
+    PropertySetter setter; // = new PropertySetter(new BeanDescriptionCache(context), basket);
 
     @Before
     public void setUp() {
-        setter.setContext(context);
+        //setter.setContext(context);
+    }
+
+    @After
+    public void tearDown() {
+        StatusPrinter.print(context);
     }
 
     @Test
@@ -73,7 +81,7 @@ public void testCanAggregateComponent() {
     public void testSetProperty() {
         {
             House house = new House();
-            PropertySetter setter = new PropertySetter(new BeanDescriptionCache(),house);
+            PropertySetter setter = new PropertySetter(new BeanDescriptionCache(context), house);
             setter.setProperty("count", "10");
             setter.setProperty("temperature", "33.1");
 
@@ -88,7 +96,7 @@ public void testSetProperty() {
 
         {
             House house = new House();
-            PropertySetter setter = new PropertySetter(new BeanDescriptionCache(),house);
+            PropertySetter setter = new PropertySetter(new BeanDescriptionCache(context), house);
             setter.setProperty("Count", "10");
             setter.setProperty("Name", "jack");
             setter.setProperty("Open", "true");
@@ -218,4 +226,12 @@ public void charset() {
         StatusChecker checker = new StatusChecker(context);
         checker.containsException(UnsupportedCharsetException.class);
     }
+
+    // see also http://jira.qos.ch/browse/LOGBACK-1164
+    @Test
+    public void bridgeMethodsShouldBeIgnored() {
+        FruitBasket fruitBasket = new FruitBasket();
+        PropertySetter fruitBasketSetter = new PropertySetter(new BeanDescriptionCache(context), fruitBasket);
+        fruitBasketSetter.computeAggregationType("orange");
+    }
 }