cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1498119 - in /cayenne/main/trunk: docs/doc/src/main/resources/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/
Date Sun, 30 Jun 2013 13:42:43 GMT
Author: aadamchik
Date: Sun Jun 30 13:42:43 2013
New Revision: 1498119

URL: http://svn.apache.org/r1498119
Log:
CAY-1559  Use Lifecycle Annotations as markers on PersistentObject methods

undoing r1497631 - it has performance problems that I'll describe in jira..
will work on a better solution

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1498119&r1=1498118&r2=1498119&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Sun Jun 30 13:42:43 2013
@@ -8,14 +8,6 @@ To browse individual bug reports check o
 https://issues.apache.org/jira/browse/CAY
 
 ----------------------------------
-Release: 3.2M2
-Date: 
-----------------------------------
-Changes/New Features:
-
-CAY-1559 Use Lifecycle Annotations as markers on PersistentObject methods 
-
-----------------------------------
 Release: 3.2M1
 Date: 
 ----------------------------------

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java?rev=1498119&r1=1498118&r2=1498119&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
Sun Jun 30 13:42:43 2013
@@ -219,10 +219,6 @@ public class EntityResolver implements M
                     }
                 }
 
-                // callbacks using annotations go first
-                callbackRegistry.addCallbacks(entityClass);
-
-                // callbacks mapped in the modeler follow
                 CallbackDescriptor[] callbacks = entity.getCallbackMap().getCallbacks();
                 for (CallbackDescriptor callback : callbacks) {
                     for (String method : callback.getCallbackMethods()) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java?rev=1498119&r1=1498118&r2=1498119&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
Sun Jun 30 13:42:43 2013
@@ -55,7 +55,6 @@ public class LifecycleCallbackRegistry {
     private LifecycleCallbackEventHandler[] eventCallbacks;
     private Map<String, AnnotationReader> annotationsMap;
     private Map<String, Collection<Class<?>>> entitiesByAnnotation;
-    private Map<Class<?>, Boolean> processedEntityClasses;
 
     /**
      * Creates an empty callback registry.
@@ -74,11 +73,6 @@ public class LifecycleCallbackRegistry {
 
         // other "static" lookup maps are initialized on-demand
         this.entitiesByAnnotation = new ConcurrentHashMap<String, Collection<Class<?>>>();
-        this.processedEntityClasses = new ConcurrentHashMap<Class<?>, Boolean>();
-
-        // prepopulating the map so that class hierarchy traversal could
-        // terminate when it reaches Object.
-        processedEntityClasses.put(Object.class, true);
     }
 
     /**
@@ -174,52 +168,6 @@ public class LifecycleCallbackRegistry {
     }
 
     /**
-     * Registers annotated methods of the entity class as callbacks for entity
-     * events.
-     * 
-     * @since 3.2
-     */
-    public void addCallbacks(Class<?> entityClass) {
-        if (entityClass == null) {
-            throw new NullPointerException("Null entity class");
-        }
-
-        // Only process Persistent Objects
-        if (!Persistent.class.isAssignableFrom(entityClass)) {
-            throw new CayenneRuntimeException("Class not assignable from Entity");
-        }
-
-        while (entityClass != null && processedEntityClasses.put(entityClass, true)
== null) {
-
-            for (Method m : entityClass.getDeclaredMethods()) {
-                for (Annotation a : m.getAnnotations()) {
-                    AnnotationReader reader = this.getAnnotationsMap().get(a.annotationType().getName());
-                    if (reader != null) {
-
-                        // Only register lifecycle annotations used as markers
-                        // (both entities and entityAnnotations must be empty)
-                        if (reader.entities(a).length > 0) {
-                            throw new CayenneRuntimeException(
-                                    "Entity listener annotation should not contain 'entities':
" + m.getName());
-                        }
-
-                        if (reader.entityAnnotations(a).length > 0) {
-                            throw new CayenneRuntimeException(
-                                    "Entity listener annotation should not contain 'entityAnnotations':
" + m.getName());
-                        }
-
-                        this.eventCallbacks[reader.eventType().ordinal()].addListener(entityClass,
m.getName());
-
-                    }
-                }
-            }
-
-            entityClass = entityClass.getSuperclass();
-        }
-
-    }
-
-    /**
      * Adds a listener, mapping its methods to events based on annotations.
      * 
      * @since 3.1



Mime
View raw message