[infinispan-commits] Infinispan SVN: r721 - in trunk: tree/src/main/java/org/infinispan/tree/marshall/exts and 1 other directory.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Aug 21 11:07:56 EDT 2009
Author: galder.zamarreno at jboss.com
Date: 2009-08-21 11:07:56 -0400 (Fri, 21 Aug 2009)
New Revision: 721
Removed:
trunk/core/src/main/java/org/infinispan/marshall/exts/BucketExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/DeadlockDetectingGlobalTransactionExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/DeltaAwareExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ExceptionResponseExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ExtendedResponseExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/GlobalTransactionExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/ImmutableMapExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/JGroupsAddressExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/MarshalledValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/SuccessfulResponseExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransactionLogExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheValueExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheEntryExternalizer.java
trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheValueExternalizer.java
trunk/tree/src/main/java/org/infinispan/tree/marshall/exts/NodeKeyExternalizer.java
Log:
[ISPN-168] (Cleanup deprecated externalizers) Done.
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/BucketExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/BucketExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/BucketExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,59 +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.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.container.entries.InternalCacheEntry;
-
-import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.loaders.bucket.Bucket;
-import org.infinispan.marshall.Externalizer;
-
-/**
- * BucketExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link Bucket}
- */
- at Immutable
-public class BucketExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- Bucket b = (Bucket) subject;
- UnsignedNumeric.writeUnsignedInt(output, b.getNumEntries());
- for (InternalCacheEntry se : b.getEntries().values()) output.writeObject(se);
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Bucket b = new Bucket();
- int numEntries = UnsignedNumeric.readUnsignedInt(input);
- for (int i = 0; i < numEntries; i++) b.addEntry((InternalCacheEntry) input.readObject());
- return b;
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/DeadlockDetectingGlobalTransactionExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/DeadlockDetectingGlobalTransactionExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/DeadlockDetectingGlobalTransactionExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,36 +0,0 @@
-package org.infinispan.marshall.exts;
-
-import org.infinispan.transaction.xa.DeadlockDetectingGlobalTransaction;
-import org.infinispan.transaction.xa.GlobalTransactionFactory;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * Externalizer for {@link DeadlockDetectingGlobalTransaction}.
- *
- * @author Mircea.Markus at jboss.com
- * @deprecated Externalizer implementation now within {@link DeadlockDetectingGlobalTransaction}
- */
-public class DeadlockDetectingGlobalTransactionExternalizer extends GlobalTransactionExternalizer {
-
- public DeadlockDetectingGlobalTransactionExternalizer() {
- super();
- gtxFactory = new GlobalTransactionFactory(true);
- }
-
- @Override
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- super.writeObject(output, subject);
- DeadlockDetectingGlobalTransaction ddGt = (DeadlockDetectingGlobalTransaction) subject;
- output.writeLong(ddGt.getCoinToss());
- }
-
- @Override
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- DeadlockDetectingGlobalTransaction ddGt = (DeadlockDetectingGlobalTransaction) super.readObject(input);
- ddGt.setCoinToss(input.readLong());
- return ddGt;
- }
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/DeltaAwareExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/DeltaAwareExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/DeltaAwareExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,53 +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.exts;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.atomic.AtomicHashMap;
-import org.infinispan.atomic.DeltaAware;
-import org.infinispan.marshall.Externalizer;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * DeltaAwareExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link AtomicHashMap}
- */
- at Immutable
-public class DeltaAwareExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- DeltaAware dw = (DeltaAware) subject;
- output.writeObject(dw.delta());
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- return input.readObject();
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/ExceptionResponseExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ExceptionResponseExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ExceptionResponseExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,33 +0,0 @@
-package org.infinispan.marshall.exts;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.marshall.Externalizer;
-import org.infinispan.remoting.responses.ExceptionResponse;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * Externalizes an ExceptionResponse
- *
- * @author Manik Surtani
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link ExceptionResponse}
- */
- at Immutable
-public class ExceptionResponseExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- ExceptionResponse er = (ExceptionResponse) subject;
- output.writeObject(er.getException());
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- ExceptionResponse er = new ExceptionResponse();
- er.setException((Exception) input.readObject());
- return er;
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/ExtendedResponseExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ExtendedResponseExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ExtendedResponseExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,56 +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.exts;
-
- import net.jcip.annotations.Immutable;
-
-import org.infinispan.marshall.Externalizer;
-import org.infinispan.remoting.responses.ExtendedResponse;
-import org.infinispan.remoting.responses.Response;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * ExtendedResponseExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link ExtendedResponse}
- */
- at Immutable
-public class ExtendedResponseExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- ExtendedResponse er = (ExtendedResponse) subject;
- output.writeBoolean(er.isReplayIgnoredRequests());
- output.writeObject(er.getResponse());
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- boolean replayIgnoredRequests = input.readBoolean();
- Response response = (Response) input.readObject();
- return new ExtendedResponse(response, replayIgnoredRequests);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/GlobalTransactionExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/GlobalTransactionExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/GlobalTransactionExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,60 +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.exts;
-
-import org.infinispan.marshall.Externalizer;
-import org.infinispan.remoting.transport.Address;
-import org.infinispan.transaction.xa.GlobalTransaction;
-import org.infinispan.transaction.xa.GlobalTransactionFactory;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * GlobalTransactionExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link GlobalTransaction}
- */
- at Deprecated
-public class GlobalTransactionExternalizer implements Externalizer {
-
- protected GlobalTransactionFactory gtxFactory = new GlobalTransactionFactory();
-
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- GlobalTransaction gtx = (GlobalTransaction) subject;
- output.writeLong(gtx.getId());
- output.writeObject(gtx.getAddress());
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- GlobalTransaction gtx = gtxFactory.instantiateGlobalTransaction();
- long id = input.readLong();
- Object address = input.readObject();
- gtx.setId(id);
- gtx.setAddress((Address) address);
- return gtx;
- }
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheEntryExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheEntryExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,56 +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.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.container.entries.ImmortalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.marshall.Externalizer;
-
-/**
- * ImmortalCacheEntryExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link ImmortalCacheEntry}
- */
- at Immutable
-public class ImmortalCacheEntryExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- ImmortalCacheEntry ice = (ImmortalCacheEntry) subject;
- output.writeObject(ice.getKey());
- output.writeObject(ice.getValue());
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Object k = input.readObject();
- Object v = input.readObject();
- return InternalEntryFactory.create(k, v);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheValueExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ImmortalCacheValueExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,54 +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.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.container.entries.ImmortalCacheValue;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.marshall.Externalizer;
-
-/**
- * ImmortalCacheValueExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link ImmortalCacheValue}
- */
- at Immutable
-public class ImmortalCacheValueExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- ImmortalCacheValue icv = (ImmortalCacheValue) subject;
- output.writeObject(icv.getValue());
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Object v = input.readObject();
- return InternalEntryFactory.createValue(v);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/ImmutableMapExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/ImmutableMapExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/ImmutableMapExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,56 +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.exts;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.marshall.Externalizer;
-import org.infinispan.marshall.MarshallUtil;
-import org.infinispan.util.Immutables;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * ImmutableExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link Immutables.ImmutableMapWrapper}
- */
- at Immutable
-public class ImmutableMapExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- MarshallUtil.marshallMap((Map) subject, output);
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Map map = new HashMap();
- MarshallUtil.unmarshallMap(map, input);
- return Immutables.immutableMapWrap(map);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/JGroupsAddressExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/JGroupsAddressExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/JGroupsAddressExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,52 +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.exts;
-
-import net.jcip .annotations.Immutable;
-
-import org.infinispan.marshall.Externalizer;
-import org.infinispan.remoting.transport.jgroups.JGroupsAddress;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * JGroupsAddressExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link JGroupsAddress}
- */
- at Immutable
-public class JGroupsAddressExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- JGroupsAddress address = (JGroupsAddress) subject;
- output.writeObject(address.getJGroupsAddress());
- }
-
- public Object readObject(ObjectInput unmarshaller) throws IOException, ClassNotFoundException {
- JGroupsAddress address = new JGroupsAddress();
- address.setJGroupsAddress((org.jgroups.Address) unmarshaller.readObject());
- return address;
- }
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/MarshalledValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/MarshalledValueExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/MarshalledValueExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,62 +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.exts;
-
-import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.Externalizer;
-import org.infinispan.marshall.MarshalledValue;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * MarshalledValueExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link MarshalledValue}
- */
-public class MarshalledValueExternalizer implements Externalizer {
- private org.infinispan.marshall.Marshaller ispnMarshaller;
-
- public void init(org.infinispan.marshall.Marshaller ispnMarshaller) {
- this.ispnMarshaller = ispnMarshaller;
- }
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- MarshalledValue mv = ((MarshalledValue) subject);
- byte[] raw = mv.getRaw();
- UnsignedNumeric.writeUnsignedInt(output, raw.length);
- output.write(raw);
- output.writeInt(mv.hashCode());
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- int length = UnsignedNumeric.readUnsignedInt(input);
- byte[] raw = new byte[length];
- input.readFully(raw);
- int hc = input.readInt();
- return new MarshalledValue(raw, hc, ispnMarshaller);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheEntryExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheEntryExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -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.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.container.entries.MortalCacheEntry;
-import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.Externalizer;
-
-/**
- * MortalCacheEntryExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link MortalCacheEntry}
- */
- at Immutable
-public class MortalCacheEntryExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- MortalCacheEntry ice = (MortalCacheEntry) subject;
- output.writeObject(ice.getKey());
- output.writeObject(ice.getValue());
- UnsignedNumeric.writeUnsignedLong(output, ice.getCreated());
- output.writeLong(ice.getLifespan()); // could be negative so should not use unsigned longs
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Object k = input.readObject();
- Object v = input.readObject();
- long created = UnsignedNumeric.readUnsignedLong(input);
- Long lifespan = input.readLong();
- return InternalEntryFactory.create(k, v, created, lifespan, -1, -1);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheValueExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/MortalCacheValueExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,56 +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.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.container.entries.MortalCacheValue;
-import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.Externalizer;
-
-/**
- * MortalCacheValueExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link MortalCacheValue}
- */
-public class MortalCacheValueExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- MortalCacheValue icv = (MortalCacheValue) subject;
- output.writeObject(icv.getValue());
- UnsignedNumeric.writeUnsignedLong(output, icv.getCreated());
- output.writeLong(icv.getLifespan()); // could be negative so should not use unsigned longs
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Object v = input.readObject();
- long created = UnsignedNumeric.readUnsignedLong(input);
- Long lifespan = input.readLong();
- return InternalEntryFactory.createValue(v, created, lifespan, -1, -1);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/SuccessfulResponseExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/SuccessfulResponseExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/SuccessfulResponseExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,33 +0,0 @@
-package org.infinispan.marshall.exts;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.marshall.Externalizer;
-import org.infinispan.remoting.responses.SuccessfulResponse;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * Externalizes a SuccessfulResponse
- *
- * @author Manik Surtani
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link SuccessfulResponse}
- */
- at Immutable
-public class SuccessfulResponseExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- SuccessfulResponse sr = (SuccessfulResponse) subject;
- output.writeObject(sr.getResponseValue());
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- SuccessfulResponse sr = new SuccessfulResponse();
- sr.setResponseValue(input.readObject());
- return sr;
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/TransactionLogExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransactionLogExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransactionLogExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,62 +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.exts;
-
-import net.jcip.annotations.Immutable;
-import org.infinispan.commands.write.WriteCommand;
-import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.Externalizer;
-import org.infinispan.transaction.xa.GlobalTransaction;
-import org.infinispan.transaction.TransactionLog;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * TransactionLogExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link TransactionLog.LogEntry}
- */
- at Immutable
-public class TransactionLogExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- TransactionLog.LogEntry le = (TransactionLog.LogEntry) subject;
- output.writeObject(le.getTransaction());
- WriteCommand[] cmds = le.getModifications();
- UnsignedNumeric.writeUnsignedInt(output, cmds.length);
- for (WriteCommand c : cmds)
- output.writeObject(c);
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- GlobalTransaction gtx = (GlobalTransaction) input.readObject();
- int numCommands = UnsignedNumeric.readUnsignedInt(input);
- WriteCommand[] cmds = new WriteCommand[numCommands];
- for (int i = 0; i < numCommands; i++) cmds[i] = (WriteCommand) input.readObject();
- return new TransactionLog.LogEntry(gtx, cmds);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheEntryExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheEntryExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -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.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.container.entries.TransientCacheEntry;
-import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.Externalizer;
-
-/**
- * TransientCacheEntryExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link TransientCacheEntry}
- */
- at Immutable
-public class TransientCacheEntryExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- TransientCacheEntry ice = (TransientCacheEntry) subject;
- output.writeObject(ice.getKey());
- output.writeObject(ice.getValue());
- UnsignedNumeric.writeUnsignedLong(output, ice.getLastUsed());
- output.writeLong(ice.getMaxIdle()); // could be negative so should not use unsigned longs
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Object k = input.readObject();
- Object v = input.readObject();
- long lastUsed = UnsignedNumeric.readUnsignedLong(input);
- Long maxIdle = input.readLong();
- return InternalEntryFactory.create(k, v, -1, -1, lastUsed, maxIdle);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheValueExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransientCacheValueExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,59 +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.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.container.entries.TransientCacheValue;
-import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.Externalizer;
-
-/**
- * TransientCacheValueExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link TransientCacheValue}
- */
- at Immutable
-public class TransientCacheValueExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- TransientCacheValue icv = (TransientCacheValue) subject;
- output.writeObject(icv.getValue());
- UnsignedNumeric.writeUnsignedLong(output, icv.getLastUsed());
- output.writeLong(icv.getMaxIdle()); // could be negative so should not use unsigned longs
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Object v = input.readObject();
- long lastUsed = UnsignedNumeric.readUnsignedLong(input);
- Long maxIdle = input.readLong();
- return InternalEntryFactory.createValue(v, -1, -1, lastUsed, maxIdle);
- }
-
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheEntryExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheEntryExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheEntryExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,64 +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.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.container.entries.TransientMortalCacheEntry;
-import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.Externalizer;
-
-/**
- * TransientMortalCacheEntryExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link TransientMortalCacheEntry}
- */
- at Immutable
-public class TransientMortalCacheEntryExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- TransientMortalCacheEntry ice = (TransientMortalCacheEntry) subject;
- output.writeObject(ice.getKey());
- output.writeObject(ice.getValue());
- UnsignedNumeric.writeUnsignedLong(output, ice.getCreated());
- output.writeLong(ice.getLifespan()); // could be negative so should not use unsigned longs
- UnsignedNumeric.writeUnsignedLong(output, ice.getLastUsed());
- output.writeLong(ice.getMaxIdle()); // could be negative so should not use unsigned longs
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Object k = input.readObject();
- Object v = input.readObject();
- long created = UnsignedNumeric.readUnsignedLong(input);
- Long lifespan = input.readLong();
- long lastUsed = UnsignedNumeric.readUnsignedLong(input);
- Long maxIdle = input.readLong();
- return InternalEntryFactory.create(k, v, created, lifespan, lastUsed, maxIdle);
- }
-}
Deleted: trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheValueExternalizer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheValueExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/core/src/main/java/org/infinispan/marshall/exts/TransientMortalCacheValueExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,62 +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.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import net.jcip.annotations.Immutable;
-
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.container.entries.TransientMortalCacheValue;
-import org.infinispan.io.UnsignedNumeric;
-import org.infinispan.marshall.Externalizer;
-
-/**
- * TransientMortalCacheValueExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within {@link TransientMortalCacheValue}
- */
- at Immutable
-public class TransientMortalCacheValueExternalizer implements Externalizer {
-
- public void writeObject(ObjectOutput output, Object subject) throws IOException {
- TransientMortalCacheValue icv = (TransientMortalCacheValue) subject;
- output.writeObject(icv.getValue());
- UnsignedNumeric.writeUnsignedLong(output, icv.getCreated());
- output.writeLong(icv.getLifespan()); // could be negative so should not use unsigned longs
- UnsignedNumeric.writeUnsignedLong(output, icv.getLastUsed());
- output.writeLong(icv.getMaxIdle()); // could be negative so should not use unsigned longs
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Object v = input.readObject();
- long created = UnsignedNumeric.readUnsignedLong(input);
- Long lifespan = input.readLong();
- long lastUsed = UnsignedNumeric.readUnsignedLong(input);
- Long maxIdle = input.readLong();
- return InternalEntryFactory.createValue(v, created, lifespan, lastUsed, maxIdle);
- }
-}
Deleted: trunk/tree/src/main/java/org/infinispan/tree/marshall/exts/NodeKeyExternalizer.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/marshall/exts/NodeKeyExternalizer.java 2009-08-21 15:00:17 UTC (rev 720)
+++ trunk/tree/src/main/java/org/infinispan/tree/marshall/exts/NodeKeyExternalizer.java 2009-08-21 15:07:56 UTC (rev 721)
@@ -1,75 +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.tree.marshall.exts;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import static org.infinispan.tree.NodeKey.Type.*;
-
-import org.infinispan.marshall.Externalizer;
-import org.infinispan.tree.Fqn;
-import org.infinispan.tree.NodeKey;
-
-/**
- * NodeKeyExternalizer.
- *
- * @author Galder Zamarreño
- * @since 4.0
- * @deprecated Externalizer implementation now within NodeKey
- */
- at Deprecated
-public class NodeKeyExternalizer implements Externalizer {
- private static final byte DATA_BYTE = 1;
- private static final byte STRUCTURE_BYTE = 2;
-
- public void writeObject(ObjectOutput output, Object object) throws IOException {
- NodeKey key = (NodeKey) object;
- output.writeObject(key.getFqn());
- byte type = 0;
- switch (key.getContents()) {
- case DATA:
- type = DATA_BYTE;
- break;
- case STRUCTURE:
- type = STRUCTURE_BYTE;
- break;
- }
- output.write(type);
- }
-
- public Object readObject(ObjectInput input) throws IOException, ClassNotFoundException {
- Fqn fqn = (Fqn) input.readObject();
- int typeb = input.readUnsignedByte();
- NodeKey.Type type = null;
- switch (typeb) {
- case DATA_BYTE:
- type = DATA;
- break;
- case STRUCTURE_BYTE:
- type = STRUCTURE;
- break;
- }
- return new NodeKey(fqn, type);
- }
-
-}
More information about the infinispan-commits
mailing list