[infinispan-commits] Infinispan SVN: r1743 - in trunk/core/src: main/java/org/infinispan/util and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-05-06 03:37:03 -0400 (Thu, 06 May 2010)
New Revision: 1743

Added:
   trunk/core/src/test/java/org/infinispan/config/ProgrammaticConfigurationTest.java
Modified:
   trunk/core/src/main/java/org/infinispan/config/Configuration.java
   trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java
Log:
[ISPN-422] (Configuration.setConsistentHashClass not working) Fixed.

Modified: trunk/core/src/main/java/org/infinispan/config/Configuration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/Configuration.java	2010-05-05 17:32:57 UTC (rev 1742)
+++ trunk/core/src/main/java/org/infinispan/config/Configuration.java	2010-05-06 07:37:03 UTC (rev 1743)
@@ -1502,7 +1502,7 @@
       /** The serialVersionUID */
       private static final long serialVersionUID = 752218766840948822L;
 
-      /** @configRef name="class",desc="Fully qualified name of class providing consistent hash algorithm" */
+      /** @configRef name="class", desc="Fully qualified name of class providing consistent hash algorithm" */
       protected String consistentHashClass = DefaultConsistentHash.class.getName();
 
       /** @configRef desc="Number of cluster-wide replicas for each cache entry." */
@@ -1520,7 +1520,7 @@
 
       @XmlAttribute(name="class")
       public void setConsistentHashClass(String consistentHashClass) {
-         testImmutability("class");
+         testImmutability("consistentHashClass");
          this.consistentHashClass = consistentHashClass;
       }
 

Modified: trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java	2010-05-05 17:32:57 UTC (rev 1742)
+++ trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java	2010-05-06 07:37:03 UTC (rev 1743)
@@ -201,7 +201,7 @@
     */
    public static Object getValue(Object instance, String fieldName) {
       Field f = findFieldRecursively(instance.getClass(), fieldName);
-      if (f == null) throw new CacheException("Could not find field named: " + fieldName + " on instance :" + instance);
+      if (f == null) throw new CacheException("Could not find field named '" + fieldName + "' on instance " + instance);
       try {
          f.setAccessible(true);
          return f.get(instance);

Added: trunk/core/src/test/java/org/infinispan/config/ProgrammaticConfigurationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/ProgrammaticConfigurationTest.java	                        (rev 0)
+++ trunk/core/src/test/java/org/infinispan/config/ProgrammaticConfigurationTest.java	2010-05-06 07:37:03 UTC (rev 1743)
@@ -0,0 +1,25 @@
+package org.infinispan.config;
+
+import org.infinispan.manager.CacheManager;
+import org.infinispan.test.AbstractInfinispanTest;
+import org.infinispan.test.fwk.TestCacheManagerFactory;
+import org.testng.annotations.Test;
+
+/**
+ * // TODO: Document this
+ *
+ * @author Galder Zamarreño
+ * @since // TODO
+ */
+ at Test(groups = "functional", testName = "config.ProgrammaticConfigurationTest")
+public class ProgrammaticConfigurationTest extends AbstractInfinispanTest {
+
+   public void testDefiningConfigurationOverridingConsistentHashClass() {
+      CacheManager cm = TestCacheManagerFactory.createLocalCacheManager();
+      Configuration c = new Configuration();
+      c.setConsistentHashClass("org.infinispan.distribution.DefaultConsistentHash");
+      Configuration oneCacheConfiguration = cm.defineConfiguration("oneCache", c);
+      assert oneCacheConfiguration.equals(c);
+   }
+
+}