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 2007/07/29 21:31:23 UTC
svn commit: r560785 - in
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src:
main/java/org/apache/cayenne/access/ClientServerChannel.java
test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
Author: aadamchik
Date: Sun Jul 29 12:31:22 2007
New Revision: 560785
URL: http://svn.apache.org/viewvc?view=rev&rev=560785
Log:
CAY-833 Remove API for flipping callbacks state in the ClientServerChannel - this is a non-feature
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java?view=diff&rev=560785&r1=560784&r2=560785
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/ClientServerChannel.java Sun Jul 29 12:31:22 2007
@@ -39,7 +39,6 @@
public class ClientServerChannel implements DataChannel {
protected DataContext serverContext;
- protected boolean lifecycleCallbacksEnabled;
public ClientServerChannel(DataDomain domain) {
this(domain.createDataContext());
@@ -47,6 +46,14 @@
ClientServerChannel(DataContext serverContext) {
this.serverContext = serverContext;
+
+ DataChannelCallbackInterceptor interceptor = new DataChannelCallbackInterceptor();
+
+ // must call pre-persist and pre-remove on commit
+ interceptor.setContextCallbacksEnabled(true);
+ interceptor.setChannel(serverContext.getChannel());
+
+ serverContext.setChannel(interceptor);
}
/**
@@ -101,46 +108,5 @@
int syncType) {
return getParentChannel().onSync(null, changes, syncType);
- }
-
- /**
- * @since 3.0
- */
- public boolean isLifecycleCallbacksEnabled() {
- return lifecycleCallbacksEnabled;
- }
-
- /**
- * Enables or disables lifecycle event callbacks for the underlying ObjectContext used
- * by this channel. Enabling callbacks allows server side logic to be applied to the
- * persistent objects during select and commit operations.
- *
- * @since 3.0
- */
- public void setLifecycleCallbacksEnabled(boolean lifecycleCallbacksEnabled) {
- if (lifecycleCallbacksEnabled != this.lifecycleCallbacksEnabled) {
- this.lifecycleCallbacksEnabled = lifecycleCallbacksEnabled;
-
- if (lifecycleCallbacksEnabled) {
- enableCallbacks();
- }
- else {
- disableCallbacks();
- }
- }
- }
-
- void enableCallbacks() {
- DataChannelCallbackInterceptor interceptor = new DataChannelCallbackInterceptor();
-
- // must call pre-persist and pre-remove on commit
- interceptor.setContextCallbacksEnabled(true);
- interceptor.setChannel(serverContext.getParentDataDomain());
-
- serverContext.setChannel(interceptor);
- }
-
- void disableCallbacks() {
- serverContext.setChannel(serverContext.getParentDataDomain());
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java?view=diff&rev=560785&r1=560784&r2=560785
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java Sun Jul 29 12:31:22 2007
@@ -50,9 +50,7 @@
deleteTestData();
- // must enable callbacks
ClientServerChannel csChannel = new ClientServerChannel(getDomain());
- csChannel.setLifecycleCallbacksEnabled(true);
// an exception was triggered within POST_LOAD callback
LifecycleCallbackRegistry callbackRegistry = csChannel