[jbosscache-commits] JBoss Cache SVN: r4857 - in pojo/trunk/src: main/java/org/jboss/cache/pojo/interceptors/dynamic and 3 other directories.

Author: jason.greene(a)jboss.com Date: 2007-12-13 20:58:52 -0500 (Thu, 13 Dec 2007) New Revision: 4857 Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/CachedType.java pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java pojo/trunk/src/main/resources/META-INF/pojocache-aop.xml pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java pojo/trunk/src/test/java/org/jboss/cache/pojo/test/Person.java Log: PCACHE-57 Add support for final fields Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java 2007-12-14 00:34:14 UTC (rev 4856) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java 2007-12-14 01:58:52 UTC (rev 4857) @@ -26,6 +26,7 @@ import org.jboss.cache.pojo.memory.FieldPersistentReference; import org.jboss.cache.pojo.util.AopUtil; import org.jboss.cache.pojo.util.Instantiator; +import org.jboss.cache.pojo.util.ObjectUtil; /** * Handling the advised pojo operations. No consideration of object graph here. @@ -49,14 +50,33 @@ util_ = util; } - public Object get(Fqn<?> fqn, Class<?> clazz, PojoInstance pojoInstance) - throws CacheException + public Object get(Fqn<?> fqn, Class<?> clazz, PojoInstance pojoInstance) throws CacheException { CachedType type = pCache_.getCachedType(clazz); - Object obj =Instantiator.newInstance(clazz); + Object obj = Instantiator.newInstance(clazz); + + // Eager initialize final fields, since these may not be intercepted + + try + { + for (FieldPersistentReference ref : type.getFinalFields()) + { + Field field = ref.getField(); + Object result; + + if (CachedType.isSimpleAttribute(field)) + result = cache_.get(fqn, field.getName()); + else + result = pCache_.getObject(fqn, field.getName()); + + field.set(obj, result); + } + } + catch (Exception e) + { + log.warn("Could not initialize final fields on object: " + ObjectUtil.identityString(obj)); + } - // TODO Need to populate the object from the cache as well. - // Insert interceptor at runtime InstanceAdvisor advisor = ((Advised) obj)._getInstanceAdvisor(); CacheFieldInterceptor interceptor = new CacheFieldInterceptor(pCache_, fqn, type); interceptor.setAopInstance(pojoInstance); Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/CachedType.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/CachedType.java 2007-12-14 00:34:14 UTC (rev 4856) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/impl/CachedType.java 2007-12-14 01:58:52 UTC (rev 4857) @@ -31,8 +31,8 @@ public class CachedType { // Types that are considered "primitive". - private static final Set immediates = - new HashSet(Arrays.asList(new Object[]{ + private static final Set<Object> immediates = + new HashSet<Object>(Arrays.asList(new Object[]{ String.class, Boolean.class, Double.class, @@ -57,8 +57,9 @@ private boolean immediate; // Java fields . Will use special FieldPersistentReference to prevent classloader leakage. - private List fields = new ArrayList(); - private Map fieldMap = new HashMap();// Name -> CachedAttribute + private List<FieldPersistentReference> fields = new ArrayList<FieldPersistentReference>(); + private List<FieldPersistentReference> finalFields = new ArrayList<FieldPersistentReference>(); + private Map<String, FieldPersistentReference> fieldMap = new HashMap<String, FieldPersistentReference>();// Name -> CachedAttribute public CachedType() { @@ -92,14 +93,19 @@ return immutable; } - public List getFields() + public List<FieldPersistentReference> getFields() { return fields; } + + public List<FieldPersistentReference> getFinalFields() + { + return finalFields; + } public Field getField(String name) { - FieldPersistentReference ref = (FieldPersistentReference) fieldMap.get(name); + FieldPersistentReference ref = fieldMap.get(name); if (ref == null) return null; return (Field) ref.get(); } @@ -209,7 +215,7 @@ for (int i = 0; i < classFields.length; i++) { Field f = classFields[i]; - if (isNonReplicatable(f)) continue; + if (isNonReplicable(f)) continue; PrivilegedCode.setAccessible(f); @@ -217,17 +223,20 @@ fields.add(persistentRef); fieldMap.put(f.getName(), persistentRef); + + if (Modifier.isFinal(f.getModifiers())) + finalFields.add(persistentRef); } } - public static boolean isNonReplicatable(Field field) + public static boolean isNonReplicable(Field field) { int mods = field.getModifiers(); /** * The following modifiers are ignored in the cache, i.e., they will not be stored in the cache. * Whenever, user trying to access these fields, it will be accessed from the in-memory version. */ - return Modifier.isStatic(mods) || Modifier.isTransient(mods) || Modifier.isFinal(mods) || + return Modifier.isStatic(mods) || Modifier.isTransient(mods) || field.isAnnotationPresent(org.jboss.cache.pojo.annotation.Transient.class); } Modified: pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java =================================================================== --- pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java 2007-12-14 00:34:14 UTC (rev 4856) +++ pojo/trunk/src/main/java/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java 2007-12-14 01:58:52 UTC (rev 4857) @@ -112,7 +112,7 @@ // Only if this field is replicatable. static, transient and final are not. CachedType fieldType = pCache_.getCachedType(field.getType()); Object value = ((FieldWriteInvocation) fieldInvocation).getValue(); - if (!CachedType.isNonReplicatable(field)) + if (!CachedType.isNonReplicable(field)) { if (CachedType.isSimpleAttribute(field)) { @@ -136,7 +136,7 @@ // Only if this field is replicatable CachedType fieldType = pCache_.getCachedType(field.getType()); - if (!CachedType.isNonReplicatable(field)) + if (!CachedType.isNonReplicable(field)) { Object result; if (CachedType.isSimpleAttribute(field)) Modified: pojo/trunk/src/main/resources/META-INF/pojocache-aop.xml =================================================================== --- pojo/trunk/src/main/resources/META-INF/pojocache-aop.xml 2007-12-14 00:34:14 UTC (rev 4856) +++ pojo/trunk/src/main/resources/META-INF/pojocache-aop.xml 2007-12-14 01:58:52 UTC (rev 4857) @@ -137,10 +137,13 @@ instrumented as well. --> - <!-- If a POJO has PojoCachable annotation, it will be asepectized. --> + <!-- If a POJO has Replicable annotation, it will be asepectized. --> <!-- Supports inheritance and polymorphism. It can either be a concrete class or an interface. All sub-classes or interface implementors will be instrumeneted. --> <prepare expr="field(* $instanceof{(a)org.jboss.cache.pojo.annotation.Replicable}-&gt;*)&quot; /> -</aop> + + <!-- Work around that ensures annotated classes which do not access fields are instrumented --> + <introduction expr=&quot;class($instanceof{(a)org.jboss.cache.pojo.annotation.Replicable})&quot;/&gt; +</aop> \ No newline at end of file Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java 2007-12-14 00:34:14 UTC (rev 4856) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/LocalTest.java 2007-12-14 01:58:52 UTC (rev 4857) @@ -154,6 +154,7 @@ } } + public void testMap() throws Exception { log.info("testMap() ...."); @@ -178,7 +179,29 @@ assertEquals("Hobbies size", 2, hobbies.size()); log.debug("Hobbies is " + hobbies.toString()); } + public void testFinalMap() throws Exception + { + log.info("testMap() ...."); + Person ben = createPerson("/person/test1", "Ben Wang", 40); + assertEquals((Object) "Ben Wang", ben.getName()); + Map<String, String> map = ben.getFinalMap(); + if (!(map instanceof ClassProxy)) + { + fail("Final map is not an instance of ClassProxy"); + } + + map.put("test1", "testa"); + map.put("test2", "testb"); + assertEquals("Hobbies size", 2, map.size()); + ben = (Person) cache_.detach("/person/test1"); + map = ben.getFinalMap(); + if (!(map instanceof HashMap)) + { + fail("Final map is not an instance of HashMap"); + } + } + public void testMapDetachAttach() throws Exception { log.info("testMapDetachATtach() ...."); Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2007-12-14 00:34:14 UTC (rev 4856) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/ReplicatedTest.java 2007-12-14 01:58:52 UTC (rev 4857) @@ -112,6 +112,17 @@ ((Person) cache1.find("/person/test1")).getCurrentStatus()); cache.detach("/person/test1"); } + + public void testFinal() throws Exception + { + Person jason = createPerson("/person/test1", "Jason Greene", 28); + jason.getFinalMap().put("test1", "testa"); + jason.getFinalMap().put("test2", "testb"); + + Person jason2 = (Person) cache1.find("/person/test1"); + assertEquals("testa", jason2.getFinalMap().get("test1")); + assertEquals("testb", jason2.getFinalMap().get("test2")); + } public void testModification() throws Exception { Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/test/Person.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/test/Person.java 2007-12-14 00:34:14 UTC (rev 4856) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/test/Person.java 2007-12-14 01:58:52 UTC (rev 4857) @@ -7,6 +7,8 @@ package org.jboss.cache.pojo.test; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -40,10 +42,11 @@ private List<String> medication = null; private static final int AGE1 = 50; private static final int AGE2 = 60; + private final Map<String, String> finalMap; public Person() { - + finalMap = new HashMap<String, String>(); } public String getName() @@ -162,6 +165,11 @@ { this.languages = languages; } + + public Map<String, String> getFinalMap() + { + return this.finalMap; + } public String toString() {