[infinispan-commits] Infinispan SVN: r471 - in trunk/core/src/main/java/org/infinispan/marshall/jboss: externalizers and 1 other directory.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed Jun 17 05:03:54 EDT 2009
Author: galder.zamarreno at jboss.com
Date: 2009-06-17 05:03:54 -0400 (Wed, 17 Jun 2009)
New Revision: 471
Removed:
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/StateTransferControlCommandExternalizer.java
Modified:
trunk/core/src/main/java/org/infinispan/marshall/jboss/Externalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/BucketExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/DeltaAwareExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ExceptionResponseExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ExtendedResponseExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/GlobalTransactionExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmortalCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmortalCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmutableMapExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/JGroupsAddressExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/LinkedListExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/MortalCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/MortalCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/SingletonListExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransactionLogExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientMortalCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientMortalCacheValueExternalizer.java
Log:
Removed unnecessary serialization version UIDs since these classes are no longer Serializable and ammended Externalizer javadoc.
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/Externalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/Externalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/Externalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -29,29 +29,16 @@
/**
* Extended interface that extends capabilities of writing predefined objects
* with the possibility of reading them. Any new externalizer implementations
- * should implement this interface.
+ * should implement this interface. Implementations are free to write class
+ * information to the wire as they wish. See {@link ReplicableCommandExternalizer}
+ * for an such example.
*
- * Optionally, Externalizer implementations should implement
- * {@code ClassTable.ClassReadWritable} when they want to add class information to the
- * marshalled payload. This is useful in cases where ReadWriter implementations
- * will create, upon read, new instances using reflection.
- *
* To add a new non-user Externalizer, follow these steps:
*
* 1. Create an implementation of Externalizer.
*
* 2. Add Class to Externalizer mapping to ConstantObjectTable.EXTERNALIZERS
*
- * 3. (Optional) If Externalizer implementation instantiates instances using reflection,
- * like ReplicableCommandExternalizer, you need to do these further steps on top:
- *
- * 3.1. You need to write class information to the stream and read it when unmarshalling
- * so that this information can be using during reflection. So, Externalizer implementations
- * need to implement ClassExternalizer.ClassWritable so that the corresponding ClassExternalizer
- * is injected.
- *
- * 3.2 Add Externalizer implementation to the NumberClassExternalizer.MAGIC_NUMBERS list.
- *
* @author Galder Zamarreño
* @since 4.0
*/
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/BucketExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/BucketExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/BucketExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -41,8 +41,6 @@
*/
@Immutable
public class BucketExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -515803326753484284L;
public void writeObject(Marshaller output, Object subject) throws IOException {
Bucket b = (Bucket) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/DeltaAwareExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/DeltaAwareExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/DeltaAwareExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -37,8 +37,6 @@
*/
@Immutable
public class DeltaAwareExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -1635913024455984627L;
public void writeObject(Marshaller output, Object subject) throws IOException {
DeltaAware dw = (DeltaAware) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ExceptionResponseExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ExceptionResponseExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ExceptionResponseExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -1,5 +1,7 @@
package org.infinispan.marshall.jboss.externalizers;
+import net.jcip.annotations.Immutable;
+
import org.infinispan.marshall.jboss.Externalizer;
import org.infinispan.remoting.responses.ExceptionResponse;
import org.jboss.marshalling.Marshaller;
@@ -13,9 +15,8 @@
* @author Manik Surtani
* @since 4.0
*/
+ at Immutable
public class ExceptionResponseExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -8972357475889354040L;
public void writeObject(Marshaller output, Object subject) throws IOException {
ExceptionResponse er = (ExceptionResponse) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ExtendedResponseExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ExtendedResponseExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ExtendedResponseExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -39,8 +39,6 @@
*/
@Immutable
public class ExtendedResponseExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = 1529506931234856884L;
public void writeObject(Marshaller output, Object subject) throws IOException {
ExtendedResponse er = (ExtendedResponse) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/GlobalTransactionExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/GlobalTransactionExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/GlobalTransactionExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -39,8 +39,6 @@
*/
@Immutable
public class GlobalTransactionExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -8677909497367726531L;
public void writeObject(Marshaller output, Object subject) throws IOException {
GlobalTransaction gtx = (GlobalTransaction) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmortalCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmortalCacheEntryExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmortalCacheEntryExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -39,8 +39,6 @@
*/
@Immutable
public class ImmortalCacheEntryExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -5694009544854594909L;
public void writeObject(Marshaller output, Object subject) throws IOException {
ImmortalCacheEntry ice = (ImmortalCacheEntry) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmortalCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmortalCacheValueExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmortalCacheValueExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -39,8 +39,6 @@
*/
@Immutable
public class ImmortalCacheValueExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = 1196375204861850495L;
public void writeObject(Marshaller output, Object subject) throws IOException {
ImmortalCacheValue icv = (ImmortalCacheValue) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmutableMapExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmutableMapExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/ImmutableMapExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -40,8 +40,6 @@
*/
@Immutable
public class ImmutableMapExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -3592193723750924806L;
public void writeObject(Marshaller output, Object subject) throws IOException {
MarshallUtil.marshallMap((Map) subject, output);
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/JGroupsAddressExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/JGroupsAddressExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/JGroupsAddressExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -38,8 +38,6 @@
*/
@Immutable
public class JGroupsAddressExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = 2400716389425727329L;
public void writeObject(Marshaller output, Object subject) throws IOException {
JGroupsAddress address = (JGroupsAddress) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/LinkedListExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/LinkedListExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/LinkedListExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -39,8 +39,6 @@
*/
@Immutable
public class LinkedListExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -3222803557498456230L;
public void writeObject(Marshaller output, Object subject) throws IOException {
MarshallUtil.marshallCollection((Collection) subject, output);
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/MortalCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/MortalCacheEntryExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/MortalCacheEntryExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -40,8 +40,6 @@
*/
@Immutable
public class MortalCacheEntryExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -6500630714670073716L;
public void writeObject(Marshaller output, Object subject) throws IOException {
MortalCacheEntry ice = (MortalCacheEntry) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/MortalCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/MortalCacheValueExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/MortalCacheValueExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -37,8 +37,6 @@
* @since 4.0
*/
public class MortalCacheValueExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = 7962755251611394481L;
public void writeObject(Marshaller output, Object subject) throws IOException {
MortalCacheValue icv = (MortalCacheValue) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/SingletonListExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/SingletonListExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/SingletonListExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -39,8 +39,6 @@
*/
@Immutable
public class SingletonListExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -714785461531351642L;
public void writeObject(Marshaller output, Object subject) throws IOException {
output.writeObject(((List) subject).get(0));
Deleted: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/StateTransferControlCommandExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/StateTransferControlCommandExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/StateTransferControlCommandExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.infinispan.marshall.jboss.externalizers;
-
-import org.infinispan.commands.control.StateTransferControlCommand;
-import org.infinispan.remoting.transport.Transport;
-import org.jboss.marshalling.Marshaller;
-import org.jboss.marshalling.Unmarshaller;
-
-import java.io.IOException;
-
-/**
- * StateTransferControlCommandExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated With new ObjecTable based solution, we're now fully in control of the stream,
- * so no need to put class on the wire. As a result, we can use the exact same trick used
- * by the old marshaller implementation which uses a RemoteCommandFactory to load the class.
- */
- at Deprecated
-public class StateTransferControlCommandExternalizer extends ReplicableCommandExternalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -3743458410265076691L;
- private Transport transport;
-
- public void init(Transport transport) {
- this.transport = transport;
- }
-
-// @Override
-// protected void writeClass(Marshaller output, Class<?> subjectType) throws IOException {
-// // No-op
-// }
-//
-// @Override
-// protected Object createExternal(Unmarshaller input) throws IOException, ClassNotFoundException {
-// StateTransferControlCommand command = new StateTransferControlCommand();
-// command.init(transport);
-// return command;
-// }
-}
\ No newline at end of file
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransactionLogExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransactionLogExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransactionLogExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -40,8 +40,6 @@
*/
@Immutable
public class TransactionLogExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -7341096933735222157L;
public void writeObject(Marshaller output, Object subject) throws IOException {
TransactionLog.LogEntry le = (TransactionLog.LogEntry) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientCacheEntryExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientCacheEntryExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -23,6 +23,8 @@
import java.io.IOException;
+import net.jcip.annotations.Immutable;
+
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.TransientCacheEntry;
import org.infinispan.io.UnsignedNumeric;
@@ -36,9 +38,8 @@
* @author Galder Zamarreño
* @since 4.0
*/
+ at Immutable
public class TransientCacheEntryExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -1076893995615398371L;
public void writeObject(Marshaller output, Object subject) throws IOException {
TransientCacheEntry ice = (TransientCacheEntry) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientCacheValueExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientCacheValueExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -23,6 +23,8 @@
import java.io.IOException;
+import net.jcip.annotations.Immutable;
+
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.TransientCacheValue;
import org.infinispan.io.UnsignedNumeric;
@@ -36,9 +38,8 @@
* @author Galder Zamarreño
* @since 4.0
*/
+ at Immutable
public class TransientCacheValueExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = 7600812173331344919L;
public void writeObject(Marshaller output, Object subject) throws IOException {
TransientCacheValue icv = (TransientCacheValue) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientMortalCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientMortalCacheEntryExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientMortalCacheEntryExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -23,6 +23,8 @@
import java.io.IOException;
+import net.jcip.annotations.Immutable;
+
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.TransientMortalCacheEntry;
import org.infinispan.io.UnsignedNumeric;
@@ -36,9 +38,8 @@
* @author Galder Zamarreño
* @since 4.0
*/
+ at Immutable
public class TransientMortalCacheEntryExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = -1076893995615398371L;
public void writeObject(Marshaller output, Object subject) throws IOException {
TransientMortalCacheEntry ice = (TransientMortalCacheEntry) subject;
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientMortalCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientMortalCacheValueExternalizer.java 2009-06-16 08:34:10 UTC (rev 470)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/externalizers/TransientMortalCacheValueExternalizer.java 2009-06-17 09:03:54 UTC (rev 471)
@@ -23,6 +23,8 @@
import java.io.IOException;
+import net.jcip.annotations.Immutable;
+
import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.container.entries.TransientMortalCacheValue;
import org.infinispan.io.UnsignedNumeric;
@@ -36,9 +38,8 @@
* @author Galder Zamarreño
* @since 4.0
*/
+ at Immutable
public class TransientMortalCacheValueExternalizer implements Externalizer {
- /** The serialVersionUID */
- private static final long serialVersionUID = 8471189995556621061L;
public void writeObject(Marshaller output, Object subject) throws IOException {
TransientMortalCacheValue icv = (TransientMortalCacheValue) subject;
More information about the infinispan-commits
mailing list