commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject cvs commit: jakarta-commons/betwixt/src/test/org/apache/commons/betwixt RSSBeanWriter.java
Date Sun, 18 Jan 2004 23:01:53 GMT
rdonkin     2004/01/18 15:01:52

  Modified:    betwixt/src/java/org/apache/commons/betwixt Tag:
                        REFACTORING-BRANCH_2004-01-13 BeanProperty.java
                        IntrospectionConfiguration.java
                        XMLIntrospector.java
               betwixt/src/test/org/apache/commons/betwixt Tag:
                        REFACTORING-BRANCH_2004-01-13 RSSBeanWriter.java
  Log:
  Refactored method from XMLIntrospector into BeanProperty
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.1   +136 -4    jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/BeanProperty.java
  
  Index: BeanProperty.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/BeanProperty.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- BeanProperty.java	19 Oct 2003 14:53:52 -0000	1.4
  +++ BeanProperty.java	18 Jan 2004 23:01:52 -0000	1.4.2.1
  @@ -63,13 +63,17 @@
   
   import java.beans.PropertyDescriptor;
   import java.lang.reflect.Method;
  +import java.util.Map;
   
   import org.apache.commons.beanutils.DynaProperty;
  +import org.apache.commons.betwixt.digester.XMLIntrospectorHelper;
   import org.apache.commons.betwixt.expression.DynaBeanExpression;
   import org.apache.commons.betwixt.expression.Expression;
  +import org.apache.commons.betwixt.expression.IteratorExpression;
   import org.apache.commons.betwixt.expression.MethodExpression;
   import org.apache.commons.betwixt.expression.MethodUpdater;
   import org.apache.commons.betwixt.expression.Updater;
  +import org.apache.commons.logging.Log;
   
   /** 
     * Betwixt-centric view of a bean (or pseudo-bean) property.
  @@ -173,5 +177,133 @@
         */ 
       public Updater getPropertyUpdater() {
           return propertyUpdater;
  +    }
  +    
  +    /** 
  +     * Create a XML descriptor from a bean one. 
  +     * Go through and work out whether it's a loop property, a primitive or a standard.
  +     * The class property is ignored.
  +     *
  +     * @param beanProperty the BeanProperty specifying the property
  +     * @return a correctly configured <code>NodeDescriptor</code> for the property
  +     */
  +    public Descriptor createXMLDescriptor( IntrospectionConfiguration configuration ) {
  +        String name = getPropertyName();
  +        Class type = getPropertyType();
  +        Log log = configuration.getIntrospectionLog();
  +        if (log.isTraceEnabled()) {
  +            log.trace("Creating descriptor for property: name="
  +                + name + " type=" + type);
  +        }
  +        
  +        Descriptor descriptor = null;
  +        Expression propertyExpression = getPropertyExpression();
  +        Updater propertyUpdater = getPropertyUpdater();
  +        
  +        if ( propertyExpression == null ) {
  +            if (log.isTraceEnabled()) {
  +                log.trace( "No read method for property: name="
  +                    + name + " type=" + type);
  +            }
  +            return null;
  +        }
  +        
  +        if ( log.isTraceEnabled() ) {
  +            log.trace( "Property expression=" + propertyExpression );
  +        }
  +        
  +        // choose response from property type
  +        
  +        // XXX: ignore class property ??
  +        if ( Class.class.equals( type ) && "class".equals( name ) ) {
  +            log.trace( "Ignoring class property" );
  +            return null;
  +            
  +        }
  +        
  +        //TODO replace with simple type support
  +        if ( XMLIntrospectorHelper.isPrimitiveType( type ) ) {
  +            if (log.isTraceEnabled()) {
  +                log.trace( "Primitive type: " + name);
  +            }
  +            if ( configuration.isAttributesForPrimitives() ) {
  +                if (log.isTraceEnabled()) {
  +                    log.trace( "Adding property as attribute: " + name );
  +                }
  +                descriptor = new AttributeDescriptor();
  +            } else {
  +                if (log.isTraceEnabled()) {
  +                    log.trace( "Adding property as element: " + name );
  +                }
  +                descriptor = new ElementDescriptor();
  +            }
  +            descriptor.setTextExpression( propertyExpression );
  +            if ( propertyUpdater != null ) {
  +                descriptor.setUpdater( propertyUpdater );
  +            }
  +            
  +        } else if ( XMLIntrospectorHelper.isLoopType( type ) ) {
  +            if (log.isTraceEnabled()) {
  +                log.trace("Loop type: " + name);
  +                log.trace("Wrap in collections? " + configuration.isWrapCollectionsInElement());
  +            }
  +            ElementDescriptor loopDescriptor = new ElementDescriptor();
  +            loopDescriptor.setContextExpression(
  +                new IteratorExpression( propertyExpression )
  +            );
  +            loopDescriptor.setWrapCollectionsInElement( configuration.isWrapCollectionsInElement()
);
  +            // XXX: need to support some kind of 'add' or handle arrays, Lists or indexed
properties
  +            //loopDescriptor.setUpdater( new MethodUpdater( writeMethod ) );
  +            if ( Map.class.isAssignableFrom( type ) ) {
  +                loopDescriptor.setQualifiedName( "entry" );
  +                // add elements for reading
  +                loopDescriptor.addElementDescriptor( new ElementDescriptor( "key" ) );
  +                loopDescriptor.addElementDescriptor( new ElementDescriptor( "value" ) );
  +            }
  +
  +            ElementDescriptor elementDescriptor = new ElementDescriptor();
  +            elementDescriptor.setWrapCollectionsInElement( configuration.isWrapCollectionsInElement()
);
  +            elementDescriptor.setElementDescriptors( new ElementDescriptor[] { loopDescriptor
} );
  +            
  +            descriptor = elementDescriptor;
  +            
  +        } else {
  +            if (log.isTraceEnabled()) {
  +                log.trace( "Standard property: " + name);
  +            }
  +            ElementDescriptor elementDescriptor = new ElementDescriptor();
  +            elementDescriptor.setContextExpression( propertyExpression );
  +            if ( propertyUpdater != null ) {
  +                elementDescriptor.setUpdater( propertyUpdater );
  +            }
  +            
  +            descriptor = elementDescriptor;
  +        }
  +
  +        if (descriptor instanceof NodeDescriptor) {
  +            NodeDescriptor nodeDescriptor = (NodeDescriptor) descriptor;
  +            if (descriptor instanceof AttributeDescriptor) {
  +                // we want to use the attributemapper only when it is an attribute.. 
  +                nodeDescriptor.setLocalName( 
  +                    configuration.getAttributeNameMapper().mapTypeToElementName( name )
);
  +                
  +            } else {
  +                nodeDescriptor.setLocalName( 
  +                    configuration.getElementNameMapper().mapTypeToElementName( name ) );
  +            }        
  +        }
  +  
  +        descriptor.setPropertyName( name );
  +        descriptor.setPropertyType( type );
  +        
  +        // XXX: associate more bean information with the descriptor?
  +        //nodeDescriptor.setDisplayName( propertyDescriptor.getDisplayName() );
  +        //nodeDescriptor.setShortDescription( propertyDescriptor.getShortDescription()
);
  +        
  +        if (log.isTraceEnabled()) {
  +            log.trace( "Created descriptor:" );
  +            log.trace( descriptor );
  +        }
  +        return descriptor;
       }
   }
  
  
  
  1.1.2.2   +32 -4     jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/Attic/IntrospectionConfiguration.java
  
  Index: IntrospectionConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/Attic/IntrospectionConfiguration.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- IntrospectionConfiguration.java	18 Jan 2004 22:24:34 -0000	1.1.2.1
  +++ IntrospectionConfiguration.java	18 Jan 2004 23:01:52 -0000	1.1.2.2
  @@ -66,6 +66,8 @@
   import org.apache.commons.betwixt.strategy.DefaultPluralStemmer;
   import org.apache.commons.betwixt.strategy.NameMapper;
   import org.apache.commons.betwixt.strategy.PluralStemmer;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   
   /**
    * <p>Stores introspection phase binding configuration.</p>
  @@ -105,6 +107,9 @@
   
       /** Strategy normalizes the Class of the Object before introspection */
       private ClassNormalizer classNormalizer = new ClassNormalizer(); 
  +    
  +    /** Log for introspection messages */
  +    private Log introspectionLog = LogFactory.getLog(XMLIntrospector.class);
   
       /**
        * The strategy used to convert bean type names into attribute names
  @@ -113,6 +118,8 @@
       private NameMapper attributeNameMapper;
   
   
  +
  +
       /**
         * Gets the <code>ClassNormalizer</code> strategy.
         * This is used to determine the Class to be introspected
  @@ -275,4 +282,25 @@
       protected NameMapper createNameMapper() {
           return new DefaultNameMapper();
       }
  +    
  +    /**
  +     * Gets the common Log used for introspection.
  +     * It is more convenient to use a single Log
  +     * that can be easily configured.
  +     * @return Log, not null
  +     */
  +    public Log getIntrospectionLog() {
  +        return introspectionLog;
  +    }
  +
  +    /**
  +     * Sets the common Log used by introspection.
  +     * It is more convenient to use a single Log
  +     * that can be easily configured.
  +     * @param log Log, not null
  +     */
  +    public void setIntrospectionLog(Log log) {
  +        introspectionLog = log;
  +    }
  +
   }
  
  
  
  1.27.2.4  +68 -187   jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java
  
  Index: XMLIntrospector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java,v
  retrieving revision 1.27.2.3
  retrieving revision 1.27.2.4
  diff -u -r1.27.2.3 -r1.27.2.4
  --- XMLIntrospector.java	18 Jan 2004 22:25:22 -0000	1.27.2.3
  +++ XMLIntrospector.java	18 Jan 2004 23:01:52 -0000	1.27.2.4
  @@ -94,7 +94,6 @@
   import org.apache.commons.betwixt.strategy.NameMapper;
   import org.apache.commons.betwixt.strategy.PluralStemmer;
   import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   /** 
     * <p><code>XMLIntrospector</code> an introspector of beans to create
a 
  @@ -117,9 +116,6 @@
     * @version $Id$
     */
   public class XMLIntrospector {
  -
  -    /** Log used for logging (Doh!) */    
  -    protected Log log = LogFactory.getLog( XMLIntrospector.class );
       
       /** Maps classes to <code>XMLBeanInfo</code>'s */
       private XMLBeanInfoRegistry registry = new DefaultXMLBeanInfoRegistry();
  @@ -128,7 +124,7 @@
       private XMLBeanInfoDigester digester;
   
       /** Configuration to be used for introspection*/
  -    private IntrospectionConfiguration introspectionConfiguration;
  +    private IntrospectionConfiguration configuration;
       
       /** Base constructor */
       public XMLIntrospector() {
  @@ -154,7 +150,7 @@
        * @return the Log implementation which this class logs to
        */ 
       public Log getLog() {
  -        return log;
  +        return getConfiguration().getIntrospectionLog();
       }
   
       /**
  @@ -162,7 +158,7 @@
        * @param log the Log implementation to use for logging
        */ 
       public void setLog(Log log) {
  -        this.log = log;
  +        getConfiguration().setIntrospectionLog(log);
       }
       
       /** 
  @@ -206,7 +202,7 @@
        * @return IntrospectionConfiguration, not null
        */
       public IntrospectionConfiguration getConfiguration() {
  -        return introspectionConfiguration;
  +        return configuration;
       }
   
       /**
  @@ -218,7 +214,7 @@
        * @param configuration IntrospectionConfiguration, not null
        */
       public void setConfiguration(IntrospectionConfiguration configuration) {
  -        introspectionConfiguration = configuration;
  +        this.configuration = configuration;
       }
       
       
  @@ -434,9 +430,9 @@
         * @throws IntrospectionException when the bean introspection fails
         */
       public XMLBeanInfo introspect(Object bean) throws IntrospectionException {
  -        if (log.isDebugEnabled()) {
  -            log.debug( "Introspecting..." );
  -            log.debug(bean);
  +        if (getLog().isDebugEnabled()) {
  +            getLog().debug( "Introspecting..." );
  +            getLog().debug(bean);
           }
           
           if ( bean instanceof DynaBean ) {
  @@ -500,8 +496,8 @@
           
           if ( xmlInfo == null ) {
               // lets see if we can find an XML descriptor first
  -            if ( log.isDebugEnabled() ) {
  -                log.debug( "Attempting to lookup an XML descriptor for class: " + aClass
);
  +            if ( getLog().isDebugEnabled() ) {
  +                getLog().debug( "Attempting to lookup an XML descriptor for class: " +
aClass );
               }
               
               xmlInfo = findByXMLDescriptor( aClass );
  @@ -514,11 +510,11 @@
                   registry.put( aClass, xmlInfo );
               }
           } else {
  -            log.trace( "Used cached XMLBeanInfo." );
  +            getLog().trace( "Used cached XMLBeanInfo." );
           }
           
  -        if ( log.isTraceEnabled() ) {
  -            log.trace( xmlInfo );
  +        if ( getLog().isTraceEnabled() ) {
  +            getLog().trace( xmlInfo );
           }
           if ( !getConfiguration().useBeanInfoSearchPath() ) {
               // we restore the beaninfo searchpath.
  @@ -556,17 +552,17 @@
               getElementNameMapper().mapTypeToElementName( name ) );
           elementDescriptor.setPropertyType( bean.getElementType() );
           
  -        if (log.isTraceEnabled()) {
  -            log.trace("Populating:" + bean);
  +        if (getLog().isTraceEnabled()) {
  +            getLog().trace("Populating:" + bean);
           }
   
           // add default string value for primitive types
           if ( bean.isPrimitiveType() ) {
  -            log.trace("Bean is primitive");
  +            getLog().trace("Bean is primitive");
               elementDescriptor.setTextExpression( StringExpression.getInstance() );
               
           } else if ( bean.isLoopType() ) {
  -            log.trace("Bean is loop");
  +            getLog().trace("Bean is loop");
               ElementDescriptor loopDescriptor = new ElementDescriptor();
               loopDescriptor.setContextExpression(
                   new IteratorExpression( EmptyExpression.getInstance() )
  @@ -577,7 +573,7 @@
               elementDescriptor.setElementDescriptors( new ElementDescriptor[] { loopDescriptor
} );
               
           } else {
  -            log.trace("Bean is standard type");
  +            getLog().trace("Bean is standard type");
               List elements = new ArrayList();
               List attributes = new ArrayList();
               List contents = new ArrayList();
  @@ -611,9 +607,9 @@
           // default any addProperty() methods
           defaultAddMethods( elementDescriptor, bean.getElementType() );
           
  -        if (log.isTraceEnabled()) {
  -            log.trace("Populated descriptor:");
  -            log.trace(elementDescriptor);
  +        if (getLog().isTraceEnabled()) {
  +            getLog().trace("Populated descriptor:");
  +            getLog().trace(elementDescriptor);
           }
       }
   
  @@ -663,122 +659,7 @@
        * @return a correctly configured <code>NodeDescriptor</code> for the property
        */
       public Descriptor createXMLDescriptor( BeanProperty beanProperty ) {
  -        String name = beanProperty.getPropertyName();
  -        Class type = beanProperty.getPropertyType();
  -       
  -        if (log.isTraceEnabled()) {
  -            log.trace("Creating descriptor for property: name="
  -                + name + " type=" + type);
  -        }
  -        
  -        Descriptor descriptor = null;
  -        Expression propertyExpression = beanProperty.getPropertyExpression();
  -        Updater propertyUpdater = beanProperty.getPropertyUpdater();
  -        
  -        if ( propertyExpression == null ) {
  -            if (log.isTraceEnabled()) {
  -                log.trace( "No read method for property: name="
  -                    + name + " type=" + type);
  -            }
  -            return null;
  -        }
  -        
  -        if ( log.isTraceEnabled() ) {
  -            log.trace( "Property expression=" + propertyExpression );
  -        }
  -        
  -        // choose response from property type
  -        
  -        // XXX: ignore class property ??
  -        if ( Class.class.equals( type ) && "class".equals( name ) ) {
  -            log.trace( "Ignoring class property" );
  -            return null;
  -            
  -        }
  -        
  -        if ( isPrimitiveType( type ) ) {
  -            if (log.isTraceEnabled()) {
  -                log.trace( "Primitive type: " + name);
  -            }
  -            if ( isAttributesForPrimitives() ) {
  -                if (log.isTraceEnabled()) {
  -                    log.trace( "Adding property as attribute: " + name );
  -                }
  -                descriptor = new AttributeDescriptor();
  -            } else {
  -                if (log.isTraceEnabled()) {
  -                    log.trace( "Adding property as element: " + name );
  -                }
  -                descriptor = new ElementDescriptor();
  -            }
  -            descriptor.setTextExpression( propertyExpression );
  -            if ( propertyUpdater != null ) {
  -                descriptor.setUpdater( propertyUpdater );
  -            }
  -            
  -        } else if ( isLoopType( type ) ) {
  -            if (log.isTraceEnabled()) {
  -                log.trace("Loop type: " + name);
  -                log.trace("Wrap in collections? " + isWrapCollectionsInElement());
  -            }
  -            ElementDescriptor loopDescriptor = new ElementDescriptor();
  -            loopDescriptor.setContextExpression(
  -                new IteratorExpression( propertyExpression )
  -            );
  -            loopDescriptor.setWrapCollectionsInElement( isWrapCollectionsInElement() );
  -            // XXX: need to support some kind of 'add' or handle arrays, Lists or indexed
properties
  -            //loopDescriptor.setUpdater( new MethodUpdater( writeMethod ) );
  -            if ( Map.class.isAssignableFrom( type ) ) {
  -                loopDescriptor.setQualifiedName( "entry" );
  -                // add elements for reading
  -                loopDescriptor.addElementDescriptor( new ElementDescriptor( "key" ) );
  -                loopDescriptor.addElementDescriptor( new ElementDescriptor( "value" ) );
  -            }
  -
  -            ElementDescriptor elementDescriptor = new ElementDescriptor();
  -            elementDescriptor.setWrapCollectionsInElement( isWrapCollectionsInElement()
);
  -            elementDescriptor.setElementDescriptors( new ElementDescriptor[] { loopDescriptor
} );
  -            
  -            descriptor = elementDescriptor;
  -            
  -        } else {
  -            if (log.isTraceEnabled()) {
  -                log.trace( "Standard property: " + name);
  -            }
  -            ElementDescriptor elementDescriptor = new ElementDescriptor();
  -            elementDescriptor.setContextExpression( propertyExpression );
  -            if ( propertyUpdater != null ) {
  -                elementDescriptor.setUpdater( propertyUpdater );
  -            }
  -            
  -            descriptor = elementDescriptor;
  -        }
  -
  -        if (descriptor instanceof NodeDescriptor) {
  -            NodeDescriptor nodeDescriptor = (NodeDescriptor) descriptor;
  -            if (descriptor instanceof AttributeDescriptor) {
  -                // we want to use the attributemapper only when it is an attribute.. 
  -                nodeDescriptor.setLocalName( 
  -                    getAttributeNameMapper().mapTypeToElementName( name ) );
  -                
  -            } else {
  -                nodeDescriptor.setLocalName( 
  -                    getElementNameMapper().mapTypeToElementName( name ) );
  -            }        
  -        }
  -  
  -        descriptor.setPropertyName( name );
  -        descriptor.setPropertyType( type );
  -        
  -        // XXX: associate more bean information with the descriptor?
  -        //nodeDescriptor.setDisplayName( propertyDescriptor.getDisplayName() );
  -        //nodeDescriptor.setShortDescription( propertyDescriptor.getShortDescription()
);
  -        
  -        if (log.isTraceEnabled()) {
  -            log.trace( "Created descriptor:" );
  -            log.trace( descriptor );
  -        }
  -        return descriptor;
  +        return beanProperty.createXMLDescriptor( configuration );
       }
   
   
  @@ -821,16 +702,16 @@
                       // some beans will return something as a helper
                       Class[] types = method.getParameterTypes();
                       if ( types != null) {
  -                        if ( log.isTraceEnabled() ) {
  -                            log.trace("Searching for match for " + method);
  +                        if ( getLog().isTraceEnabled() ) {
  +                            getLog().trace("Searching for match for " + method);
                           }
                           
                           if ( ( types.length == 1 ) || types.length == 2 ) {
                               String propertyName = Introspector.decapitalize( name.substring(3)
);
                               if (propertyName.length() == 0)
                                   continue;
  -                            if ( log.isTraceEnabled() ) {
  -                                log.trace( name + "->" + propertyName );
  +                            if ( getLog().isTraceEnabled() ) {
  +                                getLog().trace( name + "->" + propertyName );
                               }
       
                               // now lets try find the ElementDescriptor which displays
  @@ -843,9 +724,9 @@
                                                               rootDescriptor, 
                                                               propertyName );
       
  -                            if ( log.isDebugEnabled() ) {
  -                                log.debug( "!! " + propertyName + " -> " + descriptor
);
  -                                log.debug( "!! " + name + " -> " 
  +                            if ( getLog().isDebugEnabled() ) {
  +                                getLog().debug( "!! " + propertyName + " -> " + descriptor
);
  +                                getLog().debug( "!! " + name + " -> " 
                                   + (descriptor!=null?descriptor.getPropertyName():"") );
                               }
                               if ( descriptor != null ) {
  @@ -853,14 +734,14 @@
                                       = Map.class.isAssignableFrom( descriptor.getPropertyType()
);
                                   if ( !isMapDescriptor && types.length == 1 ) {
                                       // this may match a standard collection or iteration
  -                                    log.trace("Matching collection or iteration");
  +                                    getLog().trace("Matching collection or iteration");
                                       
                                       descriptor.setUpdater( new MethodUpdater( method )
);
                                       descriptor.setSingularPropertyType( types[0] );
                                       
  -                                    if ( log.isDebugEnabled() ) {
  -                                        log.debug( "!! " + method);
  -                                        log.debug( "!! " + types[0]);
  +                                    if ( getLog().isDebugEnabled() ) {
  +                                        getLog().debug( "!! " + method);
  +                                        getLog().debug( "!! " + types[0]);
                                       }
                                       
                                       // is there a child element with no localName
  @@ -878,13 +759,13 @@
   
                                   } else if ( isMapDescriptor && types.length ==
2 ) {
                                       // this may match a map
  -                                    log.trace("Matching map");
  +                                    getLog().trace("Matching map");
                                       ElementDescriptor[] children 
                                           = descriptor.getElementDescriptors();
                                       // see if the descriptor's been set up properly
                                       if ( children.length == 0 ) {
                                           
  -                                        log.info(
  +                                        getLog().info(
                                               "'entry' descriptor is missing for map. "
                                               + "Updaters cannot be set");
                                           
  @@ -906,8 +787,8 @@
                                                                   adder.getKeyUpdater() );
                                                   grandchildren[n].setSingularPropertyType(

                                                                   types[0] );
  -                                                if ( log.isTraceEnabled() ) {
  -                                                    log.trace(
  +                                                if ( getLog().isTraceEnabled() ) {
  +                                                    getLog().trace(
                                                           "Key descriptor: " + grandchildren[n]);
                                                   }                                     
         
                                                   
  @@ -919,8 +800,8 @@
                                                                       adder.getValueUpdater()
);
                                                   grandchildren[n].setSingularPropertyType(

                                                                       types[1] );
  -                                                if ( log.isTraceEnabled() ) {
  -                                                    log.trace(
  +                                                if ( getLog().isTraceEnabled() ) {
  +                                                    getLog().trace(
                                                           "Value descriptor: " + grandchildren[n]);
                                                   }
                                               }
  @@ -928,8 +809,8 @@
                                       }
                                   }
                               } else {
  -                                if ( log.isDebugEnabled() ) {
  -                                    log.debug( 
  +                                if ( getLog().isDebugEnabled() ) {
  +                                    getLog().debug( 
                                           "Could not find an ElementDescriptor with property
name: " 
                                           + propertyName + " to attach the add method: "
+ method 
                                       );
  @@ -964,8 +845,8 @@
           // create the Map of propertyName -> descriptor that the PluralStemmer will
choose
           Map map = new HashMap();
           //String propertyName = rootDescriptor.getPropertyName();
  -        if ( log.isTraceEnabled() ) {
  -            log.trace( "findPluralDescriptor( " + propertyName 
  +        if ( getLog().isTraceEnabled() ) {
  +            getLog().trace( "findPluralDescriptor( " + propertyName 
                   + " ):root property name=" + rootDescriptor.getPropertyName() );
           }
           
  @@ -977,8 +858,8 @@
           PluralStemmer stemmer = getPluralStemmer();
           ElementDescriptor elementDescriptor = stemmer.findPluralDescriptor( propertyName,
map );
           
  -        if ( log.isTraceEnabled() ) {
  -            log.trace( 
  +        if ( getLog().isTraceEnabled() ) {
  +            getLog().trace( 
                   "findPluralDescriptor( " + propertyName 
                       + " ):ElementDescriptor=" + elementDescriptor );
           }
  @@ -1054,8 +935,8 @@
           if ( url != null ) {
               try {
                   String urlText = url.toString();
  -                if ( log.isDebugEnabled( )) {
  -                    log.debug( "Parsing Betwixt XML descriptor: " + urlText );
  +                if ( getLog().isDebugEnabled( )) {
  +                    getLog().debug( "Parsing Betwixt XML descriptor: " + urlText );
                   }
                   // synchronized method so this digester is only used by
                   // one thread at once
  @@ -1066,12 +947,12 @@
                   digester.setBeanClass( aClass );
                   return (XMLBeanInfo) digester.parse( urlText );
               } catch (Exception e) {
  -                log.warn( "Caught exception trying to parse: " + name, e );
  +                getLog().warn( "Caught exception trying to parse: " + name, e );
               }
           }
           
  -        if ( log.isTraceEnabled() ) {
  -            log.trace( "Could not find betwixt file " + name );
  +        if ( getLog().isTraceEnabled() ) {
  +            getLog().trace( "Could not find betwixt file " + name );
           }
           return null;
       }
  @@ -1099,10 +980,10 @@
                   addProperty(beanInfo, descriptors[i], elements, attributes, contents);
               }
           }
  -        if (log.isTraceEnabled()) {
  -            log.trace(elements);
  -            log.trace(attributes);
  -            log.trace(contents);
  +        if (getLog().isTraceEnabled()) {
  +            getLog().trace(elements);
  +            getLog().trace(attributes);
  +            getLog().trace(contents);
           }
       }
       /** 
  @@ -1119,18 +1000,18 @@
                                       List attributes,
                                       List contents) {
           if ( beanProperties != null ) {
  -            if (log.isTraceEnabled()) {
  -                log.trace(beanProperties.length + " properties to be added");
  +            if (getLog().isTraceEnabled()) {
  +                getLog().trace(beanProperties.length + " properties to be added");
               }
               for ( int i = 0, size = beanProperties.length; i < size; i++ ) {
                   addProperty(beanProperties[i], elements, attributes, contents);
               }
           }
  -        if (log.isTraceEnabled()) {
  -            log.trace("After properties have been added (elements, attributes, contents):");
  -            log.trace(elements);
  -            log.trace(attributes);
  -            log.trace(contents);
  +        if (getLog().isTraceEnabled()) {
  +            getLog().trace("After properties have been added (elements, attributes, contents):");
  +            getLog().trace(elements);
  +            getLog().trace(attributes);
  +            getLog().trace(contents);
           }
       }    
   
  @@ -1232,9 +1113,9 @@
                   addProperty(beanInfo, descriptors[i], elements, attributes);
               }
           }
  -        if (log.isTraceEnabled()) {
  -            log.trace(elements);
  -            log.trace(attributes);
  +        if (getLog().isTraceEnabled()) {
  +            getLog().trace(elements);
  +            getLog().trace(attributes);
           }
       }
       
  
  
  
  No                   revision
  No                   revision
  1.5.2.1   +2 -2      jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/RSSBeanWriter.java
  
  Index: RSSBeanWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/RSSBeanWriter.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- RSSBeanWriter.java	9 Oct 2003 20:52:07 -0000	1.5
  +++ RSSBeanWriter.java	18 Jan 2004 23:01:52 -0000	1.5.2.1
  @@ -7,7 +7,7 @@
    * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -100,7 +100,7 @@
           
       public void write(Object bean) throws Exception {
           BeanWriter writer = new BeanWriter();
  -        writer.getXMLIntrospector().setAttributesForPrimitives(false);
  +        writer.getXMLIntrospector().getConfiguration().setAttributesForPrimitives(false);
           writer.enablePrettyPrint();
           writer.write( bean );
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message