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/02/17 21:27:32 UTC
svn commit: r508803 - in
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src:
main/java/org/apache/cayenne/ main/java/org/apache/cayenne/map/
test/java/org/apache/cayenne/ test/java/org/apache/cayenne/access/
test/java/org/apache/cayenne/acces...
Author: aadamchik
Date: Sat Feb 17 12:27:31 2007
New Revision: 508803
URL: http://svn.apache.org/viewvc?view=rev&rev=508803
Log:
removing index of DbEntities by Java class from EntityResolver.
It hasn't been used in runtime (except for DataObjectUtils, where the workaround is trivial), and actually caused some maintenance problems in JPA. Two afected public methods were deprecated and actually still work
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java Sat Feb 17 12:27:31 2007
@@ -101,13 +101,16 @@
// replacement ID is more tricky... do some sanity check...
if (id.isReplacementIdAttached()) {
- DbEntity entity = dataObject
+ ObjEntity objEntity = dataObject
.getObjectContext()
.getEntityResolver()
- .lookupDbEntity(dataObject);
+ .lookupObjEntity(dataObject);
- if (entity != null && entity.isFullReplacementIdAttached(id)) {
- return id.getReplacementIdMap();
+ if (objEntity != null) {
+ DbEntity entity = objEntity.getDbEntity();
+ if (entity != null && entity.isFullReplacementIdAttached(id)) {
+ return id.getReplacementIdMap();
+ }
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java Sat Feb 17 12:27:31 2007
@@ -453,22 +453,6 @@
else {
objEntityCache.put(entityClass, oe);
}
-
- // lookup DbEntity in EntityResolver cache to take into account all
- // DataMaps in the namespace
- Object dbEntity = dbEntityCache.get(oe.getDbEntityName());
- if (dbEntity != null) {
- Object existingDB = dbEntityCache.get(entityClass);
- if (existingDB != null) {
-
- if (existingDB != DUPLICATE_MARKER) {
- dbEntityCache.put(entityClass, DUPLICATE_MARKER);
- }
- }
- else {
- dbEntityCache.put(entityClass, dbEntity);
- }
- }
}
}
@@ -583,12 +567,11 @@
* services the specified class
*
* @return the required DbEntity, or null if none matches the specifier
+ * @deprecated since 3.0 - lookup DbEntity via ObjEntity instead.
*/
public synchronized DbEntity lookupDbEntity(Class aClass) {
- if (!indexedByClass) {
- throw new CayenneRuntimeException("Class index is disabled.");
- }
- return this._lookupDbEntity(aClass);
+ ObjEntity oe = lookupObjEntity(aClass);
+ return oe != null ? oe.getDbEntity() : null;
}
/**
@@ -596,9 +579,10 @@
* services the specified data Object
*
* @return the required DbEntity, or null if none matches the specifier
+ * @deprecated since 3.0 - lookup DbEntity via ObjEntity instead.
*/
public synchronized DbEntity lookupDbEntity(Persistent dataObject) {
- return this._lookupDbEntity(dataObject.getClass());
+ return lookupDbEntity(dataObject.getClass());
}
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java Sat Feb 17 12:27:31 2007
@@ -62,7 +62,7 @@
}
void updateId(DataContext context, ObjectId id) throws Exception {
- DbEntity entity = context.getEntityResolver().lookupDbEntity(Artist.class);
+ DbEntity entity = context.getEntityResolver().getDbEntity("ARTIST");
DataNode node = context.getParentDataDomain().lookupDataNode(entity.getDataMap());
Object pk = node
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java Sat Feb 17 12:27:31 2007
@@ -28,7 +28,6 @@
import java.util.Map;
import org.apache.art.Artist;
-import org.apache.art.Exhibit;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.query.SQLAction;
import org.apache.cayenne.query.SQLTemplate;
@@ -52,12 +51,12 @@
DataNode node = getNode();
- DbEntity artistEnt = node.getEntityResolver().lookupDbEntity(Artist.class);
+ DbEntity artistEnt = node.getEntityResolver().getDbEntity("ARTIST");
assertNotNull(node.getAdapter().getPkGenerator().generatePkForDbEntity(
node,
artistEnt));
- DbEntity exhibitEnt = node.getEntityResolver().lookupDbEntity(Exhibit.class);
+ DbEntity exhibitEnt = node.getEntityResolver().getDbEntity("EXHIBIT");
assertNotNull(node.getAdapter().getPkGenerator().generatePkForDbEntity(
node,
exhibitEnt));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java Sat Feb 17 12:27:31 2007
@@ -51,7 +51,9 @@
// test with adapter that supports keys...
DbAdapter adapter = buildAdapter(true);
- DbEntity dbEntity = resolver.lookupDbEntity(SimpleLockingTestEntity.class);
+ DbEntity dbEntity = resolver
+ .lookupObjEntity(SimpleLockingTestEntity.class)
+ .getDbEntity();
List qualifierAttributes = Arrays.asList(new Object[] {
dbEntity.getAttribute("LOCKING_TEST_ID"), dbEntity.getAttribute("NAME")
@@ -82,7 +84,8 @@
boolean generatesKeys = false;
BatchAction action = new BatchAction(batchQuery, adapter, resolver);
- action.runAsIndividualQueries(mockConnection,
+ action.runAsIndividualQueries(
+ mockConnection,
batchQueryBuilder,
new MockOperationObserver(),
generatesKeys);
@@ -96,7 +99,9 @@
// test with adapter that supports keys...
DbAdapter adapter = buildAdapter(true);
- DbEntity dbEntity = resolver.lookupDbEntity(SimpleLockingTestEntity.class);
+ DbEntity dbEntity = resolver
+ .lookupObjEntity(SimpleLockingTestEntity.class)
+ .getDbEntity();
List qualifierAttributes = Arrays.asList(new Object[] {
dbEntity.getAttribute("LOCKING_TEST_ID"), dbEntity.getAttribute("NAME")
@@ -127,7 +132,8 @@
boolean generatesKeys = false;
BatchAction action = new BatchAction(batchQuery, adapter, resolver);
try {
- action.runAsIndividualQueries(mockConnection,
+ action.runAsIndividualQueries(
+ mockConnection,
batchQueryBuilder,
new MockOperationObserver(),
generatesKeys);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java Sat Feb 17 12:27:31 2007
@@ -38,12 +38,12 @@
// test with adapter that supports keys
DbAdapter adapter = buildAdapter(true);
- InsertBatchQuery batch1 = new InsertBatchQuery(resolver
- .lookupDbEntity(GeneratedColumnTestEntity.class), 5);
+ InsertBatchQuery batch1 = new InsertBatchQuery(resolver.lookupObjEntity(
+ GeneratedColumnTestEntity.class).getDbEntity(), 5);
assertTrue(new BatchAction(batch1, adapter, resolver).hasGeneratedKeys());
- InsertBatchQuery batch2 = new InsertBatchQuery(resolver
- .lookupDbEntity(Artist.class), 5);
+ InsertBatchQuery batch2 = new InsertBatchQuery(resolver.lookupObjEntity(
+ Artist.class).getDbEntity(), 5);
assertFalse(new BatchAction(batch2, adapter, resolver).hasGeneratedKeys());
}
@@ -53,12 +53,12 @@
// test with adapter that does not support keys...
DbAdapter adapter = buildAdapter(false);
- InsertBatchQuery batch1 = new InsertBatchQuery(resolver
- .lookupDbEntity(GeneratedColumnTestEntity.class), 5);
+ InsertBatchQuery batch1 = new InsertBatchQuery(resolver.lookupObjEntity(
+ GeneratedColumnTestEntity.class).getDbEntity(), 5);
assertFalse(new BatchAction(batch1, adapter, resolver).hasGeneratedKeys());
- InsertBatchQuery batch2 = new InsertBatchQuery(resolver
- .lookupDbEntity(Artist.class), 5);
+ InsertBatchQuery batch2 = new InsertBatchQuery(resolver.lookupObjEntity(
+ Artist.class).getDbEntity(), 5);
assertFalse(new BatchAction(batch2, adapter, resolver).hasGeneratedKeys());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java Sat Feb 17 12:27:31 2007
@@ -35,55 +35,51 @@
* @author Andrus Adamchik, Mike Kienenberger
*/
public class DeleteBatchQueryBuilderTest extends LockingCase {
- public void testConstructor() throws Exception {
- DbAdapter adapter = new JdbcAdapter();
- DeleteBatchQueryBuilder builder =
- new DeleteBatchQueryBuilder(adapter);
+ public void testConstructor() throws Exception {
+ DbAdapter adapter = new JdbcAdapter();
- assertSame(adapter, builder.getAdapter());
- }
+ DeleteBatchQueryBuilder builder = new DeleteBatchQueryBuilder(adapter);
+
+ assertSame(adapter, builder.getAdapter());
+ }
public void testCreateSqlString() throws Exception {
- DbEntity entity =
- getDomain().getEntityResolver().lookupDbEntity(SimpleLockingTestEntity.class);
+ DbEntity entity = getDomain().getEntityResolver().lookupObjEntity(
+ SimpleLockingTestEntity.class).getDbEntity();
- List idAttributes =
- Collections.singletonList(entity.getAttribute("LOCKING_TEST_ID"));
+ List idAttributes = Collections.singletonList(entity
+ .getAttribute("LOCKING_TEST_ID"));
- DeleteBatchQuery deleteQuery =
- new DeleteBatchQuery(entity, idAttributes, null, 1);
+ DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity, idAttributes, null, 1);
DeleteBatchQueryBuilder builder = new DeleteBatchQueryBuilder(new JdbcAdapter());
String generatedSql = builder.createSqlString(deleteQuery);
assertNotNull(generatedSql);
assertEquals(
- "DELETE FROM "
- + entity.getName()
- + " WHERE LOCKING_TEST_ID = ?",
- generatedSql);
+ "DELETE FROM " + entity.getName() + " WHERE LOCKING_TEST_ID = ?",
+ generatedSql);
}
public void testCreateSqlStringWithNulls() throws Exception {
- DbEntity entity =
- getDomain().getEntityResolver().lookupDbEntity(SimpleLockingTestEntity.class);
+ DbEntity entity = getDomain().getEntityResolver().lookupObjEntity(
+ SimpleLockingTestEntity.class).getDbEntity();
- List idAttributes =
- Arrays.asList(
- new Object[] {
- entity.getAttribute("LOCKING_TEST_ID"),
- entity.getAttribute("NAME")});
+ List idAttributes = Arrays.asList(new Object[] {
+ entity.getAttribute("LOCKING_TEST_ID"), entity.getAttribute("NAME")
+ });
Collection nullAttributes = Collections.singleton("NAME");
- DeleteBatchQuery deleteQuery =
- new DeleteBatchQuery(entity, idAttributes, nullAttributes, 1);
+ DeleteBatchQuery deleteQuery = new DeleteBatchQuery(
+ entity,
+ idAttributes,
+ nullAttributes,
+ 1);
DeleteBatchQueryBuilder builder = new DeleteBatchQueryBuilder(new JdbcAdapter());
String generatedSql = builder.createSqlString(deleteQuery);
assertNotNull(generatedSql);
- assertEquals(
- "DELETE FROM "
+ assertEquals("DELETE FROM "
+ entity.getName()
- + " WHERE LOCKING_TEST_ID = ? AND NAME IS NULL",
- generatedSql);
+ + " WHERE LOCKING_TEST_ID = ? AND NAME IS NULL", generatedSql);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java Sat Feb 17 12:27:31 2007
@@ -43,43 +43,42 @@
}
public void testCreateSqlString() throws Exception {
- DbEntity entity =
- getDomain().getEntityResolver().lookupDbEntity(SimpleLockingTestEntity.class);
+ DbEntity entity = getDomain().getEntityResolver().lookupObjEntity(
+ SimpleLockingTestEntity.class).getDbEntity();
- List idAttributes =
- Collections.singletonList(entity.getAttribute("LOCKING_TEST_ID"));
- List updatedAttributes =
- Collections.singletonList(entity.getAttribute("DESCRIPTION"));
+ List idAttributes = Collections.singletonList(entity
+ .getAttribute("LOCKING_TEST_ID"));
+ List updatedAttributes = Collections.singletonList(entity
+ .getAttribute("DESCRIPTION"));
- UpdateBatchQuery updateQuery =
- new UpdateBatchQuery(entity, idAttributes, updatedAttributes, null, 1);
+ UpdateBatchQuery updateQuery = new UpdateBatchQuery(
+ entity,
+ idAttributes,
+ updatedAttributes,
+ null,
+ 1);
UpdateBatchQueryBuilder builder = new UpdateBatchQueryBuilder(new JdbcAdapter());
String generatedSql = builder.createSqlString(updateQuery);
assertNotNull(generatedSql);
- assertEquals(
- "UPDATE "
+ assertEquals("UPDATE "
+ entity.getName()
- + " SET DESCRIPTION = ? WHERE LOCKING_TEST_ID = ?",
- generatedSql);
+ + " SET DESCRIPTION = ? WHERE LOCKING_TEST_ID = ?", generatedSql);
}
public void testCreateSqlStringWithNulls() throws Exception {
- DbEntity entity =
- getDomain().getEntityResolver().lookupDbEntity(SimpleLockingTestEntity.class);
+ DbEntity entity = getDomain().getEntityResolver().lookupObjEntity(
+ SimpleLockingTestEntity.class).getDbEntity();
- List idAttributes =
- Arrays.asList(
- new Object[] {
- entity.getAttribute("LOCKING_TEST_ID"),
- entity.getAttribute("NAME")});
+ List idAttributes = Arrays.asList(new Object[] {
+ entity.getAttribute("LOCKING_TEST_ID"), entity.getAttribute("NAME")
+ });
- List updatedAttributes =
- Collections.singletonList(entity.getAttribute("DESCRIPTION"));
+ List updatedAttributes = Collections.singletonList(entity
+ .getAttribute("DESCRIPTION"));
Collection nullAttributes = Collections.singleton("NAME");
- UpdateBatchQuery updateQuery =
- new UpdateBatchQuery(
+ UpdateBatchQuery updateQuery = new UpdateBatchQuery(
entity,
idAttributes,
updatedAttributes,
@@ -89,10 +88,10 @@
String generatedSql = builder.createSqlString(updateQuery);
assertNotNull(generatedSql);
assertEquals(
- "UPDATE "
- + entity.getName()
- + " SET DESCRIPTION = ? WHERE LOCKING_TEST_ID = ? AND NAME IS NULL",
- generatedSql);
+ "UPDATE "
+ + entity.getName()
+ + " SET DESCRIPTION = ? WHERE LOCKING_TEST_ID = ? AND NAME IS NULL",
+ generatedSql);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/DbEntityTest.java Sat Feb 17 12:27:31 2007
@@ -21,7 +21,6 @@
import java.util.List;
-import org.apache.art.Artist;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.remote.hessian.service.HessianUtil;
import org.apache.cayenne.unit.CayenneCase;
@@ -231,7 +230,7 @@
}
public void testTranslateToRelatedEntityIndependentPath() {
- DbEntity artistE = getDomain().getEntityResolver().lookupDbEntity(Artist.class);
+ DbEntity artistE = getDomain().getEntityResolver().getDbEntity("ARTIST");
Expression e1 = Expression.fromString("db:paintingArray");
Expression translated = artistE
@@ -241,7 +240,7 @@
}
public void testTranslateToRelatedEntityTrimmedPath() {
- DbEntity artistE = getDomain().getEntityResolver().lookupDbEntity(Artist.class);
+ DbEntity artistE = getDomain().getEntityResolver().getDbEntity("ARTIST");
Expression e1 = Expression.fromString("db:artistExhibitArray.toExhibit");
Expression translated = artistE
@@ -253,7 +252,7 @@
}
public void testTranslateToRelatedEntitySplitHalfWay() {
- DbEntity artistE = getDomain().getEntityResolver().lookupDbEntity(Artist.class);
+ DbEntity artistE = getDomain().getEntityResolver().getDbEntity("ARTIST");
Expression e1 = Expression
.fromString("db:paintingArray.toPaintingInfo.TEXT_REVIEW");
@@ -265,7 +264,7 @@
}
public void testTranslateToRelatedEntityMatchingPath() {
- DbEntity artistE = getDomain().getEntityResolver().lookupDbEntity(Artist.class);
+ DbEntity artistE = getDomain().getEntityResolver().getDbEntity("ARTIST");
Expression e1 = Expression.fromString("db:artistExhibitArray.toExhibit");
Expression translated = artistE.translateToRelatedEntity(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java?view=diff&rev=508803&r1=508802&r2=508803
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverTest.java Sat Feb 17 12:27:31 2007
@@ -38,8 +38,9 @@
public class EntityResolverTest extends CayenneCase {
public void testObjEntityLookupDuplicates() {
- AccessStack stack = CayenneResources.getResources().getAccessStack(
- "GenericStack");
+ AccessStack stack = CayenneResources
+ .getResources()
+ .getAccessStack("GenericStack");
DataMap generic = stack.getDataDomain().getMap("generic");
EntityResolver resolver = new EntityResolver(Collections.singleton(generic));
@@ -62,9 +63,13 @@
}
}
+ /**
+ * @deprecated since 3.0
+ */
public void testDbEntityLookupDuplicates() {
- AccessStack stack = CayenneResources.getResources().getAccessStack(
- "GenericStack");
+ AccessStack stack = CayenneResources
+ .getResources()
+ .getAccessStack("GenericStack");
DataMap generic = stack.getDataDomain().getMap("generic");
EntityResolver resolver = new EntityResolver(Collections.singleton(generic));
@@ -103,13 +108,17 @@
assertNull(clientResolver.lookupObjEntity(MtTable1.class));
}
- // //Test DbEntitylookups
-
+ /**
+ * @deprecated since 3.0
+ */
public void testLookupDbEntityByClass() {
EntityResolver resolver = new EntityResolver(getDomain().getDataMaps());
assertIsArtistDbEntity(resolver.lookupDbEntity(Artist.class));
}
+ /**
+ * @deprecated since 3.0
+ */
public void testLookupDbEntityByDataobject() throws Exception {
EntityResolver resolver = new EntityResolver(getDomain().getDataMaps());
Artist artist = (Artist) this.createDataContext().newObject("Artist");