You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/09/24 11:06:30 UTC

svn commit: r578715 - /cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaMapProperty.java

Author: aadamchik
Date: Mon Sep 24 02:06:29 2007
New Revision: 578715

URL: http://svn.apache.org/viewvc?rev=578715&view=rev
Log:
(CAY-848) Support for mapping to-many as Maps and Sets and Collections
(post-commit object update for the JPA descriptor)

Modified:
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaMapProperty.java

Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaMapProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaMapProperty.java?rev=578715&r1=578714&r2=578715&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaMapProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaMapProperty.java Mon Sep 24 02:06:29 2007
@@ -18,17 +18,26 @@
  ****************************************************************/
 package org.apache.cayenne.jpa.reflect;
 
+import java.util.Iterator;
+import java.util.Map;
+
 import org.apache.cayenne.Persistent;
 import org.apache.cayenne.ValueHolder;
+import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.reflect.Accessor;
 import org.apache.cayenne.reflect.ClassDescriptor;
+import org.apache.cayenne.reflect.PropertyException;
+import org.apache.cayenne.reflect.ToManyMapProperty;
 import org.apache.cayenne.util.PersistentObjectMap;
 
-class JpaMapProperty extends JpaToManyProperty {
+class JpaMapProperty extends JpaToManyProperty implements ToManyMapProperty {
+    
+    private Expression mapKey;
 
     JpaMapProperty(ClassDescriptor owner, ClassDescriptor targetDescriptor,
             Accessor accessor, String reverseName) {
         super(owner, targetDescriptor, accessor, reverseName);
+        this.mapKey = getRelationship().getMapKeyExpression();
     }
 
     @Override
@@ -37,4 +46,39 @@
                 .getMapKeyExpression());
     }
 
+    public void remapTarget(Object source, Object target) throws PropertyException {
+        // TODO: andrus, 9/24/2007 - this is an clone of the remapTarget method in
+        // DataObjectToManyMapProperty that is a part of a different inheritance
+        // hierarchy... need to reconcile that somehow...
+
+        if (target == null) {
+            throw new NullPointerException("Null target");
+        }
+
+        Map map = (Map) readProperty(source);
+
+        Object newKey = mapKey.evaluate(target);
+        Object currentValue = map.get(newKey);
+
+        if (currentValue == target) {
+            // nothing to do
+            return;
+        }
+        // else - do not check for conflicts here (i.e. another object mapped for the same
+        // key), as we have no control of the order in which this method is called, so
+        // another object may be remapped later by the caller
+
+        // must do a slow map scan to ensure the object is not mapped under a different
+        // key...
+        Iterator it = map.entrySet().iterator();
+        while (it.hasNext()) {
+            Map.Entry e = (Map.Entry) it.next();
+            if (e.getValue() == target) {
+                it.remove();
+                break;
+            }
+        }
+
+        map.put(newKey, target);
+    }
 }