Author: aadamchik
Date: Thu Jul 5 20:45:01 2012
New Revision: 1357894
URL: http://svn.apache.org/viewvc?rev=1357894&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/DataDomain.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java?rev=1357894&r1=1357893&r2=1357894&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
Thu Jul 5 20:45:01 2012
@@ -35,11 +35,8 @@ import org.apache.cayenne.DataChannelFil
import org.apache.cayenne.DataChannelSyncCallbackAction;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.QueryResponse;
-import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
-import org.apache.cayenne.cache.NestedQueryCache;
import org.apache.cayenne.cache.QueryCache;
import org.apache.cayenne.configuration.Constants;
-import org.apache.cayenne.configuration.ObjectContextFactory;
import org.apache.cayenne.di.BeforeScopeEnd;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.event.EventManager;
@@ -116,15 +113,6 @@ public class DataDomain implements Query
protected boolean stopped;
/**
- * Factory for creating QueryBuilders. Might be null, then default one
will be used.
- * Server-only.
- *
- * @deprecated since 3.1 BatchQueryBuilderFactory is injected into
JdbcAdapter.
- */
- @Deprecated
- private BatchQueryBuilderFactory queryBuilderFactory;
-
- /**
* Creates a DataDomain and assigns it a name.
*/
public DataDomain(String name) {
@@ -388,32 +376,12 @@ public class DataDomain implements Query
}
}
- /**
- * Registers new DataMap with this domain.
- *
- * @deprecated since 3.1 use a more consistently named {@link
#addDataMap(DataMap)}.
- */
- @Deprecated
- public void addMap(DataMap map) {
- addDataMap(map);
- }
-
public void addDataMap(DataMap dataMap) {
getEntityResolver().addDataMap(dataMap);
refreshEntitySorter();
}
/**
- * Returns DataMap matching <code>name</code> parameter.
- *
- * @deprecated since 3.1 use a more consistently named {@link
#getDataMap(String)}.
- */
- @Deprecated
- public DataMap getMap(String mapName) {
- return getEntityResolver().getDataMap(mapName);
- }
-
- /**
* @since 3.1
*/
public DataMap getDataMap(String mapName) {
@@ -424,17 +392,6 @@ public class DataDomain implements Query
* Removes named DataMap from this DataDomain and any underlying DataNodes
that
* include it.
*
- * @deprecated since 3.1 use a more consistently named {@link
#removeDataMap(String)}.
- */
- @Deprecated
- public void removeMap(String mapName) {
- removeDataMap(mapName);
- }
-
- /**
- * Removes named DataMap from this DataDomain and any underlying DataNodes
that
- * include it.
- *
* @since 3.1
*/
public void removeDataMap(String mapName) {
@@ -490,33 +447,6 @@ public class DataDomain implements Query
}
/**
- * Closes all data nodes, removes them from the list of available nodes.
- *
- * @deprecated since 3.1 unused and unneeded
- */
- @Deprecated
- public void reset() {
-
- nodes.clear();
- nodesByDataMapName.clear();
-
- if (entityResolver != null) {
- entityResolver.clearCache();
- entityResolver = null;
- }
- }
-
- /**
- * Clears the list of internal DataMaps.
- *
- * @deprecated since 3.1 unused and unneeded
- */
- @Deprecated
- public void clearDataMaps() {
- getEntityResolver().setDataMaps(Collections.EMPTY_LIST);
- }
-
- /**
* Adds new DataNode.
*/
public void addNode(DataNode node) {
@@ -533,47 +463,6 @@ public class DataDomain implements Query
}
/**
- * Creates and returns a new DataContext. If this DataDomain is configured
to use
- * shared cache, returned DataContext will use shared cache as well.
Otherwise a new
- * instance of DataRowStore will be used as its local cache.
- *
- * @deprecated since 3.1 as context creation is done via {@link
ObjectContextFactory}
- * and injection.
- */
- @Deprecated
- public DataContext createDataContext() {
- return createDataContext(isSharedCacheEnabled());
- }
-
- /**
- * Creates a new DataContext.
- *
- * @param useSharedCache determines whether resulting DataContext should
use shared
- * vs. local cache. This setting overrides default behavior
configured for
- * this DataDomain via {@link #SHARED_CACHE_ENABLED_PROPERTY}.
- * @since 1.1
- * @deprecated since 3.1 as context creation is done via {@link
ObjectContextFactory}
- * and injection.
- */
- @Deprecated
- public DataContext createDataContext(boolean useSharedCache) {
- // for new dataRowStores use the same name for all stores
- // it makes it easier to track the event subject
- DataRowStore snapshotCache = (useSharedCache)
- ? nonNullSharedSnapshotCache()
- : new DataRowStore(name, properties, eventManager);
-
- DataContext context = new DataContext(this, new
ObjectStore(snapshotCache));
-
- if (queryCache != null) {
- context.setQueryCache(new NestedQueryCache(queryCache));
- }
-
- context.setValidatingObjectsOnCommit(isValidatingObjectsOnCommit());
- return context;
- }
-
- /**
* Creates and returns a new inactive transaction. Returned transaction is
bound to
* the current execution thread.
* <p>
@@ -602,16 +491,6 @@ public class DataDomain implements Query
/**
* Returns registered DataNode whose name matches <code>name</code>
parameter.
*
- * @deprecated since 3.1, use a more consistently named {@link
#getDataNode(String)}.
- */
- @Deprecated
- public DataNode getNode(String nodeName) {
- return getDataNode(nodeName);
- }
-
- /**
- * Returns registered DataNode whose name matches <code>name</code>
parameter.
- *
* @since 3.1
*/
public DataNode getDataNode(String nodeName) {
@@ -619,23 +498,6 @@ public class DataDomain implements Query
}
/**
- * Updates internal index of DataNodes stored by the entity name.
- *
- * @deprecated since 3.1 - unneeded and unused.
- */
- @Deprecated
- public void reindexNodes() {
- nodesByDataMapName.clear();
-
- for (DataNode node : getDataNodes()) {
- for (DataMap map : node.getDataMaps()) {
- addDataMap(map);
- nodesByDataMapName.put(map.getName(), node);
- }
- }
- }
-
- /**
* Returns a DataNode that should handle queries for all entities in a
DataMap.
*
* @since 1.1
@@ -925,25 +787,6 @@ public class DataDomain implements Query
}
/**
- * Sets factory for creating QueryBuilders
- *
- * @deprecated since 3.1 BatchQueryBuilderFactory is injected into
JdbcAdapter.
- */
- @Deprecated
- public void setQueryBuilderFactory(BatchQueryBuilderFactory
queryBuilderFactory) {
- this.queryBuilderFactory = queryBuilderFactory;
- }
-
- /**
- * @return factory for creating QueryBuilders. Might be null
- * @deprecated since 3.1 BatchQueryBuilderFactory is injected into
JdbcAdapter.
- */
- @Deprecated
- public BatchQueryBuilderFactory getQueryBuilderFactory() {
- return queryBuilderFactory;
- }
-
- /**
* @since 3.1
*/
JdbcEventLogger getJdbcEventLogger() {
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainTest.java?rev=1357894&r1=1357893&r2=1357894&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataDomainTest.java
Thu Jul 5 20:45:01 2012
@@ -133,25 +133,6 @@ public class DataDomainTest extends Serv
assertNull(d1.getDataMap(m1.getName()));
}
- @Deprecated
- public void testReindexNodes() throws Exception {
- DataDomain domain = new DataDomain("dom1");
- DataMap map = new DataMap("map");
- DataNode node = new DataNode("1");
- node.setJdbcEventLogger(logger);
-
- domain.addNode(node);
-
- assertNull(domain.nodesByDataMapName.get("map"));
- node.addDataMap(map);
- assertNull(domain.nodesByDataMapName.get("map"));
-
- // testing this
- domain.reindexNodes();
-
- assertSame(node, domain.nodesByDataMapName.get("map"));
- }
-
public void testEntityResolverRefresh() throws Exception {
DataDomain domain = new DataDomain("dom1");
org.apache.cayenne.map.EntityResolver resolver =
domain.getEntityResolver();
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java?rev=1357894&r1=1357893&r2=1357894&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
Thu Jul 5 20:45:01 2012
@@ -220,7 +220,7 @@ public class DataDomainProviderTest exte
assertNotNull(node1.getAdapter());
assertEquals(OracleAdapter.class, node1.getAdapter().getClass());
- DataNode node2 = domain.getNode("node2");
+ DataNode node2 = domain.getDataNode("node2");
assertNotNull(node2);
assertEquals(1, node2.getDataMaps().size());
assertSame(map2, node2.getDataMaps().iterator().next());
