[jbosscache-commits] JBoss Cache SVN: r5816 - in core/trunk/src: test/java/org/jboss/cache/marshall and 1 other directory.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Fri May 9 07:49:19 EDT 2008
Author: manik.surtani at jboss.com
Date: 2008-05-09 07:49:19 -0400 (Fri, 09 May 2008)
New Revision: 5816
Removed:
core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller220.java
Modified:
core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java
core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBase.java
core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java
Log:
Removed unnecessary CacheMarshaller220
Deleted: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller220.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller220.java 2008-05-09 11:48:48 UTC (rev 5815)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller220.java 2008-05-09 11:49:19 UTC (rev 5816)
@@ -1,82 +0,0 @@
-package org.jboss.cache.marshall;
-
-import org.jboss.cache.Fqn;
-import org.jboss.cache.StringFqn;
-
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * An evolution of {@link CacheMarshaller210}, to allow for {@link org.jboss.cache.StringFqn}s.
- *
- * @author Manik Surtani
- * @since 2.2.0
- */
-public class CacheMarshaller220 extends CacheMarshaller210
-{
- public CacheMarshaller220()
- {
- initLogger();
- // disabled, since this is always disabled in JBC 2.0.0.
- // Java ObjectOutputStreams will have it's own built-in ref counting. No need to repeat this.
- useRefs = false;
- }
-
- @Override
- protected void marshallFqn(Fqn fqn, ObjectOutputStream out, Map<Object, Integer> refMap) throws Exception
- {
- boolean isRoot = fqn.isRoot();
- out.writeBoolean(isRoot);
- if (!isRoot)
- {
- if (fqn.getClass().equals(StringFqn.class))
- {
- out.writeShort(-1);
- marshallString(((StringFqn) fqn).getStringRepresentation(), out);
- }
- else
- {
- out.writeShort(fqn.size());
- for (Object o : fqn.peekElements())
- {
- marshallObject(o, out, refMap);
- }
- }
- }
- }
-
- @Override
- protected Fqn unmarshallFqn(ObjectInputStream in, UnmarshalledReferences refMap) throws Exception
- {
-
- boolean isRoot = in.readBoolean();
- Fqn fqn;
- if (!isRoot)
- {
- int numElements = in.readShort();
- if (numElements == -1)
- {
- // this is a "new" StringFqn.
- fqn = Fqn.fromString(unmarshallString(in));
- }
- else
- {
- // an "old-style" mixed-type Fqn
- List<Object> elements = new ArrayList<Object>(numElements);
- for (int i = 0; i < numElements; i++)
- {
- elements.add(unmarshallObject(in, refMap));
- }
- fqn = Fqn.fromList(elements);
- }
- }
- else
- {
- fqn = Fqn.ROOT;
- }
- return fqn;
- }
-}
\ No newline at end of file
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java 2008-05-09 11:48:48 UTC (rev 5815)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java 2008-05-09 11:49:19 UTC (rev 5816)
@@ -279,30 +279,20 @@
marshallers.put(VERSION_200, marshaller);
}
break;
- case VERSION_210:
- marshaller = marshallers.get(VERSION_210);
- if (marshaller == null)
- {
- am = new CacheMarshaller210();
- marshaller = am;
- componentRegistry.wireDependencies(am);
- am.init();
- marshallers.put(VERSION_210, marshaller);
- }
- break;
case VERSION_220:
+ case VERSION_210:
knownVersion = true;
default:
if (!knownVersion && log.isWarnEnabled())
log.warn("Unknown replication version String. Falling back to the default marshaller installed.");
- marshaller = marshallers.get(VERSION_220);
+ marshaller = marshallers.get(VERSION_210);
if (marshaller == null)
{
- am = new CacheMarshaller220();
+ am = new CacheMarshaller210();
marshaller = am;
componentRegistry.wireDependencies(am);
am.init();
- marshallers.put(VERSION_220, marshaller);
+ marshallers.put(VERSION_210, marshaller);
}
break;
}
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBase.java 2008-05-09 11:48:48 UTC (rev 5815)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshallerTestBase.java 2008-05-09 11:49:19 UTC (rev 5816)
@@ -28,7 +28,7 @@
{
protected String currentVersion;
protected int currentVersionShort;
- protected Class expectedMarshallerClass, latestMarshallerClass = CacheMarshaller220.class;
+ protected Class expectedMarshallerClass, latestMarshallerClass = CacheMarshaller210.class;
protected VersionAwareMarshaller marshaller;
protected RegionManager regionManager;
protected Configuration c;
@@ -89,7 +89,7 @@
assertEquals(CacheMarshaller200.class, marshaller.getMarshaller(20).getClass());
assertEquals(CacheMarshaller210.class, marshaller.getMarshaller(21).getClass());
- assert marshaller.marshallers.size() == 3 : "Should have 3 marshallers now";
+ assert marshaller.marshallers.size() == 2 : "Should have 2 marshallers now";
}
public void testStringBasedFqn() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java 2008-05-09 11:48:48 UTC (rev 5815)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/VersionAwareMarshallerTest.java 2008-05-09 11:49:19 UTC (rev 5816)
@@ -42,7 +42,7 @@
public void testMarshallerSelection()
{
VersionAwareMarshaller marshaller = createVAMandRestartCache("2.2.0.GA");
- assertEquals(CacheMarshaller220.class, marshaller.defaultMarshaller.getClass());
+ assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.getClass());
marshaller = createVAMandRestartCache("2.1.0.GA");
assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.getClass());
@@ -51,25 +51,25 @@
assertEquals(CacheMarshaller200.class, marshaller.defaultMarshaller.getClass());
marshaller = createVAMandRestartCache("1.4.0.GA");
- assertEquals(CacheMarshaller220.class, marshaller.defaultMarshaller.getClass());
+ assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.getClass());
marshaller = createVAMandRestartCache("1.5.0.GA");
- assertEquals(CacheMarshaller220.class, marshaller.defaultMarshaller.getClass());
+ assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.getClass());
marshaller = createVAMandRestartCache("1.3.0.GA");
- assertEquals(CacheMarshaller220.class, marshaller.defaultMarshaller.getClass());
+ assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.getClass());
marshaller = createVAMandRestartCache("1.3.0.SP2");
- assertEquals(CacheMarshaller220.class, marshaller.defaultMarshaller.getClass());
+ assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.getClass());
marshaller = createVAMandRestartCache("1.3.1.GA");
- assertEquals(CacheMarshaller220.class, marshaller.defaultMarshaller.getClass());
+ assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.getClass());
marshaller = createVAMandRestartCache("1.2.4.SP2");
- assertEquals(CacheMarshaller220.class, marshaller.defaultMarshaller.getClass());
+ assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.getClass());
marshaller = createVAMandRestartCache("1.2.3");
- assertEquals(CacheMarshaller220.class, marshaller.defaultMarshaller.getClass());
+ assertEquals(CacheMarshaller210.class, marshaller.defaultMarshaller.getClass());
}
public void testVersionHeaderDefaultCurrent() throws Exception
More information about the jbosscache-commits
mailing list