svn commit: r979418 - in /openjpa/branches/2.0.x: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java

[mi...@apache.org]

Author: mikedd
Date: Mon Jul 26 19:43:36 2010
New Revision: 979418

URL: http://svn.apache.org/viewvc?rev=979418&view=rev
Log:
OPENJPA-1722, OPENJPA-1690: Make DistinctResultList serializable, and add writeReplace method. 
Submitted by: Dianne Richards and Pinaki Poddar

Added:
    openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java   (with props)
Modified:
    openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java

Modified: openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java?rev=979418&r1=979417&r2=979418&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java (original)
+++ openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java Mon Jul 26 19:43:36 2010
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.kernel;
 
+import java.io.ObjectStreamException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -39,7 +41,9 @@ import org.apache.openjpa.util.RuntimeEx
  * @param <E>
  *            element type
  */
-public class DistinctResultList<E> implements List<E> {
+public class DistinctResultList<E> implements List<E>, Serializable {
+    private static final long serialVersionUID = -6140119764940777922L;
+
     private final ArrayList<E> _del;
     private final RuntimeExceptionTranslator _trans;
 
@@ -204,4 +208,9 @@ public class DistinctResultList<E> imple
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    public Object writeReplace()
+        throws ObjectStreamException {
+        return _del;
+    }
+
 }

Added: openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java?rev=979418&view=auto
==============================================================================
--- openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java (added)
+++ openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java Mon Jul 26 19:43:36 2010
@@ -0,0 +1,59 @@
+/*
+ * 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
+ *
+ * http://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.openjpa.persistence.query.results;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.openjpa.lib.rop.ListResultList;
+import org.apache.openjpa.lib.rop.ResultList;
+
+import org.apache.openjpa.kernel.DistinctResultList;
+import org.apache.openjpa.persistence.EntityManagerImpl;
+import org.apache.openjpa.persistence.PersistenceExceptions;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+import org.apache.openjpa.util.RuntimeExceptionTranslator;
+
+/**
+ * Test that the DistinctResultList serializes correctly and without error.
+ *
+ * @since 2.1.0
+ */
+public class TestListResultSerialization extends SQLListenerTestCase {
+    public void setUp() throws Exception {
+        super.setUp();
+        assertNotNull(emf);
+    }
+    
+    public void testRoundtrip() {
+        List<String> list = new ArrayList<String>();
+        list.add("xxx");
+        list.add("yyy");
+        ResultList resultList = new ListResultList(list);
+        EntityManagerImpl em = (EntityManagerImpl)emf.createEntityManager();
+        em.close();
+        RuntimeExceptionTranslator trans = PersistenceExceptions.getRollbackTranslator(em);
+        DistinctResultList distinctResultList = new DistinctResultList(resultList, trans);
+        try {
+            roundtrip(distinctResultList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail("unexpected exception - see stack trace in output");
+        }
+    }
+}

Propchange: openjpa/branches/2.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java
------------------------------------------------------------------------------
    svn:eol-style = native