[jbosscache-commits] JBoss Cache SVN: r6248 - in core/trunk/src: main/java/org/jboss/cache/config/parsing/element and 2 other directories.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-07-11 09:58:16 -0400 (Fri, 11 Jul 2008)
New Revision: 6248

Modified:
   core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java
   core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java
   core/trunk/src/main/java/org/jboss/cache/config/parsing/element/CustomInterceptorsElementParser.java
   core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
   core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java
   core/trunk/src/test/resources/configs/conf2x/eviction-enabled-cache.xml
Log:
fail early if trying to set an attribute that does not exist on an configuration object

Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java	2008-07-11 10:14:00 UTC (rev 6247)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java	2008-07-11 13:58:16 UTC (rev 6248)
@@ -426,7 +426,7 @@
       return defaultValue;
    }
 
-   public static void setValues(Object target, Map<?, ?> attribs, boolean isXmlAttribs)
+   public static void setValues(Object target, Map<?, ?> attribs, boolean isXmlAttribs, boolean failOnMissingSetter)
    {
       Class objectClass = target.getClass();
 
@@ -491,6 +491,7 @@
                {
                   m.invoke(target, parameter);
                   setterFound = true;
+                  break;
                }
                catch (Exception e)
                {
@@ -498,7 +499,7 @@
                }
             }
          }
-         if (!setterFound) throw new ConfigurationException("Couldn't find a setter method for parameter " + propName);
+         if (!setterFound && failOnMissingSetter) throw new ConfigurationException("Couldn't find a setter method for parameter " + propName);
       }
    }
 

Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java	2008-07-11 10:14:00 UTC (rev 6247)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser2x.java	2008-07-11 13:58:16 UTC (rev 6248)
@@ -99,7 +99,7 @@
       handleRenamedAttributes(attributes);
 
       Configuration c = new Configuration();
-      XmlConfigHelper.setValues(c, attributes.stringAttribs, false);
+      XmlConfigHelper.setValues(c, attributes.stringAttribs, false, false);
       // Special handling for XML elements -- we hard code the parsing
       setXmlValues(c, attributes.xmlAttribs);
 

Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/CustomInterceptorsElementParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/CustomInterceptorsElementParser.java	2008-07-11 10:14:00 UTC (rev 6247)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/CustomInterceptorsElementParser.java	2008-07-11 13:58:16 UTC (rev 6248)
@@ -106,7 +106,7 @@
          throw new ConfigurationException("CommandInterceptor class is not properly loaded in classloader", e);
       }
       ParsedAttributes attributes = XmlConfigHelper.extractAttributes(element);
-      XmlConfigHelper.setValues(result, attributes.stringAttribs, false);
+      XmlConfigHelper.setValues(result, attributes.stringAttribs, false, true);
       return result;
    }
 }

Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java	2008-07-11 10:14:00 UTC (rev 6247)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java	2008-07-11 13:58:16 UTC (rev 6248)
@@ -122,8 +122,8 @@
    {
       target.reset();
       ParsedAttributes attributes = XmlConfigHelper.extractAttributes(element);
-      XmlConfigHelper.setValues(target, attributes.stringAttribs, false);
-      XmlConfigHelper.setValues(target, attributes.xmlAttribs, true);
+      XmlConfigHelper.setValues(target, attributes.stringAttribs, false, true);
+      XmlConfigHelper.setValues(target, attributes.xmlAttribs, true, true);
       target.validate();
    }
 }

Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java	2008-07-11 10:14:00 UTC (rev 6247)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTransformerTest.java	2008-07-11 13:58:16 UTC (rev 6248)
@@ -50,8 +50,11 @@
 
    public void testEqualityOnTransformedFiles() throws Exception
    {
-      String[] fileNames = {"buddy-replication-cache.xml", "cacheloader-enabled-cache.xml",
-            "eviction-enabled-cache.xml", "local-cache.xml", "multiplexer-enabled-cache.xml",
+      String[] fileNames = {
+            "buddy-replication-cache.xml",
+            "cacheloader-enabled-cache.xml",
+            "eviction-enabled-cache.xml",
+            "local-cache.xml", "multiplexer-enabled-cache.xml",
             "optimistically-locked-cache.xml", "total-replication-cache.xml", "clonable-config.xml",
             "policyPerRegion-eviction.xml" , "default-test-config2x.xml"};
       for (String file : fileNames)
@@ -60,6 +63,7 @@
          String fileName = getFileName(file);
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          convertor.parse(fileName, baos, XSLT_FILE);
+//         System.out.println("result = \n" + baos);
 
          XmlConfigurationParser newParser = new XmlConfigurationParser();
          XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();

Modified: core/trunk/src/test/resources/configs/conf2x/eviction-enabled-cache.xml
===================================================================
--- core/trunk/src/test/resources/configs/conf2x/eviction-enabled-cache.xml	2008-07-11 10:14:00 UTC (rev 6247)
+++ core/trunk/src/test/resources/configs/conf2x/eviction-enabled-cache.xml	2008-07-11 13:58:16 UTC (rev 6248)
@@ -66,7 +66,6 @@
             </region>
             <region name="/org/jboss/data" policyClass="org.jboss.cache.eviction.LFUPolicy">
                <attribute name="maxNodes">5000</attribute>
-               <attribute name="timeToLiveSeconds">1000</attribute>
             </region>
             <region name="/org/jboss/test/data">
                <attribute name="maxNodes">5</attribute>