Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/IdentityColumnsTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/IdentityColumnsTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/IdentityColumnsTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/IdentityColumnsTest.java Tue Nov 24 20:58:03 2009 @@ -28,11 +28,11 @@ import org.apache.art.GeneratedColumnDep; import org.apache.art.GeneratedColumnTest2; import org.apache.art.GeneratedColumnTestEntity; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.ObjectId; import org.apache.cayenne.Persistent; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.util.Cayenne; /** */ @@ -81,12 +81,12 @@ idObject.getObjectContext().commitChanges(); // this will throw an exception if id wasn't generated one way or another - int id = DataObjectUtils.intPKForObject(idObject); + int id = Cayenne.intPKForObject(idObject); assertTrue(id >= 0); // make sure that id is the same as id in the DB context.invalidateObjects(Collections.singleton(idObject)); - GeneratedColumnTestEntity object = DataObjectUtils + GeneratedColumnTestEntity object = Cayenne .objectForPK(context, GeneratedColumnTestEntity.class, id); assertNotNull(object); assertEquals(name, object.getName()); @@ -162,14 +162,14 @@ int[] ids = new int[idObjects.length]; for (int i = 0; i < idObjects.length; i++) { - ids[i] = DataObjectUtils.intPKForObject(idObjects[i]); + ids[i] = Cayenne.intPKForObject(idObjects[i]); assertTrue(ids[i] > 0); } context.invalidateObjects(Arrays.asList(idObjects)); for (int i = 0; i < ids.length; i++) { - GeneratedColumnTestEntity object = DataObjectUtils + GeneratedColumnTestEntity object = Cayenne .objectForPK(context, GeneratedColumnTestEntity.class, ids[i]); assertNotNull(object); assertEquals(names[i], object.getName()); @@ -202,7 +202,7 @@ context.commitChanges(); - int masterId = DataObjectUtils.intPKForObject(master); + int masterId = Cayenne.intPKForObject(master); ObjectId id2 = dep2.getObjectId(); @@ -224,7 +224,7 @@ context.invalidateObjects(Arrays.asList(master, dep1, dep2)); - Object fetchedDep2 = DataObjectUtils.objectForPK(context, id2); + Object fetchedDep2 = Cayenne.objectForPK(context, id2); assertNotNull(fetchedDep2); } } @@ -251,20 +251,20 @@ dependent.setToMaster(master2); context.commitChanges(); - int id1 = DataObjectUtils.intPKForObject(master2); + int id1 = Cayenne.intPKForObject(master2); assertTrue(id1 >= 0); - int id2 = DataObjectUtils.intPKForObject(dependent); + int id2 = Cayenne.intPKForObject(dependent); assertTrue(id2 >= 0); assertEquals(id1, id2); context.invalidateObjects(Arrays.asList(master2, dependent)); - assertNotNull(DataObjectUtils.objectForPK( + assertNotNull(Cayenne.objectForPK( context, GeneratedColumnTestEntity.class, id1)); - assertNotNull(DataObjectUtils.objectForPK(context, GeneratedColumnDep.class, id2)); + assertNotNull(Cayenne.objectForPK(context, GeneratedColumnDep.class, id2)); } public void testGeneratedDefaultValue() throws Exception { @@ -288,10 +288,10 @@ context.commitChanges(); // this will throw an exception if id wasn't generated - int id1 = DataObjectUtils.intPKForObject(idObject); + int id1 = Cayenne.intPKForObject(idObject); assertTrue(id1 >= 0); - int id2 = DataObjectUtils.intPKForObject(dependent); + int id2 = Cayenne.intPKForObject(dependent); assertTrue(id2 >= 0); assertEquals(id1, id2); @@ -299,10 +299,10 @@ // refetch from DB context.invalidateObjects(Arrays.asList(idObject, dependent)); - assertNotNull(DataObjectUtils.objectForPK( + assertNotNull(Cayenne.objectForPK( context, GeneratedColumnTestEntity.class, id1)); - assertNotNull(DataObjectUtils.objectForPK(context, GeneratedColumnDep.class, id2)); + assertNotNull(Cayenne.objectForPK(context, GeneratedColumnDep.class, id2)); } }
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/InheritanceTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/InheritanceTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/InheritanceTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/InheritanceTest.java Tue Nov 24 20:58:03 2009 @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.List; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.query.PrefetchTreeNode; import org.apache.cayenne.query.SQLTemplate; import org.apache.cayenne.query.SelectQuery; @@ -40,6 +39,7 @@ import org.apache.cayenne.testdo.inherit.RelatedEntity; import org.apache.cayenne.testdo.inherit.SubEntity; import org.apache.cayenne.unit.PeopleCase; +import org.apache.cayenne.util.Cayenne; /** * Testing Cayenne behavior with DataObject inheritance hierarchies. @@ -65,7 +65,7 @@ PersonNotes.class, "INSERT INTO PERSON_NOTES (ID, NOTES, PERSON_ID) VALUES (1, 'AA', 1)")); - PersonNotes note = DataObjectUtils.objectForPK(context, PersonNotes.class, 1); + PersonNotes note = Cayenne.objectForPK(context, PersonNotes.class, 1); assertNotNull(note); assertNotNull(note.getPerson()); assertTrue(note.getPerson() instanceof Employee); @@ -88,7 +88,7 @@ query.addPrefetch(AbstractPerson.NOTES_PROPERTY).setSemantics( PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS); - AbstractPerson person = (AbstractPerson) DataObjectUtils.objectForQuery( + AbstractPerson person = (AbstractPerson) Cayenne.objectForQuery( createDataContext(), query); @@ -127,7 +127,7 @@ SelectQuery query = new SelectQuery(AbstractPerson.class); query.addPrefetch(AbstractPerson.NOTES_PROPERTY); - AbstractPerson person = (AbstractPerson) DataObjectUtils.objectForQuery( + AbstractPerson person = (AbstractPerson) Cayenne.objectForQuery( createDataContext(), query); @@ -195,7 +195,7 @@ query.addPrefetch(PersonNotes.PERSON_PROPERTY).setSemantics( PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS); - PersonNotes note = (PersonNotes) DataObjectUtils.objectForQuery( + PersonNotes note = (PersonNotes) Cayenne.objectForQuery( createDataContext(), query); @@ -269,7 +269,7 @@ // CAY-592 - make sure modification of the address in a parallel context // doesn't mess up the Manager DataContext c2 = context.getParentDataDomain().createDataContext(); - e = (Employee) DataObjectUtils.objectForPK(c2, e.getObjectId()); + e = (Employee) Cayenne.objectForPK(c2, e.getObjectId()); address = e.getAddresses().get(0); assertSame(e, address.getToEmployee()); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextReadTest.java Tue Nov 24 20:58:03 2009 @@ -25,7 +25,6 @@ import org.apache.art.Artist; import org.apache.art.Painting; import org.apache.cayenne.DataObject; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.ObjectId; import org.apache.cayenne.PersistenceState; @@ -34,6 +33,7 @@ import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.query.SortOrder; import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.util.Cayenne; public class NestedDataContextReadTest extends CayenneCase { @@ -76,7 +76,7 @@ "Artist", Artist.ARTIST_ID_PK_COLUMN, 33001), null); - DataObject committed = (DataObject) DataObjectUtils.objectForQuery( + DataObject committed = (DataObject) Cayenne.objectForQuery( context, new ObjectIdQuery(new ObjectId( "Artist", @@ -84,14 +84,14 @@ 33002))); int modifiedId = 33003; - Artist modified = (Artist) DataObjectUtils.objectForQuery( + Artist modified = (Artist) Cayenne.objectForQuery( context, new ObjectIdQuery(new ObjectId( "Artist", Artist.ARTIST_ID_PK_COLUMN, modifiedId))); modified.setArtistName("M1"); - DataObject deleted = (DataObject) DataObjectUtils.objectForQuery( + DataObject deleted = (DataObject) Cayenne.objectForQuery( context, new ObjectIdQuery(new ObjectId( "Artist", @@ -163,13 +163,13 @@ ObjectContext childContext = context.createChildContext(); int modifiedId = 33003; - Artist modified = (Artist) DataObjectUtils.objectForQuery( + Artist modified = (Artist) Cayenne.objectForQuery( context, new ObjectIdQuery(new ObjectId( "Artist", Artist.ARTIST_ID_PK_COLUMN, modifiedId))); - Artist peerModified = (Artist) DataObjectUtils.objectForQuery( + Artist peerModified = (Artist) Cayenne.objectForQuery( childContext, new ObjectIdQuery(new ObjectId( "Artist", @@ -238,7 +238,7 @@ "Artist", Artist.ARTIST_ID_PK_COLUMN, 33001), null); - DataObject committed = (DataObject) DataObjectUtils.objectForQuery( + DataObject committed = (DataObject) Cayenne.objectForQuery( parent, new ObjectIdQuery(new ObjectId( "Artist", @@ -246,14 +246,14 @@ 33002))); int modifiedId = 33003; - Artist modified = (Artist) DataObjectUtils.objectForQuery( + Artist modified = (Artist) Cayenne.objectForQuery( parent, new ObjectIdQuery(new ObjectId( "Artist", Artist.ARTIST_ID_PK_COLUMN, modifiedId))); modified.setArtistName("MODDED"); - DataObject deleted = (DataObject) DataObjectUtils.objectForQuery( + DataObject deleted = (DataObject) Cayenne.objectForQuery( parent, new ObjectIdQuery(new ObjectId( "Artist", @@ -275,7 +275,7 @@ DataObject next = (DataObject) it.next(); assertEquals(PersistenceState.COMMITTED, next.getPersistenceState()); - int id = DataObjectUtils.intPKForObject(next); + int id = Cayenne.intPKForObject(next); if (id == modifiedId) { assertEquals("MODDED", next.readProperty(Artist.ARTIST_NAME_PROPERTY)); } @@ -297,20 +297,20 @@ int committedTargetSrcId = 33004; int newTargetSrcId = 33005; - Painting hollowTargetSrc = DataObjectUtils.objectForPK( + Painting hollowTargetSrc = Cayenne.objectForPK( parent, Painting.class, hollowTargetSrcId); Artist hollowTarget = hollowTargetSrc.getToArtist(); - Painting modifiedTargetSrc = DataObjectUtils.objectForPK( + Painting modifiedTargetSrc = Cayenne.objectForPK( parent, Painting.class, modifiedTargetSrcId); Artist modifiedTarget = modifiedTargetSrc.getToArtist(); modifiedTarget.setArtistName("M1"); - Painting deletedTargetSrc = DataObjectUtils.objectForPK( + Painting deletedTargetSrc = Cayenne.objectForPK( parent, Painting.class, deletedTargetSrcId); @@ -318,14 +318,14 @@ deletedTargetSrc.setToArtist(null); parent.deleteObject(deletedTarget); - Painting committedTargetSrc = DataObjectUtils.objectForPK( + Painting committedTargetSrc = Cayenne.objectForPK( parent, Painting.class, committedTargetSrcId); Artist committedTarget = committedTargetSrc.getToArtist(); committedTarget.getArtistName(); - Painting newTargetSrc = DataObjectUtils.objectForPK( + Painting newTargetSrc = Cayenne.objectForPK( parent, Painting.class, newTargetSrcId); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextWriteTest.java Tue Nov 24 20:58:03 2009 @@ -27,12 +27,12 @@ import org.apache.art.Artist; import org.apache.art.Painting; import org.apache.art.PaintingInfo; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.PersistenceState; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.query.SortOrder; import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.util.Cayenne; public class NestedDataContextWriteTest extends CayenneCase { @@ -54,7 +54,7 @@ DataContext context = createDataContext(); ObjectContext childContext = context.createChildContext(); - Artist a = DataObjectUtils.objectForPK(childContext, Artist.class, 33001); + Artist a = Cayenne.objectForPK(childContext, Artist.class, 33001); Painting p = childContext.newObject(Painting.class); p.setPaintingTitle("X"); a.addToPaintingArray(p); @@ -78,13 +78,13 @@ ObjectContext childContext = context.createChildContext(); ObjectContext childContextPeer = context.createChildContext(); - Painting childP1 = DataObjectUtils.objectForPK( + Painting childP1 = Cayenne.objectForPK( childContext, Painting.class, 33001); // trigger object creation in the peer nested DC - DataObjectUtils.objectForPK(childContextPeer, Painting.class, 33001); + Cayenne.objectForPK(childContextPeer, Painting.class, 33001); childP1.setToArtist(null); blockQueries(); @@ -342,7 +342,7 @@ assertEquals(PersistenceState.MODIFIED, parentModifiedToOne .getPersistenceState()); assertNotNull(parentModifiedToOne.getToArtist()); - assertEquals(33001, DataObjectUtils.intPKForObject(parentModifiedToOne + assertEquals(33001, Cayenne.intPKForObject(parentModifiedToOne .getToArtist())); assertNotNull(context.getObjectStore().getChangesByObjectId().get( parentModifiedToOne.getObjectId())); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingTest.java Tue Nov 24 20:58:03 2009 @@ -21,8 +21,8 @@ import org.apache.art.Artist; import org.apache.art.Painting; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.util.Cayenne; /** */ @@ -38,7 +38,7 @@ createTestData("test"); DataContext context = createDataContext(); - Artist a = DataObjectUtils.objectForPK(context, Artist.class, 2000); + Artist a = Cayenne.objectForPK(context, Artist.class, 2000); ObjectStore objectStore = context.getObjectStore(); assertNull(objectStore.getChangesByObjectId().get(a.getObjectId())); @@ -51,7 +51,7 @@ createTestData("test"); DataContext context = createDataContext(); - Artist a = DataObjectUtils.objectForPK(context, Artist.class, 2000); + Artist a = Cayenne.objectForPK(context, Artist.class, 2000); ObjectStore objectStore = context.getObjectStore(); assertNull(objectStore.getChangesByObjectId().get(a.getObjectId())); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreGCTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreGCTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreGCTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreGCTest.java Tue Nov 24 20:58:03 2009 @@ -19,11 +19,11 @@ package org.apache.cayenne.access; import org.apache.art.Artist; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.query.SQLTemplate; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.unit.CayenneCase; import org.apache.cayenne.unit.util.ThreadedTestHelper; +import org.apache.cayenne.util.Cayenne; public class ObjectStoreGCTest extends CayenneCase { @@ -93,7 +93,7 @@ "insert into ARTIST (ARTIST_ID, ARTIST_NAME) values (1, 'aa')")); assertEquals(0, context.getObjectStore().registeredObjectsCount()); - Artist a = DataObjectUtils.objectForPK(context, Artist.class, 1); + Artist a = Cayenne.objectForPK(context, Artist.class, 1); a.setArtistName("Y"); a = null; assertEquals(1, context.getObjectStore().registeredObjectsCount()); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ObjectStoreTest.java Tue Nov 24 20:58:03 2009 @@ -26,11 +26,11 @@ import org.apache.art.Gallery; import org.apache.art.Painting; import org.apache.cayenne.DataObject; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.DataRow; import org.apache.cayenne.MockDataObject; import org.apache.cayenne.ObjectId; import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.util.Cayenne; /** */ @@ -125,7 +125,7 @@ // // The full object graph is not being re-registered during auto-registration // with the context. - Painting newP = (Painting) DataObjectUtils.objectForPK(createDataContext(), p + Painting newP = (Painting) Cayenne.objectForPK(createDataContext(), p .getObjectId()); assertNotNull(newP.getToGallery()); } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryTest.java Tue Nov 24 20:58:03 2009 @@ -25,12 +25,12 @@ import org.apache.art.Artist; import org.apache.art.Painting; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.Persistent; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.query.SortOrder; import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.util.Cayenne; public class ExpressionFactoryTest extends CayenneCase { @@ -264,7 +264,7 @@ SelectQuery query = new SelectQuery(Artist.class); query.setQualifier(ExpressionFactory.matchExp(a2)); - Object res = DataObjectUtils.objectForQuery(dc, query);//exception if >1 result + Object res = Cayenne.objectForQuery(dc, query);//exception if >1 result assertSame(res, a2); assertTrue(query.getQualifier().match(res)); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyTest.java Tue Nov 24 20:58:03 2009 @@ -21,10 +21,10 @@ import org.apache.art.MixedPersistenceStrategy; import org.apache.art.MixedPersistenceStrategy2; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.ValueHolder; import org.apache.cayenne.access.DataContext; import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.util.Cayenne; /** * Tests conflicts between field and map-based persistence. @@ -37,7 +37,7 @@ createTestData("testConflictingField"); DataContext c = createDataContext(); - MixedPersistenceStrategy object = DataObjectUtils.objectForPK( + MixedPersistenceStrategy object = Cayenne.objectForPK( c, MixedPersistenceStrategy.class, 1); @@ -54,12 +54,12 @@ createTestData("testConflictingField"); DataContext c = createDataContext(); - MixedPersistenceStrategy2 detail1 = DataObjectUtils.objectForPK( + MixedPersistenceStrategy2 detail1 = Cayenne.objectForPK( c, MixedPersistenceStrategy2.class, 1); - MixedPersistenceStrategy2 detail2 = DataObjectUtils.objectForPK( + MixedPersistenceStrategy2 detail2 = Cayenne.objectForPK( c, MixedPersistenceStrategy2.class, 2); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_191Test.java Tue Nov 24 20:58:03 2009 @@ -19,10 +19,10 @@ package org.apache.cayenne.unit.jira; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.access.DataContext; import org.apache.cayenne.testdo.relationship.FkOfDifferentType; import org.apache.cayenne.unit.RelationshipCase; +import org.apache.cayenne.util.Cayenne; public class CAY_191Test extends RelationshipCase { @@ -34,7 +34,7 @@ createTestData("testResolveToOneOverFKOfDifferentNumType"); DataContext context = createDataContext(); - FkOfDifferentType root = DataObjectUtils.objectForPK( + FkOfDifferentType root = Cayenne.objectForPK( context, FkOfDifferentType.class, 1); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207Test.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207Test.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207Test.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_207Test.java Tue Nov 24 20:58:03 2009 @@ -55,7 +55,7 @@ try { // M1 -// Manager o1 = DataObjectUtils.objectForPK(context, Manager.class, 1); +// Manager o1 = Cayenne.objectForPK(context, Manager.class, 1); // assertTrue(o1 instanceof CAY_207Manager1); // // Object p1 = o1.readProperty("clientContactType"); @@ -77,7 +77,7 @@ prepare(); try { -// Manager o2 = DataObjectUtils.objectForPK(context, Manager.class, 2); +// Manager o2 = Cayenne.objectForPK(context, Manager.class, 2); // assertTrue(o2 instanceof CAY_207Manager2); // // Object p2 = o2.readProperty("clientContactType"); @@ -99,7 +99,7 @@ try { // M1 -// Manager o1 = DataObjectUtils.objectForPK(context, CAY_207Manager1.class, 1); +// Manager o1 = Cayenne.objectForPK(context, CAY_207Manager1.class, 1); // assertTrue(o1 instanceof CAY_207Manager1); // // Object p1 = o1.readProperty("clientContactType"); @@ -121,7 +121,7 @@ prepare(); try { -// Manager o2 = DataObjectUtils.objectForPK(context, CAY_207Manager2.class, 2); +// Manager o2 = Cayenne.objectForPK(context, CAY_207Manager2.class, 2); // assertTrue(o2 instanceof CAY_207Manager2); // // Object p2 = o2.readProperty("clientContactType"); @@ -150,7 +150,7 @@ // // should succeed... // context.commitChanges(); // -// int pk = DataObjectUtils.intPKForObject(o2); +// int pk = Cayenne.intPKForObject(o2); // String query = "SELECT #result('CLIENT_CONTACT_TYPE' 'String' 'CLIENT_CONTACT_TYPE') " // + "FROM PERSON WHERE PERSON_ID = " // + pk; Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_901Test.java Tue Nov 24 20:58:03 2009 @@ -23,11 +23,11 @@ import org.apache.art.Artist; import org.apache.art.Gallery; import org.apache.art.Painting; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.query.CapsStrategy; import org.apache.cayenne.query.SQLTemplate; import org.apache.cayenne.unit.CayenneCase; +import org.apache.cayenne.util.Cayenne; public class CAY_901Test extends CayenneCase { @@ -58,7 +58,7 @@ q.setColumnNamesCapitalization(CapsStrategy.UPPER); q.setFetchingDataRows(true); - Map row = (Map) DataObjectUtils.objectForQuery(context, q); + Map row = (Map) Cayenne.objectForQuery(context, q); assertEquals("P1", row.get("PAINTING_TITLE")); assertEquals(null, row.get("ARTIST_ID")); assertEquals(null, row.get("GALLERY_ID")); Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/DeepMergeOperationTest.java Tue Nov 24 20:58:03 2009 @@ -64,7 +64,7 @@ a.setArtistName("AAA"); context.commitChanges(); - Artist a1 = (Artist) DataObjectUtils.objectForPK(context1, a.getObjectId()); + Artist a1 = (Artist) Cayenne.objectForPK(context1, a.getObjectId()); a1.setArtistName("BBB"); DeepMergeOperation op = new DeepMergeOperation(context1); Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesDataSourceFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesDataSourceFactory.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesDataSourceFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesDataSourceFactory.java Tue Nov 24 20:58:03 2009 @@ -31,7 +31,6 @@ import javax.sql.DataSource; import org.apache.cayenne.CayenneRuntimeException; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.access.DataContext; import org.apache.cayenne.conf.Configuration; import org.apache.cayenne.conf.DataSourceFactory; @@ -43,6 +42,7 @@ import org.apache.cayenne.pref.HSQLEmbeddedPreferenceService; import org.apache.cayenne.project.CayenneUserDir; import org.apache.cayenne.query.SelectQuery; +import org.apache.cayenne.util.Cayenne; /** * A DataSourceFactory that loads DataSources from CayenneModeler preferences. Allows @@ -173,7 +173,7 @@ Iterator it = preferences.iterator(); while (it.hasNext()) { DomainPreference pref = (DomainPreference) it.next(); - ids.add(DataObjectUtils.pkForObject(pref)); + ids.add(Cayenne.pkForObject(pref)); } Expression qualifier = Expression.fromString("db:" Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java (original) +++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java Tue Nov 24 20:58:03 2009 @@ -28,7 +28,6 @@ import java.util.Map; import org.apache.cayenne.CayenneRuntimeException; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.exp.Expression; import org.apache.cayenne.exp.ExpressionFactory; @@ -36,6 +35,7 @@ import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.query.NamedQuery; import org.apache.cayenne.query.SelectQuery; +import org.apache.cayenne.util.Cayenne; import org.apache.cayenne.util.Util; /** @@ -172,7 +172,7 @@ Iterator it = preferences.iterator(); while (it.hasNext()) { DomainPreference pref = (DomainPreference) it.next(); - ids.add(DataObjectUtils.pkForObject(pref)); + ids.add(Cayenne.pkForObject(pref)); } ObjectContext context = getObjectContext(); Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/DomainPreference.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/DomainPreference.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/DomainPreference.java (original) +++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/DomainPreference.java Tue Nov 24 20:58:03 2009 @@ -24,8 +24,8 @@ import java.io.IOException; import java.util.Properties; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.PersistenceState; +import org.apache.cayenne.util.Cayenne; import org.apache.cayenne.util.Util; /** @@ -87,8 +87,8 @@ // detail object PK must match... - int pk = DataObjectUtils.intPKForObject(this); - PreferenceDetail preference = (PreferenceDetail) DataObjectUtils.objectForPK( + int pk = Cayenne.intPKForObject(this); + PreferenceDetail preference = (PreferenceDetail) Cayenne.objectForPK( getObjectContext(), javaClass, pk); Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDetail.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDetail.java?rev=883872&r1=883871&r2=883872&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDetail.java (original) +++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceDetail.java Tue Nov 24 20:58:03 2009 @@ -22,12 +22,12 @@ import java.util.Properties; import org.apache.cayenne.CayenneDataObject; -import org.apache.cayenne.DataObjectUtils; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.ObjectId; import org.apache.cayenne.access.DataContext; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.map.DbEntity; +import org.apache.cayenne.util.Cayenne; import org.apache.cayenne.util.Util; /** @@ -139,9 +139,9 @@ ObjectContext context = getObjectContext(); if (context != null && getObjectId() != null) { - int pk = DataObjectUtils.intPKForObject(this); + int pk = Cayenne.intPKForObject(this); - domainPreference = DataObjectUtils.objectForPK( + domainPreference = Cayenne.objectForPK( context, DomainPreference.class, pk); @@ -208,6 +208,6 @@ } } - return DataObjectUtils.intPKForObject(domainPreference); + return Cayenne.intPKForObject(domainPreference); } }
