[weld-commits] Weld SVN: r6947 - in cdi-tck/trunk: impl/src/main/java/org/jboss/jsr299/tck and 1 other directory.

[weld-commits at lists.jboss.org]

Author: dallen6
Date: 2010-08-10 08:24:39 -0400 (Tue, 10 Aug 2010)
New Revision: 6947

Modified:
   cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
Log:
CDITCK-94 Added serialization/deserialization support to SPI

Modified: cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
===================================================================
--- cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java	2010-08-09 20:17:43 UTC (rev 6946)
+++ cdi-tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java	2010-08-10 12:24:39 UTC (rev 6947)
@@ -16,6 +16,8 @@
  */
 package org.jboss.jsr299.tck.spi;
 
+import java.io.IOException;
+
 /**
  * Provides Bean related operations.
  * 
@@ -33,7 +35,7 @@
 {
 
    public static final String PROPERTY_NAME = Beans.class.getName();
-   
+
    /**
     * Determines if the object instance is actually a proxy object.
     * 
@@ -41,5 +43,21 @@
     * @return true if the object is a proxy
     */
    public boolean isProxy(Object instance);
-   
+
+   /**
+    * Serializes the object tree starting with the bean instance provided.
+    * 
+    * @param instance The bean instance to serialize
+    * @return the serialized byte array of the bean instance
+    */
+   public byte[] serialize(Object instance) throws IOException;
+
+   /**
+    * Deserializes a bean instance from the given serialized bytes.
+    * 
+    * @param bytes The serialized byte stream of a bean instance
+    * @return the serialized byte array of the bean instance
+    */
+   public Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException;
+
 }

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java	2010-08-09 20:17:43 UTC (rev 6946)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java	2010-08-10 12:24:39 UTC (rev 6947)
@@ -51,16 +51,12 @@
 
    protected byte[] serialize(Object instance) throws IOException
    {
-      ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-      ObjectOutputStream out = new ObjectOutputStream(bytes);
-      out.writeObject(instance);
-      return bytes.toByteArray();
+      return getCurrentConfiguration().getBeans().serialize(instance);
    }
 
    protected Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException
    {
-      ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
-      return in.readObject();
+      return getCurrentConfiguration().getBeans().deserialize(bytes);
    }
 
    protected void setContextActive(Context context)