Author: aadamchik
Date: Fri Jul 6 19:33:07 2012
New Revision: 1358367
URL: http://svn.apache.org/viewvc?rev=1358367&view=rev
Log:
CAY-1718 Remove everything deprecated in 3.1
in progress
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientLocalRuntimeTest.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java?rev=1358367&r1=1358366&r2=1358367&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectStore.java
Fri Jul 6 19:33:07 2012
@@ -103,22 +103,6 @@ public class ObjectStore implements Seri
protected DataContext context;
/**
- * @deprecated since 3.1
- */
- @Deprecated
- public ObjectStore() {
- this(null);
- }
-
- /**
- * @deprecated since 3.1
- */
- @Deprecated
- public ObjectStore(DataRowStore dataRowCache) {
- this(dataRowCache, createObjectMap());
- }
-
- /**
* Creates an ObjectStore with {@link DataRowStore} and a map to use for
storing
* registered objects. Passed map doesn't require any special
synchronization
* behavior, as ObjectStore is synchronized itself.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java?rev=1358367&r1=1358366&r2=1358367&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java
Fri Jul 6 19:33:07 2012
@@ -27,6 +27,7 @@ import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.ValueHolder;
+import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.graph.MockGraphDiff;
import org.apache.cayenne.graph.NodeCreateOperation;
@@ -67,6 +68,9 @@ public class ClientServerChannelTest ext
@Inject
protected JdbcEventLogger logger;
+
+ @Inject
+ private ServerRuntime runtime;
private TableHelper tMtTable1;
private TableHelper tMtTable2;
@@ -210,8 +214,7 @@ public class ClientServerChannelTest ext
return super.onQuery(context, query);
}
};
- DataContext context = new DataContext(parent, new ObjectStore(
- new MockDataRowStore()));
+ DataContext context = (DataContext) runtime.getContext(parent);
QueryMessage message = new QueryMessage(new MockQuery());
new ClientServerChannel(context).onQuery(null, message.getQuery());
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java?rev=1358367&r1=1358366&r2=1358367&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackTest.java
Fri Jul 6 19:33:07 2012
@@ -59,8 +59,7 @@ public class DataContextDecoratedStackTe
public void testCommitDecorated() {
DataDomain dd = runtime.getDataDomain();
DataChannel decorator = new DataChannelDecorator(dd);
- DataContext context = new DataContext(decorator, new ObjectStore(dd
- .getSharedSnapshotCache()));
+ DataContext context = (DataContext) runtime.getContext(decorator);
Artist a = context.newObject(Artist.class);
a.setArtistName("XXX");
@@ -84,8 +83,7 @@ public class DataContextDecoratedStackTe
public void testGetParentDataDomain() {
DataDomain dd = runtime.getDataDomain();
DataChannel decorator = new DataChannelDecorator(dd);
- DataContext context = new DataContext(decorator, new ObjectStore(dd
- .getSharedSnapshotCache()));
+ DataContext context = (DataContext) runtime.getContext(decorator);
assertSame(dd, context.getParentDataDomain());
}
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java?rev=1358367&r1=1358366&r2=1358367&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java
Fri Jul 6 19:33:07 2012
@@ -19,11 +19,14 @@
package org.apache.cayenne.access;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistenceState;
+import org.apache.cayenne.Persistent;
import org.apache.cayenne.configuration.CayenneRuntime;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
@@ -139,8 +142,11 @@ public class DataContextSerializationTes
domain.getProperties(),
domain.getEventManager());
+ Map<Object, Persistent> map = new HashMap<Object, Persistent>();
+
DataContext localCacheContext = new DataContext(domain, new
ObjectStore(
- snapshotCache));
+ snapshotCache,
+ map));
localCacheContext.setValidatingObjectsOnCommit(domain
.isValidatingObjectsOnCommit());
localCacheContext.setUsingSharedSnapshotCache(false);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientLocalRuntimeTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientLocalRuntimeTest.java?rev=1358367&r1=1358366&r2=1358367&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientLocalRuntimeTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/rop/client/ClientLocalRuntimeTest.java
Fri Jul 6 19:33:07 2012
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.cayenne.configuration.rop.client;
+import static org.mockito.Mockito.mock;
+
import java.util.Collections;
import junit.framework.TestCase;
@@ -26,8 +28,6 @@ import org.apache.cayenne.DataChannel;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.access.ClientServerChannel;
import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.access.DataDomain;
-import org.apache.cayenne.access.ObjectStore;
import org.apache.cayenne.configuration.ObjectContextFactory;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.DIBootstrap;
@@ -45,8 +45,9 @@ public class ClientLocalRuntimeTest exte
}
};
- ClientLocalRuntime runtime = new ClientLocalRuntime(DIBootstrap
- .createInjector(serverModule), Collections.EMPTY_MAP);
+ ClientLocalRuntime runtime = new ClientLocalRuntime(
+ DIBootstrap.createInjector(serverModule),
+ Collections.EMPTY_MAP);
assertEquals(2, runtime.getModules().length);
Module m0 = runtime.getModules()[0];
@@ -55,7 +56,7 @@ public class ClientLocalRuntimeTest exte
public void testGetConnection() {
- final DataChannel channel = new DataDomain("xMn2");
+ final DataContext serverContext = mock(DataContext.class);
Module serverModule = new Module() {
@@ -68,14 +69,15 @@ public class ClientLocalRuntimeTest exte
}
public ObjectContext createContext() {
- return new DataContext(channel, new
ObjectStore());
+ return serverContext;
}
});
}
};
- ClientLocalRuntime runtime = new ClientLocalRuntime(DIBootstrap
- .createInjector(serverModule), Collections.EMPTY_MAP);
+ ClientLocalRuntime runtime = new ClientLocalRuntime(
+ DIBootstrap.createInjector(serverModule),
+ Collections.EMPTY_MAP);
ClientConnection connection = runtime.getConnection();
assertNotNull(connection);
@@ -85,7 +87,6 @@ public class ClientLocalRuntimeTest exte
assertTrue(localConnection.getChannel() instanceof
ClientServerChannel);
ClientServerChannel clientServerChannel = (ClientServerChannel)
localConnection
.getChannel();
- assertSame(channel, ((DataContext)
clientServerChannel.getParentChannel())
- .getChannel());
+ assertSame(serverContext, clientServerChannel.getParentChannel());
}
}
