Author: aadamchik
Date: Tue Oct 10 18:50:26 2006
New Revision: 462658
URL: http://svn.apache.org/viewvc?view=rev&rev=462658
Log:
CAY-682 Weed out DataObject references from the access stack classes, replacing
them with Persistent and ClassDescriptor
(first pass)
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainDeleteBucket.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainUpdateBucket.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/DataObjectMatchTranslator.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLDecoder.java
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java?view=diff&rev=462658&r1=462657&r2=462658
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
Tue Oct 10 18:50:26 2006
@@ -935,7 +935,7 @@
// rule, so modifying
Iterator it = new ArrayList(objects).iterator();
while (it.hasNext()) {
- DataObject object = (DataObject) it.next();
+ Persistent object = (Persistent) it.next();
deleteObject(object);
}
}
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainDeleteBucket.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainDeleteBucket.java?view=diff&rev=462658&r1=462657&r2=462658
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainDeleteBucket.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainDeleteBucket.java
Tue Oct 10 18:50:26 2006
@@ -28,7 +28,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.cayenne.DataObject;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntitySorter;
@@ -96,7 +95,7 @@
}
for (Iterator k = objects.iterator(); k.hasNext();) {
- DataObject o = (DataObject) k.next();
+ Persistent o = (Persistent) k.next();
ObjectDiff diff = parent.objectDiff(o.getObjectId());
Map qualifierSnapshot = qualifierBuilder
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainUpdateBucket.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainUpdateBucket.java?view=diff&rev=462658&r1=462657&r2=462658
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainUpdateBucket.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataDomainUpdateBucket.java
Tue Oct 10 18:50:26 2006
@@ -29,8 +29,8 @@
import java.util.Map;
import java.util.Set;
-import org.apache.cayenne.DataObject;
import org.apache.cayenne.PersistenceState;
+import org.apache.cayenne.Persistent;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.ObjEntity;
@@ -66,7 +66,7 @@
List objects = (List) objectsByEntity.get(entity);
for (Iterator k = objects.iterator(); k.hasNext();) {
- DataObject o = (DataObject) k.next();
+ Persistent o = (Persistent) k.next();
ObjectDiff diff = parent.objectDiff(o.getObjectId());
Map snapshot = diffBuilder.buildDBDiff(diff);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/DataObjectMatchTranslator.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/DataObjectMatchTranslator.java?view=diff&rev=462658&r1=462657&r2=462658
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/DataObjectMatchTranslator.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/DataObjectMatchTranslator.java
Tue Oct 10 18:50:26 2006
@@ -26,8 +26,8 @@
import java.util.Map;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.DataObject;
import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.Persistent;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
@@ -92,15 +92,13 @@
}
}
- public void setDataObject(DataObject obj) {
+ public void setDataObject(Persistent obj) {
if (obj == null) {
values = Collections.EMPTY_MAP;
return;
}
-
- ObjectId id = obj.getObjectId();
-
- setObjectId(id);
+
+ setObjectId(obj.getObjectId());
}
/**
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java?view=diff&rev=462658&r1=462657&r2=462658
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java
Tue Oct 10 18:50:26 2006
@@ -22,9 +22,8 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.cayenne.DataObject;
import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.Persistent;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.TraversalHandler;
import org.apache.cayenne.map.DbAttribute;
@@ -34,6 +33,7 @@
import org.apache.cayenne.query.QualifiedQuery;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SelectQuery;
+import org.apache.commons.collections.IteratorUtils;
/**
* Translates query qualifier to SQL. Used as a helper class by query
translators.
@@ -125,7 +125,7 @@
// check if there are DataObjects among direct children of the
Expression
for (int i = 0; i < 2; i++) {
Object op = exp.getOperand(i);
- if (op instanceof DataObject || op instanceof ObjectId) {
+ if (op instanceof Persistent || op instanceof ObjectId) {
matchingObject = true;
if (objectMatchTranslator == null) {
@@ -423,8 +423,8 @@
if (!matchingObject) {
super.appendLiteral(buf, val, attr, parentExpression);
}
- else if (val == null || (val instanceof DataObject)) {
- objectMatchTranslator.setDataObject((DataObject) val);
+ else if (val == null || (val instanceof Persistent)) {
+ objectMatchTranslator.setDataObject((Persistent) val);
}
else if(val instanceof ObjectId) {
objectMatchTranslator.setObjectId((ObjectId) val);
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java?view=diff&rev=462658&r1=462657&r2=462658
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
Tue Oct 10 18:50:26 2006
@@ -24,8 +24,8 @@
import java.util.Map;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.DataObject;
import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.Persistent;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
@@ -218,8 +218,8 @@
if (val == null) {
buf.append("NULL");
}
- else if (val instanceof DataObject) {
- ObjectId id = ((DataObject) val).getObjectId();
+ else if (val instanceof Persistent) {
+ ObjectId id = ((Persistent) val).getObjectId();
// check if this id is acceptable to be a parameter
if (id == null) {
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLDecoder.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLDecoder.java?view=diff&rev=462658&r1=462657&r2=462658
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLDecoder.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/xml/XMLDecoder.java
Tue Oct 10 18:50:26 2006
@@ -32,7 +32,7 @@
import javax.xml.parsers.DocumentBuilder;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.DataObject;
+import org.apache.cayenne.Persistent;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.property.PropertyUtils;
import org.apache.cayenne.util.Util;
@@ -316,7 +316,7 @@
Object ret = mu.decode(data.getDocumentElement());
if (dataContext != null) {
- dataContext.registerNewObject((DataObject) ret);
+ dataContext.registerNewObject((Persistent) ret);
}
return ret;
@@ -348,8 +348,8 @@
throw new CayenneRuntimeException("Error instantiating object",
th);
}
- if ((null != dataContext) && (object instanceof DataObject)) {
- dataContext.registerNewObject((DataObject) object);
+ if ((null != dataContext) && (object instanceof Persistent)) {
+ dataContext.registerNewObject((Persistent) object);
}
root = oldRoot;
@@ -489,8 +489,8 @@
if (mu != null) {
o = mu.decode(e);
- if (dataContext != null && o instanceof DataObject) {
- dataContext.registerNewObject((DataObject) o);
+ if (dataContext != null && o instanceof Persistent) {
+ dataContext.registerNewObject((Persistent) o);
}
}
else {
