[jboss-cvs] JBossAS SVN: r64109 - in projects/microcontainer/trunk/container/src: main/org/jboss/reflect/plugins/javassist and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2007-07-18 04:39:13 -0400 (Wed, 18 Jul 2007)
New Revision: 64109

Modified:
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactory.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectClassInfoImpl.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactory.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java
Log:
Changed the assertion on == after deserialization.
Exposed delegate in <Type>TypeInfoFactory for package protected access.
Added readResolve to ReflectClassInfoImpl.

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactory.java	2007-07-18 07:36:54 UTC (rev 64108)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactory.java	2007-07-18 08:39:13 UTC (rev 64109)
@@ -39,6 +39,11 @@
    /** The delegate */
    private static IntrospectionTypeInfoFactoryImpl delegate = new IntrospectionTypeInfoFactoryImpl();
 
+   static TypeInfoFactory getDelegate()
+   {
+      return delegate;
+   }
+
    public TypeInfo getTypeInfo(Class clazz)
    {
       return delegate.getTypeInfo(clazz);

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectClassInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectClassInfoImpl.java	2007-07-18 07:36:54 UTC (rev 64108)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectClassInfoImpl.java	2007-07-18 08:39:13 UTC (rev 64109)
@@ -23,6 +23,7 @@
 
 import org.jboss.reflect.plugins.ClassInfoImpl;
 import org.jboss.reflect.spi.InterfaceInfo;
+import org.jboss.reflect.spi.TypeInfoFactory;
 
 /**
  * Class info
@@ -70,4 +71,10 @@
    {
       return getType().isInterface();
    }
+
+   Object readResolve()
+   {
+      TypeInfoFactory typeInfoFactory = IntrospectionTypeInfoFactory.getDelegate();
+      return typeInfoFactory.getTypeInfo(getType());
+   }
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactory.java	2007-07-18 07:36:54 UTC (rev 64108)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactory.java	2007-07-18 08:39:13 UTC (rev 64109)
@@ -39,6 +39,11 @@
    /** The delegate */
    private static JavassistTypeInfoFactoryImpl delegate = new JavassistTypeInfoFactoryImpl();
 
+   static TypeInfoFactory getDelegate()
+   {
+      return delegate;
+   }
+
    public TypeInfo getTypeInfo(Class clazz)
    {
       return delegate.getTypeInfo(clazz);

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java	2007-07-18 07:36:54 UTC (rev 64108)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AbstractClassInfoTest.java	2007-07-18 08:39:13 UTC (rev 64109)
@@ -90,7 +90,7 @@
       {
          byte[] bytes = serialize(info);
          Object deserialized = deserialize(bytes);
-         assertEquals(info, deserialized);
+         assertTrue("Not the same object: " + info + " != " + deserialized, info == deserialized);
       }
       
       return info;