JBMAR-149 : Support for hook into the serialization process

api/src/main/java/org/jboss/marshalling/AbstractMarshaller.java

@@ -38,6 +38,8 @@ public abstract class AbstractMarshaller extends AbstractObjectOutput implements
     protected final ClassResolver classResolver;
     /** The configured object resolver. */
     protected final ObjectResolver objectResolver;
+    /** The configured pre object resolver. */
+    protected final ObjectResolver objectPreResolver;
     /** The configured class table. */
     protected final ClassTable classTable;
     /** The configured object table. */
@@ -65,6 +67,8 @@ protected AbstractMarshaller(final AbstractMarshallerFactory marshallerFactory,
         this.classResolver = classResolver == null ? marshallerFactory.getDefaultClassResolver() : classResolver;
         final ObjectResolver objectResolver = configuration.getObjectResolver();
         this.objectResolver = objectResolver == null ? marshallerFactory.getDefaultObjectResolver() : objectResolver;
+        final ObjectResolver objectPreResolver = configuration.getObjectPreResolver();
+        this.objectPreResolver = objectPreResolver == null ? marshallerFactory.getDefaultObjectResolver() : objectPreResolver;
         final ClassTable classTable = configuration.getClassTable();
         this.classTable = classTable == null ? marshallerFactory.getDefaultClassTable() : classTable;
         final ObjectTable objectTable = configuration.getObjectTable();

api/src/main/java/org/jboss/marshalling/AbstractUnmarshaller.java

@@ -38,6 +38,8 @@ public abstract class AbstractUnmarshaller extends AbstractObjectInput implement
     protected final ClassResolver classResolver;
     /** The configured object resolver. */
     protected final ObjectResolver objectResolver;
+    /** The configured object pre resolver. */
+    protected final ObjectResolver objectPreResolver;
     /** The configured class table. */
     protected final ClassTable classTable;
     /** The configured object table. */
@@ -65,6 +67,8 @@ protected AbstractUnmarshaller(final AbstractMarshallerFactory marshallerFactory
         this.classResolver = classResolver == null ? marshallerFactory.getDefaultClassResolver() : classResolver;
         final ObjectResolver objectResolver = configuration.getObjectResolver();
         this.objectResolver = objectResolver == null ? marshallerFactory.getDefaultObjectResolver() : objectResolver;
+        final ObjectResolver objectPreResolver = configuration.getObjectPreResolver();
+        this.objectPreResolver = objectPreResolver == null ? marshallerFactory.getDefaultObjectResolver() : objectPreResolver;
         final ClassTable classTable = configuration.getClassTable();
         this.classTable = classTable == null ? marshallerFactory.getDefaultClassTable() : classTable;
         final ObjectTable objectTable = configuration.getObjectTable();

api/src/main/java/org/jboss/marshalling/MarshallingConfiguration.java

@@ -40,6 +40,7 @@ public final class MarshallingConfiguration implements Cloneable {
     private int classCount = 64;
     private int bufferSize = 512;
     private int version = -1;
+    private ObjectResolver objectPreResolver;
 
     /**
      * Construct a new instance.
@@ -119,6 +120,26 @@ public void setObjectResolver(final ObjectResolver objectResolver) {
         this.objectResolver = objectResolver;
     }
 
+    /**
+     * Get the object pre resolver, or {@code null} if none is specified.
+     *
+     * @return the object resolver
+     */
+    public ObjectResolver getObjectPreResolver() {
+        return objectPreResolver;
+    }
+
+    /**
+     * Set the object pre resolver, or {@code null} to use none.
+     * Invoked before user replacement and global object resolver
+     *
+     * @param objectResolver the object resolver
+     */
+    public void setObjectPreResolver(final ObjectResolver objectPreResolver) {
+        this.objectPreResolver = objectPreResolver;
+    }
+
+
     /**
      * Get the class table, or {@code null} if none is specified.
      *

api/src/main/java/org/jboss/marshalling/cloner/ClonerConfiguration.java

@@ -32,6 +32,7 @@ public final class ClonerConfiguration implements Cloneable {
 
     private CloneTable cloneTable;
     private ObjectResolver objectResolver;
+    private ObjectResolver objectPreResolver;
     private ClassCloner classCloner;
     private SerializabilityChecker serializabilityChecker;
     private int bufferSize;
@@ -88,6 +89,25 @@ public void setObjectResolver(final ObjectResolver objectResolver) {
         this.objectResolver = objectResolver;
     }
 
+    /**
+     * Get the object pre resolver, or {@code null} if none is specified.
+     *
+     * @return the object resolver
+     */
+    public ObjectResolver getObjectPreResolver() {
+        return objectPreResolver;
+    }
+
+    /**
+     * Set the object pre resolver, or {@code null} to use none.
+     * Invoked before user replacement and global object resolver
+     *
+     * @param objectResolver the object resolver
+     */
+    public void setObjectPreResolver(final ObjectResolver objectPreResolver) {
+        this.objectPreResolver = objectPreResolver;
+    }
+
     /**
      * Get the class cloner.  This is used by the serializing cloner to implement a strategy for mapping classes from
      * one "side" of the cloner to the other.

api/src/main/java/org/jboss/marshalling/cloner/SerializingCloner.java

@@ -84,6 +84,7 @@
 class SerializingCloner implements ObjectCloner {
     private final CloneTable delegate;
     private final ObjectResolver objectResolver;
+    private final ObjectResolver objectPreResolver;
     private final ClassCloner classCloner;
     private final SerializabilityChecker serializabilityChecker;
     private final int bufferSize;
@@ -100,6 +101,8 @@ class SerializingCloner implements ObjectCloner {
         this.delegate = delegate == null ? CloneTable.NULL : delegate;
         final ObjectResolver objectResolver = configuration.getObjectResolver();
         this.objectResolver = objectResolver == null ? Marshalling.nullObjectResolver() : objectResolver;
+        final ObjectResolver objectPreResolver = configuration.getObjectPreResolver();
+        this.objectPreResolver = objectPreResolver == null ? Marshalling.nullObjectResolver() : objectPreResolver;
         final ClassCloner classCloner = configuration.getClassCloner();
         this.classCloner = classCloner == null ? ClassCloner.IDENTITY : classCloner;
         final SerializabilityChecker serializabilityChecker = configuration.getSerializabilityChecker();
@@ -142,21 +145,22 @@ private Object clone(final Object orig, final boolean replace) throws IOExceptio
         if (cached != null) {
             return cached;
         }
+        Object replaced = orig;
+        replaced = objectPreResolver.writeReplace(replaced);
         final ClassCloner classCloner = this.classCloner;
-        if (orig instanceof Class) {
-            final Class<?> classObj = (Class<?>) orig;
+        if (replaced instanceof Class) {
+            final Class<?> classObj = (Class<?>) replaced;
             final Class<?> clonedClass = Proxy.isProxyClass(classObj) ? classCloner.cloneProxy(classObj) : classCloner.clone(classObj);
-            clones.put(orig, clonedClass);
+            clones.put(replaced, clonedClass);
             return clonedClass;
         }
-        if ((cached = delegate.clone(orig, this, classCloner)) != null) {
-            clones.put(orig, cached);
+        if ((cached = delegate.clone(replaced, this, classCloner)) != null) {
+            clones.put(replaced, cached);
             return cached;
         }
-        final Class<? extends Object> objClass = orig.getClass();
+        final Class<? extends Object> objClass = replaced.getClass();
         final SerializableClass info = registry.lookup(objClass);
         if (replace) {
-            Object replaced = orig;
             if (info.hasWriteReplace()) {
                 replaced = info.callWriteReplace(replaced);
             }
@@ -246,11 +250,11 @@ private Object clone(final Object orig, final boolean replace) throws IOExceptio
         } else {
             throw new NotSerializableException(objClass.getName());
         }
-        Object replaced = clone;
+        replaced = clone;
         if (cloneInfo.hasReadResolve()) {
             replaced = cloneInfo.callReadResolve(replaced);
         }
-        replaced = objectResolver.readResolve(replaced);
+        replaced = objectPreResolver.readResolve(objectResolver.readResolve(replaced));
         if (replaced != clone) clones.put(orig, replaced);
         return replaced;
     }

river/src/main/java/org/jboss/marshalling/river/RiverMarshaller.java

@@ -107,6 +107,7 @@ protected RiverMarshaller(final RiverMarshallerFactory marshallerFactory, final
     protected void doWriteObject(final Object original, final boolean unshared) throws IOException {
         final ClassExternalizerFactory classExternalizerFactory = this.classExternalizerFactory;
         final ObjectResolver objectResolver = this.objectResolver;
+        final ObjectResolver objectPreResolver = this.objectPreResolver;
         Object obj = original;
         Class<?> objClass;
         int id;
@@ -135,6 +136,8 @@ protected void doWriteObject(final Object original, final boolean unshared) thro
                     }
                     return;
                 }
+                // Check for a global pre replacement, before any user replacement is called
+                obj = objectPreResolver.writeReplace(obj);
                 final ObjectTable.Writer objectTableWriter;
                 if (! unshared && (objectTableWriter = objectTable.getObjectWriter(obj)) != null) {
                     write(ID_PREDEFINED_OBJECT);