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 cdcf53982a695f35438cd0390fcbd4027f3bf040
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Fri Feb 23 12:55:07 2024 +0400
CAY-2845 Deprecate DataObject in favour of Persistent
- refactor persistent descriptor factory
---
.../org/apache/cayenne/map/EntityResolver.java | 4 +-
.../cayenne/reflect/PersistentDescriptor.java | 11 +++--
.../reflect/generic/DataObjectDescriptor.java | 49 ----------------------
...Accessor.java => PersistentObjectAccessor.java} | 21 ++++------
...java => PersistentObjectAttributeProperty.java} | 4 +-
...erty.java => PersistentObjectBaseProperty.java} | 2 +-
...java => PersistentObjectDescriptorFactory.java} | 31 ++++++--------
...java => PersistentObjectToManyMapProperty.java} | 6 +--
...ty.java => PersistentObjectToManyProperty.java} | 4 +-
...rty.java => PersistentObjectToOneProperty.java} | 6 +--
... => PersistentObjectAttributePropertyTest.java} | 6 +--
...va => PersistentObjectDescriptorFactoryIT.java} | 6 +--
...ObjectDescriptorFactory_InheritanceMapsIT.java} | 10 ++---
13 files changed, 51 insertions(+), 109 deletions(-)
diff --git a/cayenne/src/main/java/org/apache/cayenne/map/EntityResolver.java
b/cayenne/src/main/java/org/apache/cayenne/map/EntityResolver.java
index b3ff97bb9..c45e658ef 100644
--- a/cayenne/src/main/java/org/apache/cayenne/map/EntityResolver.java
+++ b/cayenne/src/main/java/org/apache/cayenne/map/EntityResolver.java
@@ -49,8 +49,8 @@ import org.apache.cayenne.reflect.ClassDescriptorMap;
import org.apache.cayenne.reflect.FaultFactory;
import org.apache.cayenne.reflect.LifecycleCallbackRegistry;
import org.apache.cayenne.reflect.SingletonFaultFactory;
+import org.apache.cayenne.reflect.generic.PersistentObjectDescriptorFactory;
import org.apache.cayenne.reflect.generic.ValueComparisonStrategyFactory;
-import org.apache.cayenne.reflect.generic.DataObjectDescriptorFactory;
import org.apache.cayenne.reflect.valueholder.ValueHolderDescriptorFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -507,7 +507,7 @@ public class EntityResolver implements MappingNamespace,
Serializable {
// add factories in reverse of the desired chain order
classDescriptorMap.addFactory(new
ValueHolderDescriptorFactory(classDescriptorMap));
- classDescriptorMap.addFactory(new
DataObjectDescriptorFactory(classDescriptorMap, faultFactory,
valueComparisonStrategyFactory));
+ classDescriptorMap.addFactory(new
PersistentObjectDescriptorFactory(classDescriptorMap, faultFactory,
valueComparisonStrategyFactory));
// since ClassDescriptorMap is not synchronized, we need
to prefill it with entity proxies here.
for (DataMap map : maps) {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java
b/cayenne/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java
index 63d47cac1..1cac8a14e 100644
--- a/cayenne/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java
@@ -20,6 +20,7 @@ package org.apache.cayenne.reflect;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.PersistenceState;
+import org.apache.cayenne.Persistent;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityInheritanceTree;
@@ -144,7 +145,7 @@ public class PersistentDescriptor implements
ClassDescriptor {
List<Entry<String, PropertyDescriptor>> entries = new
ArrayList<>(properties.entrySet());
- Collections.sort(entries,
PropertyComparator.comparator);
+ entries.sort(PropertyComparator.comparator);
Map<String, PropertyDescriptor> orderedProperties = new
LinkedHashMap<>((int) (entries.size() / 0.75));
Map<String, PropertyDescriptor> orderedDeclared = new
LinkedHashMap<>((int) (declaredProperties.size() / 0.75));
@@ -193,7 +194,7 @@ public class PersistentDescriptor implements
ClassDescriptor {
* ClassDescriptor generated from ObjEntity.
*/
public void removeDeclaredProperty(String propertyName) {
- Object removed = declaredProperties.remove(propertyName);
+ PropertyDescriptor removed =
declaredProperties.remove(propertyName);
if (removed != null) {
if (idProperties != null) {
@@ -365,9 +366,9 @@ public class PersistentDescriptor implements
ClassDescriptor {
* each declared property.
*/
public void shallowMerge(final Object from, final Object to) throws
PropertyException {
+ injectValueHolders(to);
visitProperties(new PropertyVisitor() {
-
public boolean visitAttribute(AttributeProperty
property) {
property.writePropertyDirectly(to,
property.readPropertyDirectly(to),
property.readPropertyDirectly(from));
@@ -383,6 +384,10 @@ public class PersistentDescriptor implements
ClassDescriptor {
return true;
}
});
+
+ if (from instanceof Persistent && to instanceof Persistent) {
+ ((Persistent) to).setSnapshotVersion(((Persistent)
from).getSnapshotVersion());
+ }
}
/**
diff --git
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptor.java
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptor.java
deleted file mode 100644
index d6ecbb8e4..000000000
---
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.reflect.generic;
-
-import org.apache.cayenne.Persistent;
-import org.apache.cayenne.reflect.PersistentDescriptor;
-import org.apache.cayenne.reflect.PropertyException;
-
-/**
- * A ClassDescriptor for "generic" persistent classes implementing {@link
Persistent}
- * interface.
- *
- * TODO: merge with PersistentDescriptor and remove
- *
- * @since 3.0
- */
-// non-public as the only difference with the superclass is version handling
on merge -
-// this is something we need to solved in a more generic fashion (e.g. as via
enhancer)
-// for other object types.
-class DataObjectDescriptor extends PersistentDescriptor {
-
- @Override
- public void shallowMerge(Object from, Object to) throws PropertyException {
-
- injectValueHolders(to);
-
- super.shallowMerge(from, to);
-
- if (from instanceof Persistent && to instanceof Persistent) {
- ((Persistent) to).setSnapshotVersion(((Persistent)
from).getSnapshotVersion());
- }
- }
-}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAccessor.java
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectAccessor.java
similarity index 91%
rename from
cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAccessor.java
rename to
cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectAccessor.java
index 9fe295c75..a1e86af3d 100644
---
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAccessor.java
+++
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectAccessor.java
@@ -25,15 +25,14 @@ import org.apache.cayenne.reflect.PropertyException;
/**
* A PropertyAccessor that uses DataObject API to read/write values.
- *
+ *
* @since 3.0
*/
-class DataObjectAccessor implements Accessor {
+class PersistentObjectAccessor implements Accessor {
protected String propertyName;
- DataObjectAccessor(String propertyName) {
-
+ PersistentObjectAccessor(String propertyName) {
if (propertyName == null) {
throw new IllegalArgumentException("Null propertyName");
}
@@ -51,16 +50,13 @@ class DataObjectAccessor implements Accessor {
*/
public Object getValue(Object object) throws PropertyException {
try {
-
Persistent dataObject = (Persistent) object;
return dataObject.readPropertyDirectly(propertyName);
- }
- catch (ClassCastException e) {
+ } catch (ClassCastException e) {
throw new PropertyException("Object is not a DataObject: '"
+ object.getClass().getName()
+ "'", this, object, e);
- }
- catch (Throwable th) {
+ } catch (Throwable th) {
throw new PropertyException("Error reading DataObject property: "
+ propertyName, this, object, th);
}
@@ -72,16 +68,13 @@ class DataObjectAccessor implements Accessor {
* @since 3.0
*/
public void setValue(Object object, Object newValue) throws
PropertyException {
-
try {
((Persistent) object).writePropertyDirectly(propertyName,
newValue);
- }
- catch (ClassCastException e) {
+ } catch (ClassCastException e) {
throw new PropertyException("Object is not a DataObject: '"
+ object.getClass().getName()
+ "'", this, object, e);
- }
- catch (Throwable th) {
+ } catch (Throwable th) {
throw new PropertyException("Error reading DataObject property: "
+ propertyName, this, object, th);
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectAttributeProperty.java
similarity index 90%
rename from
cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java
rename to
cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectAttributeProperty.java
index 1ee94683d..c795ce044 100644
---
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java
+++
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectAttributeProperty.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.reflect.AttributeProperty;
import org.apache.cayenne.reflect.PropertyException;
import org.apache.cayenne.reflect.PropertyVisitor;
-class DataObjectAttributeProperty extends DataObjectBaseProperty implements
+class PersistentObjectAttributeProperty extends PersistentObjectBaseProperty
implements
AttributeProperty {
protected final ObjAttribute attribute;
@@ -33,7 +33,7 @@ class DataObjectAttributeProperty extends
DataObjectBaseProperty implements
*/
protected final ValueComparisonStrategy<Object> valueComparisonStrategy;
- public DataObjectAttributeProperty(ObjAttribute attribute,
ValueComparisonStrategy<Object> valueComparisonStrategy) {
+ public PersistentObjectAttributeProperty(ObjAttribute attribute,
ValueComparisonStrategy<Object> valueComparisonStrategy) {
this.attribute = attribute;
this.valueComparisonStrategy = valueComparisonStrategy;
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectBaseProperty.java
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectBaseProperty.java
similarity index 97%
rename from
cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectBaseProperty.java
rename to
cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectBaseProperty.java
index 8f038906b..27348f49c 100644
---
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectBaseProperty.java
+++
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectBaseProperty.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.reflect.PropertyVisitor;
*
* @since 3.0
*/
-abstract class DataObjectBaseProperty implements PropertyDescriptor,
Serializable {
+abstract class PersistentObjectBaseProperty implements PropertyDescriptor,
Serializable {
public abstract String getName();
diff --git
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectDescriptorFactory.java
similarity index 82%
rename from
cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java
rename to
cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectDescriptorFactory.java
index e7c361148..aa48fa735 100644
---
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java
+++
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectDescriptorFactory.java
@@ -34,19 +34,17 @@ import org.apache.cayenne.reflect.PropertyException;
/**
* A {@link ClassDescriptorFactory} that creates descriptors for classes
implementing {@link Persistent}.
*
- * TODO: rename or deprecate
- *
* @since 3.0
*/
-public class DataObjectDescriptorFactory extends PersistentDescriptorFactory {
+public class PersistentObjectDescriptorFactory extends
PersistentDescriptorFactory {
protected FaultFactory faultFactory;
protected ValueComparisonStrategyFactory valueComparisonStrategyFactory;
- public DataObjectDescriptorFactory(ClassDescriptorMap descriptorMap,
- FaultFactory faultFactory,
- ValueComparisonStrategyFactory
valueComparisonStrategyFactory) {
+ public PersistentObjectDescriptorFactory(ClassDescriptorMap descriptorMap,
+ FaultFactory faultFactory,
+ ValueComparisonStrategyFactory
valueComparisonStrategyFactory) {
super(descriptorMap);
this.faultFactory = faultFactory;
this.valueComparisonStrategyFactory = valueComparisonStrategyFactory;
@@ -61,17 +59,12 @@ public class DataObjectDescriptorFactory extends
PersistentDescriptorFactory {
return super.getDescriptor(entity, entityClass);
}
- @Override
- protected PersistentDescriptor createDescriptor() {
- return new DataObjectDescriptor();
- }
-
@Override
protected void createAttributeProperty(
PersistentDescriptor descriptor,
ObjAttribute attribute) {
- DataObjectAttributeProperty property
- = new DataObjectAttributeProperty(attribute,
valueComparisonStrategyFactory.getStrategy(attribute));
+ PersistentObjectAttributeProperty property
+ = new PersistentObjectAttributeProperty(attribute,
valueComparisonStrategyFactory.getStrategy(attribute));
descriptor.addDeclaredProperty(property);
}
@@ -82,7 +75,7 @@ public class DataObjectDescriptorFactory extends
PersistentDescriptorFactory {
ClassDescriptor targetDescriptor =
descriptorMap.getDescriptor(relationship
.getTargetEntityName());
- descriptor.addDeclaredProperty(new DataObjectToManyProperty(
+ descriptor.addDeclaredProperty(new PersistentObjectToManyProperty(
relationship,
targetDescriptor,
faultFactory.getListFault()));
@@ -96,7 +89,7 @@ public class DataObjectDescriptorFactory extends
PersistentDescriptorFactory {
.getTargetEntityName());
Accessor mapKeyAccessor = createMapKeyAccessor(relationship,
targetDescriptor);
- descriptor.addDeclaredProperty(new DataObjectToManyMapProperty(
+ descriptor.addDeclaredProperty(new PersistentObjectToManyMapProperty(
relationship,
targetDescriptor,
faultFactory.getMapFault(mapKeyAccessor),
@@ -109,7 +102,7 @@ public class DataObjectDescriptorFactory extends
PersistentDescriptorFactory {
ObjRelationship relationship) {
ClassDescriptor targetDescriptor =
descriptorMap.getDescriptor(relationship
.getTargetEntityName());
- descriptor.addDeclaredProperty(new DataObjectToManyProperty(
+ descriptor.addDeclaredProperty(new PersistentObjectToManyProperty(
relationship,
targetDescriptor,
faultFactory.getSetFault()));
@@ -121,7 +114,7 @@ public class DataObjectDescriptorFactory extends
PersistentDescriptorFactory {
ObjRelationship relationship) {
ClassDescriptor targetDescriptor =
descriptorMap.getDescriptor(relationship
.getTargetEntityName());
- descriptor.addDeclaredProperty(new DataObjectToManyProperty(
+ descriptor.addDeclaredProperty(new PersistentObjectToManyProperty(
relationship,
targetDescriptor,
faultFactory.getCollectionFault()));
@@ -134,7 +127,7 @@ public class DataObjectDescriptorFactory extends
PersistentDescriptorFactory {
ClassDescriptor targetDescriptor =
descriptorMap.getDescriptor(relationship
.getTargetEntityName());
- descriptor.addDeclaredProperty(new DataObjectToOneProperty(
+ descriptor.addDeclaredProperty(new PersistentObjectToOneProperty(
relationship,
targetDescriptor,
faultFactory.getToOneFault()));
@@ -145,6 +138,6 @@ public class DataObjectDescriptorFactory extends
PersistentDescriptorFactory {
PersistentDescriptor descriptor,
String propertyName,
Class<?> propertyType) throws PropertyException {
- return new DataObjectAccessor(propertyName);
+ return new PersistentObjectAccessor(propertyName);
}
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyMapProperty.java
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectToManyMapProperty.java
similarity index 85%
rename from
cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyMapProperty.java
rename to
cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectToManyMapProperty.java
index da7823e4b..89f431c57 100644
---
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyMapProperty.java
+++
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectToManyMapProperty.java
@@ -28,13 +28,13 @@ import org.apache.cayenne.reflect.ToManyMapProperty;
/**
* @since 3.0
*/
-class DataObjectToManyMapProperty extends DataObjectToManyProperty implements
+class PersistentObjectToManyMapProperty extends PersistentObjectToManyProperty
implements
ToManyMapProperty {
private Accessor mapKeyAccessor;
- DataObjectToManyMapProperty(ObjRelationship relationship,
- ClassDescriptor targetDescriptor, Fault fault, Accessor
mapKeyAccessor) {
+ PersistentObjectToManyMapProperty(ObjRelationship relationship,
+ ClassDescriptor targetDescriptor, Fault
fault, Accessor mapKeyAccessor) {
super(relationship, targetDescriptor, fault);
this.mapKeyAccessor = mapKeyAccessor;
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectToManyProperty.java
similarity index 95%
rename from
cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java
rename to
cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectToManyProperty.java
index 6dc26355e..249db3e72 100644
---
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java
+++
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectToManyProperty.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.reflect.ToManyProperty;
/**
* @since 3.0
*/
-class DataObjectToManyProperty extends DataObjectBaseProperty implements
ToManyProperty {
+class PersistentObjectToManyProperty extends PersistentObjectBaseProperty
implements ToManyProperty {
protected ObjRelationship relationship;
protected String reverseName;
@@ -40,7 +40,7 @@ class DataObjectToManyProperty extends DataObjectBaseProperty
implements ToManyP
protected ClassDescriptor targetDescriptor;
protected Fault fault;
- DataObjectToManyProperty(ObjRelationship relationship, ClassDescriptor
targetDescriptor, Fault fault) {
+ PersistentObjectToManyProperty(ObjRelationship relationship,
ClassDescriptor targetDescriptor, Fault fault) {
this.relationship = relationship;
this.targetDescriptor = targetDescriptor;
this.reverseName = relationship.getReverseRelationshipName();
diff --git
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToOneProperty.java
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectToOneProperty.java
similarity index 93%
rename from
cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToOneProperty.java
rename to
cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectToOneProperty.java
index 0e5c56542..82c4ea99d 100644
---
a/cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToOneProperty.java
+++
b/cayenne/src/main/java/org/apache/cayenne/reflect/generic/PersistentObjectToOneProperty.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.reflect.ToOneProperty;
*
* @since 3.0
*/
-class DataObjectToOneProperty extends DataObjectBaseProperty implements
ToOneProperty {
+class PersistentObjectToOneProperty extends PersistentObjectBaseProperty
implements ToOneProperty {
protected ObjRelationship relationship;
protected String reverseName;
@@ -40,8 +40,8 @@ class DataObjectToOneProperty extends DataObjectBaseProperty
implements ToOnePro
protected ClassDescriptor targetDescriptor;
protected Fault fault;
- DataObjectToOneProperty(ObjRelationship relationship,
- ClassDescriptor targetDescriptor, Fault fault) {
+ PersistentObjectToOneProperty(ObjRelationship relationship,
+ ClassDescriptor targetDescriptor, Fault
fault) {
this.relationship = relationship;
this.targetDescriptor = targetDescriptor;
this.reverseName = relationship.getReverseRelationshipName();
diff --git
a/cayenne/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
b/cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectAttributePropertyTest.java
similarity index 84%
rename from
cayenne/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
rename to
cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectAttributePropertyTest.java
index 8d4e483cc..6ac40935e 100644
---
a/cayenne/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectAttributePropertyTest.java
@@ -26,15 +26,15 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-public class DataObjectAttributePropertyTest {
+public class PersistentObjectAttributePropertyTest {
@Test
public void testSerialization() throws Exception {
ObjEntity e1 = new ObjEntity("objEntityName");
ObjAttribute a1 = new ObjAttribute("aName", "aType", e1);
- DataObjectAttributeProperty p1 = new
DataObjectAttributeProperty(a1, new
DefaultValueComparisonStrategyFactory.DefaultValueComparisonStrategy());
- DataObjectAttributeProperty p2 = Util.cloneViaSerialization(p1);
+ PersistentObjectAttributeProperty p1 = new
PersistentObjectAttributeProperty(a1, new
DefaultValueComparisonStrategyFactory.DefaultValueComparisonStrategy());
+ PersistentObjectAttributeProperty p2 =
Util.cloneViaSerialization(p1);
assertNotNull(p2);
assertNotNull(p2.getAttribute());
diff --git
a/cayenne/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java
b/cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectDescriptorFactoryIT.java
similarity index 95%
rename from
cayenne/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java
rename to
cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectDescriptorFactoryIT.java
index 16e99ef44..488826151 100644
---
a/cayenne/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectDescriptorFactoryIT.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
@UseCayenneRuntime(CayenneProjects.TESTMAP_PROJECT)
-public class DataObjectDescriptorFactoryIT extends RuntimeCase {
+public class PersistentObjectDescriptorFactoryIT extends RuntimeCase {
@Inject
private EntityResolver resolver;
@@ -48,7 +48,7 @@ public class DataObjectDescriptorFactoryIT extends
RuntimeCase {
@Test
public void testVisitDeclaredProperties_IterationOrder() {
- DataObjectDescriptorFactory factory = new DataObjectDescriptorFactory(
+ PersistentObjectDescriptorFactory factory = new
PersistentObjectDescriptorFactory(
resolver.getClassDescriptorMap(),
new SingletonFaultFactory(),
new
DefaultValueComparisonStrategyFactory(mock(ValueObjectTypeRegistry.class)));
@@ -87,7 +87,7 @@ public class DataObjectDescriptorFactoryIT extends
RuntimeCase {
@Test
public void testVisitProperties_IterationOrder() {
- DataObjectDescriptorFactory factory = new DataObjectDescriptorFactory(
+ PersistentObjectDescriptorFactory factory = new
PersistentObjectDescriptorFactory(
resolver.getClassDescriptorMap(),
new SingletonFaultFactory(),
new
DefaultValueComparisonStrategyFactory(mock(ValueObjectTypeRegistry.class)));
diff --git
a/cayenne/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java
b/cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectDescriptorFactory_InheritanceMapsIT.java
similarity index 88%
rename from
cayenne/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java
rename to
cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectDescriptorFactory_InheritanceMapsIT.java
index 16f57d94d..bf4110c2e 100644
---
a/cayenne/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/reflect/generic/PersistentObjectDescriptorFactory_InheritanceMapsIT.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import static org.mockito.Mockito.mock;
@UseCayenneRuntime(CayenneProjects.INHERITANCE_SINGLE_TABLE1_PROJECT)
-public class DataObjectDescriptorFactory_InheritanceMapsIT extends RuntimeCase
{
+public class PersistentObjectDescriptorFactory_InheritanceMapsIT extends
RuntimeCase {
@Inject
private EntityResolver resolver;
@@ -45,7 +45,7 @@ public class DataObjectDescriptorFactory_InheritanceMapsIT
extends RuntimeCase {
@Test
public void testVisitProperties_IterationOrder() {
- DataObjectDescriptorFactory factory = new DataObjectDescriptorFactory(
+ PersistentObjectDescriptorFactory factory = new
PersistentObjectDescriptorFactory(
resolver.getClassDescriptorMap(),
new SingletonFaultFactory(),
new
DefaultValueComparisonStrategyFactory(mock(ValueObjectTypeRegistry.class)));
@@ -58,21 +58,21 @@ public class DataObjectDescriptorFactory_InheritanceMapsIT
extends RuntimeCase {
PropertyVisitor visitor = new PropertyVisitor() {
public boolean visitToOne(ToOneProperty property) {
- DataObjectDescriptorFactoryIT.assertPropertiesAreInOrder(
+
PersistentObjectDescriptorFactoryIT.assertPropertiesAreInOrder(
lastProcessed[0], property);
lastProcessed[0] = property;
return true;
}
public boolean visitToMany(ToManyProperty property) {
- DataObjectDescriptorFactoryIT.assertPropertiesAreInOrder(
+
PersistentObjectDescriptorFactoryIT.assertPropertiesAreInOrder(
lastProcessed[0], property);
lastProcessed[0] = property;
return true;
}
public boolean visitAttribute(AttributeProperty property) {
- DataObjectDescriptorFactoryIT.assertPropertiesAreInOrder(
+
PersistentObjectDescriptorFactoryIT.assertPropertiesAreInOrder(
lastProcessed[0], property);
lastProcessed[0] = property;
return true;
