You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/06/28 03:37:42 UTC
svn commit: r1497632 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/map/ main/java/org/apache/cayenne/reflect/
test/java/org/apache/cayenne/ test/java/org/apache/cayenne/access/
Author: aadamchik
Date: Fri Jun 28 01:37:42 2013
New Revision: 1497632
URL: http://svn.apache.org/r1497632
Log:
cleanup
Modified:
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
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java
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=1497632&r1=1497631&r2=1497632&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 Fri Jun 28 01:37:42 2013
@@ -226,7 +226,7 @@ public class EntityResolver implements M
CallbackDescriptor[] callbacks = entity.getCallbackMap().getCallbacks();
for (CallbackDescriptor callback : callbacks) {
for (String method : callback.getCallbackMethods()) {
- callbackRegistry.addListener(callback.getCallbackType(), entityClass, method);
+ callbackRegistry.addCallback(callback.getCallbackType(), entityClass, method);
}
}
}
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=1497632&r1=1497631&r2=1497632&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 Fri Jun 28 01:37:42 2013
@@ -158,10 +158,20 @@ public class LifecycleCallbackRegistry {
/**
* Registers a callback method to be invoked on an entity class instances
* when a lifecycle event occurs.
+ *
+ * @since 3.2
*/
- public void addListener(LifecycleEvent type, Class<?> entityClass, String methodName) {
+ public void addCallback(LifecycleEvent type, Class<?> entityClass, String methodName) {
eventCallbacks[type.ordinal()].addListener(entityClass, methodName);
}
+
+ /**
+ * @since 3.2 renamed to {@link #addCallback(LifecycleEvent, Class, String)}.
+ */
+ @Deprecated
+ public void addListener(LifecycleEvent type, Class<?> entityClass, String methodName) {
+ addCallback(type, entityClass, methodName);
+ }
/**
* Registers annotated methods of the entity class as callbacks for entity
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java?rev=1497632&r1=1497631&r2=1497632&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java Fri Jun 28 01:37:42 2013
@@ -207,7 +207,7 @@ public class CayenneContextWithDataConte
.getCallbackRegistry();
try {
- callbackRegistry.addListener(
+ callbackRegistry.addCallback(
LifecycleEvent.POST_ADD,
MtTable1.class,
"prePersistMethod");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java?rev=1497632&r1=1497631&r2=1497632&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextCallbacksTest.java Fri Jun 28 01:37:42 2013
@@ -67,7 +67,7 @@ public class DataContextCallbacksTest ex
assertNotNull(a1);
assertFalse(a1.isPostAdded());
- registry.addListener(LifecycleEvent.POST_ADD, Artist.class, "postAddCallback");
+ registry.addCallback(LifecycleEvent.POST_ADD, Artist.class, "postAddCallback");
Artist a2 = context.newObject(Artist.class);
assertNotNull(a2);
@@ -105,7 +105,7 @@ public class DataContextCallbacksTest ex
context.commitChanges();
assertFalse(a1.isPrePersisted());
- registry.addListener(
+ registry.addCallback(
LifecycleEvent.PRE_PERSIST,
Artist.class,
"prePersistCallback");
@@ -145,7 +145,7 @@ public class DataContextCallbacksTest ex
assertFalse(a1.isPreRemoved());
registry
- .addListener(LifecycleEvent.PRE_REMOVE, Artist.class, "preRemoveCallback");
+ .addCallback(LifecycleEvent.PRE_REMOVE, Artist.class, "preRemoveCallback");
Artist a2 = context.newObject(Artist.class);
a2.setArtistName("XX");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java?rev=1497632&r1=1497631&r2=1497632&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainCallbacksTest.java Fri Jun 28 01:37:42 2013
@@ -65,7 +65,7 @@ public class DataDomainCallbacksTest ext
public void testPostLoad() throws Exception {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
- registry.addListener(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
+ registry.addCallback(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
MockCallingBackListener listener = new MockCallingBackListener();
registry.addListener(
LifecycleEvent.POST_LOAD,
@@ -119,7 +119,7 @@ public class DataDomainCallbacksTest ext
public void testPostLoad_MixedResult() throws Exception {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
- registry.addListener(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
+ registry.addCallback(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
MockCallingBackListener listener = new MockCallingBackListener();
registry.addListener(
LifecycleEvent.POST_LOAD,
@@ -142,7 +142,7 @@ public class DataDomainCallbacksTest ext
public void testPostLoad_Relationship() throws Exception {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
- registry.addListener(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
+ registry.addCallback(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
MockCallingBackListener listener = new MockCallingBackListener();
registry.addListener(
LifecycleEvent.POST_LOAD,
@@ -176,7 +176,7 @@ public class DataDomainCallbacksTest ext
public void testPostLoad_Prefetch() throws Exception {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
- registry.addListener(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
+ registry.addCallback(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
MockCallingBackListener listener = new MockCallingBackListener();
registry.addListener(
LifecycleEvent.POST_LOAD,
@@ -209,7 +209,7 @@ public class DataDomainCallbacksTest ext
a1.setArtistName("XX");
context.commitChanges();
- registry.addListener(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
+ registry.addCallback(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
MockCallingBackListener listener = new MockCallingBackListener();
registry.addListener(
LifecycleEvent.POST_LOAD,
@@ -231,7 +231,7 @@ public class DataDomainCallbacksTest ext
public void testPostLoad_ThatModifiesObject() {
LifecycleCallbackRegistry registry = resolver.getCallbackRegistry();
- registry.addListener(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
+ registry.addCallback(LifecycleEvent.POST_LOAD, Artist.class, "postLoadCallback");
MockCallingBackListener listener = new MockCallingBackListener() {
@Override
public void publicCallback(Object entity) {
@@ -283,7 +283,7 @@ public class DataDomainCallbacksTest ext
assertFalse(a1.isPreUpdated());
registry
- .addListener(LifecycleEvent.PRE_UPDATE, Artist.class, "preUpdateCallback");
+ .addCallback(LifecycleEvent.PRE_UPDATE, Artist.class, "preUpdateCallback");
a1.setArtistName("ZZ");
context.commitChanges();
assertTrue(a1.isPreUpdated());
@@ -318,7 +318,7 @@ public class DataDomainCallbacksTest ext
context.commitChanges();
assertFalse(a1.isPostUpdated());
- registry.addListener(
+ registry.addCallback(
LifecycleEvent.POST_UPDATE,
Artist.class,
"postUpdateCallback");
@@ -351,7 +351,7 @@ public class DataDomainCallbacksTest ext
a1.setArtistName("XX");
context.commitChanges();
- registry.addListener(
+ registry.addCallback(
LifecycleEvent.POST_REMOVE,
Artist.class,
"postRemoveCallback");
@@ -444,7 +444,7 @@ public class DataDomainCallbacksTest ext
context.commitChanges();
assertFalse(a1.isPostPersisted());
- registry.addListener(
+ registry.addCallback(
LifecycleEvent.POST_PERSIST,
Artist.class,
"postPersistCallback");