This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 8b58c6465ecd674bbf568173cb194af65553d4b4
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Fri Feb 23 17:58:59 2024 +0400
CAY-2845 Deprecate DataObject in favour of Persistent
- remove mentions of DataObject
---
.../cayenne/tools/CayenneGeneratorTaskTest.java | 2 +-
.../org/apache/cayenne/tools/velotemplate.vm | 2 +-
cayenne-ant/src/test/resources/testmap.map.xml | 2 +-
.../project/validation/NameValidationHelper.java | 12 ++++-----
.../project/validation/ObjAttributeValidator.java | 2 +-
.../project/validation/ObjEntityValidator.java | 4 +--
.../validation/ObjRelationshipValidator.java | 2 +-
.../velocity/VelocitySQLTemplateProcessorTest.java | 12 ++++-----
.../apache/cayenne/template/parser/ASTMethod.java | 2 ++
.../apache/cayenne/CayennePersistentObjectIT.java | 2 +-
...ObjectIT.java => HybridPersistentObjectIT.java} | 2 +-
...T.java => PersistentObjectSerializationIT.java} | 30 +++++++++++-----------
.../access/DataContextPrefetchExtrasIT.java | 2 +-
.../access/DataContextProcedureQueryIT.java | 2 +-
.../cayenne/access/DataContextQueryCachingIT.java | 2 +-
.../cayenne/access/DataContextSQLTemplateIT.java | 2 +-
.../SimpleIdIncrementalFaultListPrefetchIT.java | 2 +-
.../org/apache/cayenne/access/ToManyListIT.java | 6 ++---
.../org/apache/cayenne/exp/parser/ASTDbPathIT.java | 4 +--
.../org/apache/cayenne/exp/parser/ASTEqualIT.java | 2 +-
.../apache/cayenne/exp/parser/ASTObjPathTest.java | 4 +--
.../org/apache/cayenne/map/EntityResolverIT.java | 2 +-
.../org/apache/cayenne/map/MockEntityResolver.java | 2 +-
.../apache/cayenne/query/ObjectIdQueryTest.java | 2 +-
.../org/apache/cayenne/query/ProcedureCallIT.java | 2 +-
.../cayenne/query/RelationshipQueryTest.java | 2 +-
.../template/CayenneSQLTemplateProcessorTest.java | 12 ++++-----
...ArtDataObject.java => ArtPersistentObject.java} | 2 +-
.../cayenne/testdo/testmap/auto/_Painting.java | 4 +--
.../configuration/xml/testConfigMap4.map.xml | 2 +-
cayenne/src/test/resources/testmap.map.xml | 2 +-
.../tools/CayenneGeneratorIntegrationTest.java | 2 +-
.../org/apache/cayenne/tools/velotemplate.vm | 2 +-
.../src/test/resources/testmap.map.xml | 2 +-
.../modeler/editor/RawQueryPropertiesPanel.java | 18 ++++++-------
.../cayenne/modeler/editor/SQLTemplateMainTab.java | 6 ++---
36 files changed, 82 insertions(+), 80 deletions(-)
diff --git
a/cayenne-ant/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
b/cayenne-ant/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
index 3c54adf01..20edb61af 100644
---
a/cayenne-ant/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
+++
b/cayenne-ant/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
@@ -96,7 +96,7 @@ public class CayenneGeneratorTaskTest {
// check results
File a = new File(mapDir,
convertPath("org/apache/cayenne/testdo/testmap/Artist.java"));
assertTrue(a.isFile());
- assertContents(a, "Artist",
"org.apache.cayenne.testdo.testmap", "CayenneDataObject");
+ assertContents(a, "Artist",
"org.apache.cayenne.testdo.testmap", "PersistentObject");
File _a = new File(mapDir,
convertPath("org/apache/cayenne/testdo/testmap/_Artist.java"));
assertFalse(_a.exists());
diff --git
a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/velotemplate.vm
b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/velotemplate.vm
index 1ca078c2a..3dc345266 100644
--- a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/velotemplate.vm
+++ b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/velotemplate.vm
@@ -10,4 +10,4 @@ import org.apache.cayenne.*;
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class ${subClassName} extends CayenneDataObject {
+public class ${subClassName} extends PersistentObject {
diff --git a/cayenne-ant/src/test/resources/testmap.map.xml
b/cayenne-ant/src/test/resources/testmap.map.xml
index 5178c2000..e5c941a64 100644
--- a/cayenne-ant/src/test/resources/testmap.map.xml
+++ b/cayenne-ant/src/test/resources/testmap.map.xml
@@ -428,7 +428,7 @@
<obj-entity name="NoPkTestEntity"
className="org.apache.cayenne.testdo.no_pk.NoPkTestEntity"
dbEntityName="NO_PK_TEST">
<obj-attribute name="attribute1" type="java.lang.Integer"
db-attribute-path="ATTRIBUTE1"/>
</obj-entity>
- <obj-entity name="Painting"
className="org.apache.cayenne.testdo.testmap.Painting" dbEntityName="PAINTING"
superClassName="org.apache.cayenne.testdo.testmap.ArtDataObject">
+ <obj-entity name="Painting"
className="org.apache.cayenne.testdo.testmap.Painting" dbEntityName="PAINTING"
superClassName="org.apache.cayenne.testdo.testmap.ArtPersistentObject">
<obj-attribute name="estimatedPrice"
type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
<obj-attribute name="paintingDescription"
type="java.lang.String" db-attribute-path="PAINTING_DESCRIPTION"/>
<obj-attribute name="paintingTitle" type="java.lang.String"
db-attribute-path="PAINTING_TITLE"/>
diff --git
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/NameValidationHelper.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/NameValidationHelper.java
index 03c1d521e..5b411d2d5 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/NameValidationHelper.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/NameValidationHelper.java
@@ -137,12 +137,12 @@ public class NameValidationHelper {
return (invalidChars.length() > 0) ? invalidChars : null;
}
- public boolean invalidDataObjectClass(String dataObjectClassFQN) {
- if (dataObjectClassFQN == null) {
+ public boolean invalidPersistentObjectClass(String
persistentObjectClassFQN) {
+ if (persistentObjectClassFQN == null) {
return true;
}
- StringTokenizer toks = new StringTokenizer(dataObjectClassFQN, ".");
+ StringTokenizer toks = new StringTokenizer(persistentObjectClassFQN,
".");
while (toks.hasMoreTokens()) {
if (RESERVED_JAVA_KEYWORDS.contains(toks.nextToken())) {
return true;
@@ -184,8 +184,8 @@ public class NameValidationHelper {
* considered invalid if there is a getter or a setter for it in
java.lang.Object or
* PersistentObject.
*/
- public boolean invalidDataObjectProperty(String dataObjectProperty) {
- return dataObjectProperty == null
- || INVALID_JAVA_PROPERTIES.contains(dataObjectProperty);
+ public boolean invalidPersistentObjectProperty(String
persistentObjectProperty) {
+ return persistentObjectProperty == null
+ || INVALID_JAVA_PROPERTIES.contains(persistentObjectProperty);
}
}
diff --git
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjAttributeValidator.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjAttributeValidator.java
index 81aa3b2e2..3c89340d5 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjAttributeValidator.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjAttributeValidator.java
@@ -64,7 +64,7 @@ class ObjAttributeValidator extends
ConfigurationNodeValidator {
"ObjAttribute name '%s' contains invalid characters: %s",
attribute.getName(),
invalidChars);
- } else if (helper.invalidDataObjectProperty(attribute.getName())) {
+ } else if
(helper.invalidPersistentObjectProperty(attribute.getName())) {
addFailure(validationResult, attribute,
"ObjAttribute name '%s' is invalid",
attribute.getName());
diff --git
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjEntityValidator.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjEntityValidator.java
index c35b9bd51..64333e630 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjEntityValidator.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjEntityValidator.java
@@ -61,7 +61,7 @@ class ObjEntityValidator extends ConfigurationNodeValidator {
entity.getName(),
className,
invalidChars);
- } else if (helper.invalidDataObjectClass(className)) {
+ } else if (helper.invalidPersistentObjectClass(className)) {
addFailure(
validationResult,
entity,
@@ -96,7 +96,7 @@ class ObjEntityValidator extends ConfigurationNodeValidator {
entity.getName(),
superClassName,
invalidChars);
- } else if (helper.invalidDataObjectClass(superClassName)) {
+ } else if (helper.invalidPersistentObjectClass(superClassName)) {
addFailure(
validationResult,
entity,
diff --git
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjRelationshipValidator.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjRelationshipValidator.java
index 48123d527..5c09570d4 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjRelationshipValidator.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ObjRelationshipValidator.java
@@ -55,7 +55,7 @@ class ObjRelationshipValidator extends
ConfigurationNodeValidator {
"ObjRelationship name '%s' contains invalid
characters: %s",
toString(relationship),
invalidChars);
- } else if
(helper.invalidDataObjectProperty(relationship.getName())) {
+ } else if
(helper.invalidPersistentObjectProperty(relationship.getName())) {
addFailure(
validationResult,
relationship,
diff --git
a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateProcessorTest.java
b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateProcessorTest.java
index 7616bb386..0c1d8f4c3 100644
---
a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateProcessorTest.java
+++
b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocitySQLTemplateProcessorTest.java
@@ -153,10 +153,10 @@ public class VelocitySQLTemplateProcessorTest {
public void testProcessTemplateID() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE COLUMN1 =
#bind($helper.cayenneExp($a, 'db:ID_COLUMN'))";
- Persistent dataObject = new GenericPersistentObject();
- dataObject.setObjectId(ObjectId.of("T", "ID_COLUMN", 5));
+ Persistent persistent = new GenericPersistentObject();
+ persistent.setObjectId(ObjectId.of("T", "ID_COLUMN", 5));
- Map<String, Object> map = Collections.<String, Object>
singletonMap("a", dataObject);
+ Map<String, Object> map = Collections.<String, Object>
singletonMap("a", persistent);
SQLStatement compiled = processor.processTemplate(sqlTemplate,
map);
@@ -175,10 +175,10 @@ public class VelocitySQLTemplateProcessorTest {
idMap.put("ID_COLUMN1", 3);
idMap.put("ID_COLUMN2", "aaa");
ObjectId id = ObjectId.of("T", idMap);
- Persistent dataObject = new GenericPersistentObject();
- dataObject.setObjectId(id);
+ Persistent persistent = new GenericPersistentObject();
+ persistent.setObjectId(id);
- Map<String, Object> map = Collections.<String, Object>
singletonMap("a", dataObject);
+ Map<String, Object> map = Collections.<String, Object>
singletonMap("a", persistent);
SQLStatement compiled = processor.processTemplate(sqlTemplate,
map);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/template/parser/ASTMethod.java
b/cayenne/src/main/java/org/apache/cayenne/template/parser/ASTMethod.java
index 2c54fadeb..43fb07f50 100644
--- a/cayenne/src/main/java/org/apache/cayenne/template/parser/ASTMethod.java
+++ b/cayenne/src/main/java/org/apache/cayenne/template/parser/ASTMethod.java
@@ -84,9 +84,11 @@ public class ASTMethod extends IdentifierNode {
}
try {
+ m.setAccessible(true);
return m.invoke(parentObject, arguments);
} catch (Exception ignored) {
// continue
+ System.out.println("test");
}
}
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java
b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java
index 0c5d2635b..73dbd11d8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java
@@ -88,7 +88,7 @@ public class CayennePersistentObjectIT extends RuntimeCase {
}
@Test
- public void testReadNestedPropertyNonDataObjectPath() {
+ public void testReadNestedPropertyNonPersistentObjectPath() {
GenericPersistentObject o1 = new GenericPersistentObject();
TstBean o2 = new TstBean();
o2.setInteger(55);
diff --git a/cayenne/src/test/java/org/apache/cayenne/HybridDataObjectIT.java
b/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java
similarity index 99%
rename from cayenne/src/test/java/org/apache/cayenne/HybridDataObjectIT.java
rename to cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java
index 08ff784d3..3edc9ed6e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/HybridDataObjectIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/HybridPersistentObjectIT.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertNull;
* @since 4.1
*/
@UseCayenneRuntime(CayenneProjects.HYBRID_DATA_OBJECT_PROJECT)
-public class HybridDataObjectIT extends RuntimeCase {
+public class HybridPersistentObjectIT extends RuntimeCase {
@Inject
private DataContext context;
diff --git
a/cayenne/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
b/cayenne/src/test/java/org/apache/cayenne/PersistentObjectSerializationIT.java
similarity index 87%
rename from
cayenne/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
rename to
cayenne/src/test/java/org/apache/cayenne/PersistentObjectSerializationIT.java
index 43b8b0b55..1ca408ae7 100644
--- a/cayenne/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/PersistentObjectSerializationIT.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@UseCayenneRuntime(CayenneProjects.TESTMAP_PROJECT)
-public class DataObjectSerializationIT extends RuntimeCase {
+public class PersistentObjectSerializationIT extends RuntimeCase {
@Inject
private ObjectContext context;
@@ -133,33 +133,33 @@ public class DataObjectSerializationIT extends
RuntimeCase {
public void testSerializeModifiedMapBasedObject() throws Exception {
ObjectId objectId = ObjectId.of("test", "id", 42);
- GenericPersistentObject dataObject = new GenericPersistentObject();
- dataObject.setObjectContext(context);
- dataObject.setObjectId(objectId);
- dataObject.writePropertyDirectly("test", 123);
- dataObject.setPersistenceState(PersistenceState.MODIFIED);
+ GenericPersistentObject persistentObject = new
GenericPersistentObject();
+ persistentObject.setObjectContext(context);
+ persistentObject.setObjectId(objectId);
+ persistentObject.writePropertyDirectly("test", 123);
+ persistentObject.setPersistenceState(PersistenceState.MODIFIED);
- GenericPersistentObject cloned =
Util.cloneViaSerialization(dataObject);
+ GenericPersistentObject cloned =
Util.cloneViaSerialization(persistentObject);
assertEquals(PersistenceState.MODIFIED, cloned.getPersistenceState());
assertEquals(123, cloned.readProperty("test"));
assertNull(cloned.getObjectContext());
- assertEquals(dataObject.getObjectId(), cloned.getObjectId());
+ assertEquals(persistentObject.getObjectId(), cloned.getObjectId());
}
@Test
public void testSerializeCommittedMapBasedObject() throws Exception {
ObjectId objectId = ObjectId.of("test", "id", 42);
- GenericPersistentObject dataObject = new GenericPersistentObject();
- dataObject.setObjectContext(context);
- dataObject.setObjectId(objectId);
- dataObject.writePropertyDirectly("test", 123);
- dataObject.setPersistenceState(PersistenceState.COMMITTED);
+ GenericPersistentObject persistentObject = new
GenericPersistentObject();
+ persistentObject.setObjectContext(context);
+ persistentObject.setObjectId(objectId);
+ persistentObject.writePropertyDirectly("test", 123);
+ persistentObject.setPersistenceState(PersistenceState.COMMITTED);
- GenericPersistentObject cloned =
Util.cloneViaSerialization(dataObject);
+ GenericPersistentObject cloned =
Util.cloneViaSerialization(persistentObject);
assertEquals(PersistenceState.HOLLOW, cloned.getPersistenceState());
assertNull(cloned.readProperty("test"));
assertNull(cloned.getObjectContext());
- assertEquals(dataObject.getObjectId(), cloned.getObjectId());
+ assertEquals(persistentObject.getObjectId(), cloned.getObjectId());
}
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java
index 32f91a5f5..e808e1be2 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java
@@ -137,7 +137,7 @@ public class DataContextPrefetchExtrasIT extends
RuntimeCase {
Object toOnePrefetch = fk1.readNestedProperty("toCompoundPk");
assertNotNull(toOnePrefetch);
assertTrue(
- "Expected DataObject, got: " +
toOnePrefetch.getClass().getName(),
+ "Expected Persistent, got: " +
toOnePrefetch.getClass().getName(),
toOnePrefetch instanceof Persistent);
Persistent pk1 = (Persistent) toOnePrefetch;
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
index e949650db..d36540b00 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
@@ -311,7 +311,7 @@ public class DataContextProcedureQueryIT extends
RuntimeCase {
}
@Test
- public void testSelectDataObject() throws Exception {
+ public void testSelectPersistentObject() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
index 6f4a60b82..07e668ef2 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
@@ -178,7 +178,7 @@ public class DataContextQueryCachingIT extends RuntimeCase {
}
@Test
- public void testLocalCacheDataObjectsRefresh() throws Exception {
+ public void testLocalCachePersistentObjectsRefresh() throws Exception {
ObjectSelect<Artist> select =
ObjectSelect.query(Artist.class).localCache();
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
index d1f1686fc..851afafa6 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java
@@ -132,7 +132,7 @@ public class DataContextSQLTemplateIT extends RuntimeCase {
assertEquals(1, array2[1]);
assertEquals(0, array3[1]);
assertEquals(0, array4[1]);
- assertTrue("Unexpected DataObject: " + array1[0], array1[0]
instanceof Artist);
+ assertTrue("Unexpected Persistent: " + array1[0], array1[0]
instanceof Artist);
}
@Test
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
index 1a1c45560..f364749fb 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java
@@ -187,7 +187,7 @@ public class SimpleIdIncrementalFaultListPrefetchIT extends
RuntimeCase {
Object toOnePrefetch = p1.readNestedProperty("toArtist");
assertNotNull(toOnePrefetch);
assertTrue(
- "Expected DataObject, got: " +
toOnePrefetch.getClass().getName(),
+ "Expected Persistent, got: " +
toOnePrefetch.getClass().getName(),
toOnePrefetch instanceof Persistent);
Persistent a1 = (Persistent) toOnePrefetch;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/ToManyListIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/ToManyListIT.java
index 7d04a9627..1fbe56da4 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/ToManyListIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/ToManyListIT.java
@@ -79,7 +79,7 @@ public class ToManyListIT extends RuntimeCase {
ToManyList list = createForExistingArtist();
// immediately tag Artist as MODIFIED, since we are messing up with
relationship
- // bypassing normal CayenneDataObject methods
+ // bypassing normal PersistentObject methods
list.getRelationshipOwner().setPersistenceState(PersistenceState.MODIFIED);
assertTrue("List must be unresolved for an existing object",
list.isFault());
@@ -119,7 +119,7 @@ public class ToManyListIT extends RuntimeCase {
context.commitChanges();
// immediately tag Artist as MODIFIED, since we are messing up with
relationship
- // bypassing normal CayenneDataObject methods
+ // bypassing normal PersistentObject methods
list.getRelationshipOwner().setPersistenceState(PersistenceState.MODIFIED);
assertTrue("List must be unresolved...", list.isFault());
@@ -157,7 +157,7 @@ public class ToManyListIT extends RuntimeCase {
context.commitChanges();
// immediately tag Artist as MODIFIED, since we are messing up with
relationship
- // bypassing normal CayenneDataObject methods
+ // bypassing normal PersistentObject methods
list.getRelationshipOwner().setPersistenceState(PersistenceState.MODIFIED);
assertTrue("List must be unresolved...", list.isFault());
diff --git
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTDbPathIT.java
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTDbPathIT.java
index 17063e93b..876cbc1f0 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTDbPathIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTDbPathIT.java
@@ -44,7 +44,7 @@ public class ASTDbPathIT extends RuntimeCase {
private ObjectContext context;
@Test
- public void testEvaluate_DataObject() {
+ public void testEvaluate_PersistentObject() {
Artist a1 = context.newObject(Artist.class);
a1.setArtistName("a1");
@@ -72,7 +72,7 @@ public class ASTDbPathIT extends RuntimeCase {
}
@Test
- public void testEvaluate_Related_DataObject() {
+ public void testEvaluate_Related_PersistentObject() {
Artist a1 = context.newObject(Artist.class);
Artist a2 = context.newObject(Artist.class);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTEqualIT.java
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTEqualIT.java
index 7c856a5e7..f7bc7eda8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTEqualIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTEqualIT.java
@@ -39,7 +39,7 @@ public class ASTEqualIT extends RuntimeCase {
private ObjectContext context;
@Test
- public void testEvaluate_DataObject() {
+ public void testEvaluate_PersistentObject() {
Artist a1 = context.newObject(Artist.class);
Artist a2 = context.newObject(Artist.class);
Painting p1 = context.newObject(Painting.class);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java
index 98eda893e..f9ae84f9f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java
@@ -54,7 +54,7 @@ public class ASTObjPathTest {
}
@Test
- public void testEvaluate_DataObject() {
+ public void testEvaluate_PersistentObject() {
ASTObjPath node = new ASTObjPath("artistName");
Artist a1 = new Artist();
@@ -80,7 +80,7 @@ public class ASTObjPathTest {
}
@Test
- public void testInjectDataObject() {
+ public void testInjectPersistentObject() {
ASTObjPath node = new ASTObjPath("artistName");
Artist artist = new Artist();
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
b/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
index 58b3e2394..c89d2bddd 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
@@ -68,7 +68,7 @@ public class EntityResolverIT extends RuntimeCase {
}
@Test
- public void testLookupObjEntityByDataobject() {
+ public void testLookupObjEntityByPersistentObject() {
EntityResolver resolver = new
EntityResolver(runtime.getDataDomain().getDataMaps());
Artist artist = (Artist) context.newObject("Artist");
assertIsArtistObjEntity(resolver.getObjEntity(artist));
diff --git
a/cayenne/src/test/java/org/apache/cayenne/map/MockEntityResolver.java
b/cayenne/src/test/java/org/apache/cayenne/map/MockEntityResolver.java
index a8a42ac83..0abf8b6e9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/MockEntityResolver.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/MockEntityResolver.java
@@ -32,7 +32,7 @@ public class MockEntityResolver extends EntityResolver {
this.mockObjEntity = mockObjEntity;
}
- public synchronized ObjEntity lookupObjEntity(Persistent dataObject) {
+ public synchronized ObjEntity lookupObjEntity(Persistent persistent) {
return mockObjEntity;
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
b/cayenne/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
index d4ef2cae8..81ea61e69 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
@@ -30,7 +30,7 @@ public class ObjectIdQueryTest {
@Test
public void testConstructorObjectId() {
- ObjectId oid = ObjectId.of("MockDataObject", "a", "b");
+ ObjectId oid = ObjectId.of("MockPersistentObject", "a", "b");
ObjectIdQuery query = new ObjectIdQuery(oid);
assertSame(oid, query.getObjectId());
diff --git
a/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
b/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
index 7377baa5d..d8abdb46b 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
@@ -211,7 +211,7 @@ public class ProcedureCallIT extends RuntimeCase {
}
@Test
- public void testSelectDataObject() throws Exception {
+ public void testSelectPersistentObject() throws Exception {
if (!accessStackAdapter.supportsStoredProcedures()) {
return;
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
b/cayenne/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
index c79462a07..058a96ce2 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
@@ -32,7 +32,7 @@ public class RelationshipQueryTest {
@Test
public void testConstructorObjectId() {
- ObjectId oid = ObjectId.of("MockDataObject", "a", "b");
+ ObjectId oid = ObjectId.of("MockPersistentObject", "a", "b");
RelationshipQuery query = new RelationshipQuery(oid, "relX");
assertSame(oid, query.getObjectId());
assertSame("relX", query.getRelationshipName());
diff --git
a/cayenne/src/test/java/org/apache/cayenne/template/CayenneSQLTemplateProcessorTest.java
b/cayenne/src/test/java/org/apache/cayenne/template/CayenneSQLTemplateProcessorTest.java
index cafb210d6..16a53cf39 100644
---
a/cayenne/src/test/java/org/apache/cayenne/template/CayenneSQLTemplateProcessorTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/template/CayenneSQLTemplateProcessorTest.java
@@ -155,10 +155,10 @@ public class CayenneSQLTemplateProcessorTest {
public void testProcessTemplateID() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE COLUMN1 =
#bind($helper.cayenneExp($a, 'db:ID_COLUMN'))";
- Persistent dataObject = new GenericPersistentObject();
- dataObject.setObjectId(ObjectId.of("T", "ID_COLUMN", 5));
+ Persistent persistent = new GenericPersistentObject();
+ persistent.setObjectId(ObjectId.of("T", "ID_COLUMN", 5));
- Map<String, Object> map = Collections.singletonMap("a", dataObject);
+ Map<String, Object> map = Collections.singletonMap("a", persistent);
SQLStatement compiled = processor.processTemplate(sqlTemplate, map);
@@ -177,10 +177,10 @@ public class CayenneSQLTemplateProcessorTest {
idMap.put("ID_COLUMN1", 3);
idMap.put("ID_COLUMN2", "aaa");
ObjectId id = ObjectId.of("T", idMap);
- Persistent dataObject = new GenericPersistentObject();
- dataObject.setObjectId(id);
+ Persistent persistent = new GenericPersistentObject();
+ persistent.setObjectId(id);
- Map<String, Object> map = Collections.singletonMap("a", dataObject);
+ Map<String, Object> map = Collections.singletonMap("a", persistent);
SQLStatement compiled = processor.processTemplate(sqlTemplate, map);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/ArtDataObject.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/ArtPersistentObject.java
similarity index 95%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/testmap/ArtDataObject.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/testmap/ArtPersistentObject.java
index 3a051cf20..14e4f5c41 100644
--- a/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/ArtDataObject.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/ArtPersistentObject.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.PersistentObject;
* This class exists solely to enable testing of arbitrary superclasses for
* ObjEntities. It has no functionality at this stage (nor is any likely)
*/
-public class ArtDataObject extends PersistentObject {
+public class ArtPersistentObject extends PersistentObject {
private static final long serialVersionUID = -1350981440925237535L;
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java
index 842b0fa81..5a6b34362 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/testmap/auto/_Painting.java
@@ -11,7 +11,7 @@ import org.apache.cayenne.exp.property.NumericProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
import org.apache.cayenne.exp.property.StringProperty;
-import org.apache.cayenne.testdo.testmap.ArtDataObject;
+import org.apache.cayenne.testdo.testmap.ArtPersistentObject;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.testdo.testmap.Painting;
@@ -23,7 +23,7 @@ import org.apache.cayenne.testdo.testmap.PaintingInfo;
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public abstract class _Painting extends ArtDataObject {
+public abstract class _Painting extends ArtPersistentObject {
private static final long serialVersionUID = 1L;
diff --git
a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
index 44bd7549e..8e43fc7c9 100644
---
a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
+++
b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
@@ -139,7 +139,7 @@
<obj-entity name="NullTestEntity"
className="org.apache.cayenne.testdo.testmap.NullTestEntity"
dbEntityName="NULL_TEST">
<obj-attribute name="name" type="java.lang.String"
db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="Painting"
className="org.apache.cayenne.testdo.testmap.Painting" dbEntityName="PAINTING"
superClassName="org.apache.cayenne.testdo.testmap.ArtDataObject">
+ <obj-entity name="Painting"
className="org.apache.cayenne.testdo.testmap.Painting" dbEntityName="PAINTING"
superClassName="org.apache.cayenne.testdo.testmap.ArtPersistentObject">
<obj-attribute name="estimatedPrice"
type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
<obj-attribute name="paintingDescription"
type="java.lang.String" db-attribute-path="PAINTING_DESCRIPTION"/>
<obj-attribute name="paintingTitle" type="java.lang.String"
db-attribute-path="PAINTING_TITLE"/>
diff --git a/cayenne/src/test/resources/testmap.map.xml
b/cayenne/src/test/resources/testmap.map.xml
index 3c56a8a24..567adeddf 100644
--- a/cayenne/src/test/resources/testmap.map.xml
+++ b/cayenne/src/test/resources/testmap.map.xml
@@ -135,7 +135,7 @@
<obj-entity name="NullTestEntity"
className="org.apache.cayenne.testdo.testmap.NullTestEntity"
dbEntityName="NULL_TEST">
<obj-attribute name="name" type="java.lang.String"
db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="Painting"
className="org.apache.cayenne.testdo.testmap.Painting" dbEntityName="PAINTING"
superClassName="org.apache.cayenne.testdo.testmap.ArtDataObject">
+ <obj-entity name="Painting"
className="org.apache.cayenne.testdo.testmap.Painting" dbEntityName="PAINTING"
superClassName="org.apache.cayenne.testdo.testmap.ArtPersistentObject">
<obj-attribute name="estimatedPrice"
type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
<obj-attribute name="paintingDescription"
type="java.lang.String" db-attribute-path="PAINTING_DESCRIPTION"/>
<obj-attribute name="paintingTitle" type="java.lang.String"
db-attribute-path="PAINTING_TITLE"/>
diff --git
a/maven-plugins/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
b/maven-plugins/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
index aec31d595..6dc0b4b5e 100644
---
a/maven-plugins/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
+++
b/maven-plugins/cayenne-tools-itest/src/test/java/org/apache/cayenne/tools/CayenneGeneratorIntegrationTest.java
@@ -47,7 +47,7 @@ public class CayenneGeneratorIntegrationTest {
startTest("single-classes-cust-template");
assertContents("org/apache/cayenne/testdo/testmap/Artist.java",
"Artist", "org.apache.cayenne.testdo.testmap",
- "CayenneDataObject");
+ "PersistentObject");
assertExists("org/apache/cayenne/testdo/testmap/_Artist.java");
}
diff --git
a/maven-plugins/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/velotemplate.vm
b/maven-plugins/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/velotemplate.vm
index 1ca078c2a..3dc345266 100644
---
a/maven-plugins/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/velotemplate.vm
+++
b/maven-plugins/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/velotemplate.vm
@@ -10,4 +10,4 @@ import org.apache.cayenne.*;
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class ${subClassName} extends CayenneDataObject {
+public class ${subClassName} extends PersistentObject {
diff --git
a/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
b/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
index 5178c2000..e5c941a64 100644
--- a/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
+++ b/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
@@ -428,7 +428,7 @@
<obj-entity name="NoPkTestEntity"
className="org.apache.cayenne.testdo.no_pk.NoPkTestEntity"
dbEntityName="NO_PK_TEST">
<obj-attribute name="attribute1" type="java.lang.Integer"
db-attribute-path="ATTRIBUTE1"/>
</obj-entity>
- <obj-entity name="Painting"
className="org.apache.cayenne.testdo.testmap.Painting" dbEntityName="PAINTING"
superClassName="org.apache.cayenne.testdo.testmap.ArtDataObject">
+ <obj-entity name="Painting"
className="org.apache.cayenne.testdo.testmap.Painting" dbEntityName="PAINTING"
superClassName="org.apache.cayenne.testdo.testmap.ArtPersistentObject">
<obj-attribute name="estimatedPrice"
type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
<obj-attribute name="paintingDescription"
type="java.lang.String" db-attribute-path="PAINTING_DESCRIPTION"/>
<obj-attribute name="paintingTitle" type="java.lang.String"
db-attribute-path="PAINTING_TITLE"/>
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
index 604a70a41..352ddd690 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
@@ -48,7 +48,7 @@ import org.apache.cayenne.query.QueryMetadata;
*/
public abstract class RawQueryPropertiesPanel extends SelectPropertiesPanel {
- protected JCheckBox dataObjects;
+ protected JCheckBox persistentObjects;
protected JComboBox<ObjEntity> entities;
public RawQueryPropertiesPanel(ProjectController mediator) {
@@ -57,7 +57,7 @@ public abstract class RawQueryPropertiesPanel extends
SelectPropertiesPanel {
protected void initController() {
super.initController();
- dataObjects.addItemListener(e ->
setFetchingDataObjects(dataObjects.isSelected()));
+ persistentObjects.addItemListener(e ->
setFetchingPersistentObjects(persistentObjects.isSelected()));
entities.addActionListener(event -> {
ObjEntity entity = (ObjEntity)
entities.getModel().getSelectedItem();
@@ -80,7 +80,7 @@ public abstract class RawQueryPropertiesPanel extends
SelectPropertiesPanel {
cacheGroupsLabel = builder.addLabel("Cache Group:", cc.xy(1, 7));
builder.add(cacheGroups.getComponent(), cc.xywh(3, 7, 5, 1));
builder.addLabel("Fetch Persistent Objects:", cc.xy(1, 9));
- builder.add(dataObjects, cc.xy(3, 9));
+ builder.add(persistentObjects, cc.xy(3, 9));
builder.add(entities, cc.xywh(5, 9, 3, 1));
builder.addLabel("Fetch Offset, Rows:", cc.xy(1, 11));
builder.add(fetchOffset.getComponent(), cc.xywh(3, 11, 3, 1));
@@ -96,7 +96,7 @@ public abstract class RawQueryPropertiesPanel extends
SelectPropertiesPanel {
// create widgets
- dataObjects = new JCayenneCheckBox();
+ persistentObjects = new JCayenneCheckBox();
entities = Application.getWidgetFactory().createUndoableComboBox();
entities.setRenderer(CellRenderers.listRendererWithIcons());
@@ -113,7 +113,7 @@ public abstract class RawQueryPropertiesPanel extends
SelectPropertiesPanel {
super.initFromModel(query);
boolean fetchingDO =
!Boolean.valueOf(query.getProperties().get(QueryMetadata.FETCHING_DATA_ROWS_PROPERTY));
- dataObjects.setSelected(fetchingDO);
+ persistentObjects.setSelected(fetchingDO);
// TODO: now we only allow ObjEntities from the current map,
// since query root is fully resolved during map loading,
@@ -136,14 +136,14 @@ public abstract class RawQueryPropertiesPanel extends
SelectPropertiesPanel {
protected abstract ObjEntity getEntity(QueryDescriptor query);
- protected void setFetchingDataObjects(boolean dataObjects) {
- entities.setEnabled(dataObjects && isEnabled());
+ protected void setFetchingPersistentObjects(boolean
fetchingPersistentObjects) {
+ entities.setEnabled(fetchingPersistentObjects && isEnabled());
- if (!dataObjects) {
+ if (!fetchingPersistentObjects) {
entities.getModel().setSelectedItem(null);
}
setQueryProperty(QueryMetadata.FETCHING_DATA_ROWS_PROPERTY,
- dataObjects ? Boolean.FALSE.toString() :
Boolean.TRUE.toString());
+ fetchingPersistentObjects ? Boolean.FALSE.toString() :
Boolean.TRUE.toString());
}
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
index eb8cdfbc1..108064d4c 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
@@ -260,9 +260,9 @@ public class SQLTemplateMainTab extends BaseQueryMainTab {
}
@Override
- protected void setFetchingDataObjects(boolean dataObjects) {
- super.setFetchingDataObjects(dataObjects);
- if(!dataObjects) {
+ protected void setFetchingPersistentObjects(boolean
fetchingPersistentObjects) {
+ super.setFetchingPersistentObjects(fetchingPersistentObjects);
+ if(!fetchingPersistentObjects) {
setEntity(null);
}
}
