[jboss-cvs] JBossCache/src/org/jboss/cache/aop/statetransfer ...
Vladmir Blagojevic
vladimir.blagojevic at jboss.com
Mon Sep 11 17:53:19 EDT 2006
User: vblagojevic
Date: 06/09/11 17:53:19
Modified: src/org/jboss/cache/aop/statetransfer
PojoStateTransferIntegrator_200.java
PojoStateTransferFactory.java
PojoStateTransferManager.java
PojoStateTransferGenerator_200.java
Removed: src/org/jboss/cache/aop/statetransfer
StreamingPojoStateTransferIntegrator_200.java
StreamingPojoStateTransferGenerator_200.java
Log:
refactoring after Brian's review
Revision Changes Path
1.4 +7 -8 JBossCache/src/org/jboss/cache/aop/statetransfer/PojoStateTransferIntegrator_200.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoStateTransferIntegrator_200.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/statetransfer/PojoStateTransferIntegrator_200.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PojoStateTransferIntegrator_200.java 1 Sep 2006 22:03:37 -0000 1.3
+++ PojoStateTransferIntegrator_200.java 11 Sep 2006 21:53:19 -0000 1.4
@@ -17,17 +17,16 @@
import org.jboss.cache.aop.InternalDelegate;
import org.jboss.cache.factories.NodeFactory;
import org.jboss.cache.loader.NodeData;
-import org.jboss.cache.statetransfer.StateTransferIntegrator_200;
+import org.jboss.cache.statetransfer.AbstractStateTransferIntegrator;
-class PojoStateTransferIntegrator_200 extends StateTransferIntegrator_200
+class PojoStateTransferIntegrator_200 extends AbstractStateTransferIntegrator
{
-
- protected PojoStateTransferIntegrator_200(byte[] state, Fqn targetFqn,
- TreeCache cache) throws Exception
+ public PojoStateTransferIntegrator_200(Fqn targetFqn, TreeCache cache)
{
- super(state, targetFqn, cache);
+ super(targetFqn, cache);
}
+
/**
*
* Integrates associated state previously written to stream as one NodeData
1.3 +5 -68 JBossCache/src/org/jboss/cache/aop/statetransfer/PojoStateTransferFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoStateTransferFactory.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/statetransfer/PojoStateTransferFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PojoStateTransferFactory.java 31 Aug 2006 20:30:44 -0000 1.2
+++ PojoStateTransferFactory.java 11 Sep 2006 21:53:19 -0000 1.3
@@ -6,24 +6,21 @@
*/
package org.jboss.cache.aop.statetransfer;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.ObjectInputStream;
import org.jboss.cache.Fqn;
import org.jboss.cache.TreeCache;
import org.jboss.cache.Version;
import org.jboss.cache.statetransfer.StateTransferGenerator;
import org.jboss.cache.statetransfer.StateTransferIntegrator;
-import org.jboss.invocation.MarshalledValueInputStream;
/**
* Factory class able to create {@link StateTransferGenerator} and
* {@link StateTransferIntegrator} instances.
*
* @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public abstract class PojoStateTransferFactory
{
@@ -51,70 +48,10 @@
return new PojoStateTransferGenerator_200(cache); // current default
}
- /**
- * Gets a StateTransferIntegrator able to handle the given state.
- *
- * @param state the state
- * @param targetFqn Fqn of the node to which the state will be bound
- * @param cache cache in which the state will be stored
- * @return the {@link StateTransferIntegrator}.
- *
- * @throws IllegalStateException if the cache's ReplicationVersion is < 2.0.0
- * @throws Exception
- */
- public static StateTransferIntegrator
- getStateTransferIntegrator(byte[] state, Fqn targetFqn, TreeCache cache)
- throws Exception
- {
- ByteArrayInputStream bais = new ByteArrayInputStream(state);
- bais.mark(1024);
-
- short version = 0;
- MarshalledValueInputStream in = new MarshalledValueInputStream(bais);
- try {
- try
- {
- version = in.readShort();
- }
- catch (IOException io)
- {
- // No short at the head of the stream means version 123
- throw new IllegalStateException("State transfer with cache replication version < 2.0.0 not supported");
- }
-
- // Compiler won't let me use a switch
-
- if (version < RV_200 && version > 0) // <= 0 is actually a version > 15.31.63
- throw new IllegalStateException("State transfer with cache replication version < 2.0.0 not supported");
- else
- return new PojoStateTransferIntegrator_200(state, targetFqn, cache); // current default
-
- }
- finally {
- try {
- in.close();
- }
- catch (IOException io) {}
- }
- }
-
- public static StateTransferGenerator getStateTransferGenerator(OutputStream os, TreeCache cache)
- {
- short version = cache.getConfiguration().getReplicationVersion();
-
- // Compiler won't let me use a switch
-
- if (version < RV_200 && version > 0) // <= 0 is actually a version > 15.31.63
- throw new IllegalStateException("State transfer with cache replication version < 2.0.0 not supported");
- else
- return new StreamingPojoStateTransferGenerator_200(os,cache); // current default
- }
-
- public static StateTransferIntegrator getStateTransferIntegrator(InputStream istream, Fqn fqn, TreeCache treeCache)
+ public static StateTransferIntegrator getStateTransferIntegrator(ObjectInputStream in, Fqn fqn, TreeCache treeCache)
throws Exception
{
short version = 0;
- MarshalledValueInputStream in = new MarshalledValueInputStream(istream);
try
{
version = in.readShort();
@@ -137,6 +74,6 @@
if (version < RV_200 && version > 0) // <= 0 is actually a version > 15.31.63
throw new IllegalStateException("State transfer with cache replication version < 2.0.0 not supported");
else
- return new StreamingPojoStateTransferIntegrator_200(in, fqn, treeCache); // current default
+ return new PojoStateTransferIntegrator_200(fqn, treeCache); // current default
}
}
1.3 +2 -14 JBossCache/src/org/jboss/cache/aop/statetransfer/PojoStateTransferManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoStateTransferManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/statetransfer/PojoStateTransferManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PojoStateTransferManager.java 31 Aug 2006 20:30:44 -0000 1.2
+++ PojoStateTransferManager.java 11 Sep 2006 21:53:19 -0000 1.3
@@ -1,7 +1,6 @@
package org.jboss.cache.aop.statetransfer;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.ObjectInputStream;
import java.util.Iterator;
import java.util.Map;
@@ -27,18 +26,7 @@
return PojoStateTransferFactory.getStateTransferGenerator(getTreeCache());
}
- protected StateTransferIntegrator getStateTransferIntegrator(byte[] state, Fqn targetFqn)
- throws Exception
- {
- return PojoStateTransferFactory.getStateTransferIntegrator(state, targetFqn, getTreeCache());
- }
-
- protected StateTransferGenerator getStateTransferGenerator(OutputStream os)
- {
- return PojoStateTransferFactory.getStateTransferGenerator(os,getTreeCache());
- }
-
- private StateTransferIntegrator getStateTransferIntegrator(InputStream istream, Fqn fqn) throws Exception
+ protected StateTransferIntegrator getStateTransferIntegrator(ObjectInputStream istream, Fqn fqn) throws Exception
{
return PojoStateTransferFactory.getStateTransferIntegrator(istream, fqn, getTreeCache());
}
1.4 +2 -2 JBossCache/src/org/jboss/cache/aop/statetransfer/PojoStateTransferGenerator_200.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoStateTransferGenerator_200.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/statetransfer/PojoStateTransferGenerator_200.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PojoStateTransferGenerator_200.java 1 Sep 2006 22:03:37 -0000 1.3
+++ PojoStateTransferGenerator_200.java 11 Sep 2006 21:53:19 -0000 1.4
@@ -17,9 +17,9 @@
import org.jboss.cache.aop.InternalDelegate;
import org.jboss.cache.aop.util.ObjectUtil;
import org.jboss.cache.loader.NodeData;
-import org.jboss.cache.statetransfer.StateTransferGenerator_200;
+import org.jboss.cache.statetransfer.AbstractStateTransferGenerator;
-class PojoStateTransferGenerator_200 extends StateTransferGenerator_200
+class PojoStateTransferGenerator_200 extends AbstractStateTransferGenerator
{
protected PojoStateTransferGenerator_200(TreeCache cache)
{
More information about the jboss-cvs-commits
mailing list