You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by no...@apache.org on 2012/11/02 20:46:16 UTC
svn commit: r1405125 [1/2] - in
/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning:
./ base/ internal/ internal/generator/ internal/io/ internal/marshaller/ io/
Author: noctarius
Date: Fri Nov 2 19:46:14 2012
New Revision: 1405125
URL: http://svn.apache.org/viewvc?rev=1405125&view=rev
Log:
Started exchanging the old DataInput / DataOutput classes with Source / Target
Removed:
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/io/ReaderInputStream.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/io/WriterOutputStream.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/io/SerializerInputStream.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/io/SerializerOutputStream.java
Modified:
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Marshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Serializer.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Source.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Streamed.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Target.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractObjectMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/ObjenesisDelegatingMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializer.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/AbstractGeneratedMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanArrayMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteArrayMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterArrayMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleArrayMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/EnumMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ExternalizableMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatArrayMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerArrayMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/LongArrayMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SerializableMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ShortArrayMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/StreamedMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/StringMarshaller.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/io/ByteBufferSource.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/io/ByteBufferTarget.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/io/InputStreamSource.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/io/OutputStreamTarget.java
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Marshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Marshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Marshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Marshaller.java Fri Nov 2 19:46:14 2012
@@ -18,10 +18,9 @@
*/
package org.apache.directmemory.lightning;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
+import org.apache.directmemory.lightning.base.AbstractSerializerDefinition;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
/**
@@ -44,25 +43,24 @@ public interface Marshaller
*
* @param value Object instance to serialize
* @param propertyDescriptor The {@link PropertyDescriptor} of this object
- * @param dataOutput The {@link DataOutput} implementation to write to
+ * @param target The {@link Target} implementation to write to
* @param serializationContext The {@link SerializationContext} used to serialize this object graph
- * @throws IOException Throws {@link IOException} if any exception occurs while writing to the {@link DataOutput}
+ * @throws IOException Throws {@link IOException} if any exception occurs while writing to the {@link Target}
*/
- void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException;
/**
- * Unmarshalls (deserializes) an object from the given {@link DataInput}.
+ * Unmarshalls (deserializes) an object from the given {@link Source}.
*
* @param propertyDescriptor The {@link PropertyDescriptor} of this object
- * @param dataInput The {@link DataInput} implementation to read from
+ * @param source The {@link Source} implementation to read from
* @param serializationContext The {@link SerializationContext} used to deserialize this object graph
- * @return An object read from the given {@link DataInput}
- * @throws IOException Throws {@link IOException} if any exception occurs while reading from the {@link DataInput}
+ * @return An object read from the given {@link Source}
+ * @throws IOException Throws {@link IOException} if any exception occurs while reading from the {@link Source}
*/
- <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
- SerializationContext serializationContext )
+ <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source, SerializationContext serializationContext )
throws IOException;
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Serializer.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Serializer.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Serializer.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Serializer.java Fri Nov 2 19:46:14 2012
@@ -18,14 +18,6 @@
*/
package org.apache.directmemory.lightning;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.nio.ByteBuffer;
-
import org.apache.directmemory.lightning.metadata.ClassDefinitionContainer;
public interface Serializer
@@ -35,20 +27,8 @@ public interface Serializer
void setClassDefinitionContainer( ClassDefinitionContainer classDefinitionContainer );
- <V> void serialize( V value, DataOutput dataOutput );
-
- <V> void serialize( V value, OutputStream outputStream );
-
- <V> void serialize( V value, Writer writer );
-
- <V> void serialize( V value, ByteBuffer buffer );
-
- <V> V deserialize( DataInput dataInput );
-
- <V> V deserialize( InputStream inputStream );
-
- <V> V deserialize( Reader reader );
+ <V> void serialize( V value, Target target );
- <V> V deserialize( ByteBuffer buffer );
+ <V> V deserialize( Source source );
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Source.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Source.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Source.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Source.java Fri Nov 2 19:46:14 2012
@@ -28,6 +28,9 @@ public interface Source
long readableBytes();
+ boolean readBoolean()
+ throws IOException;
+
int readBytes( byte[] bytes )
throws IOException;
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Streamed.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Streamed.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Streamed.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Streamed.java Fri Nov 2 19:46:14 2012
@@ -18,17 +18,15 @@
*/
package org.apache.directmemory.lightning;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
public interface Streamed
{
- void writeTo( DataOutput dataOutput )
+ void writeTo( Target target )
throws IOException;
- void readFrom( DataInput dataInput )
+ void readFrom( Source source )
throws IOException;
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Target.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Target.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Target.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/Target.java Fri Nov 2 19:46:14 2012
@@ -28,6 +28,9 @@ public interface Target
long writtenBytes();
+ void writeBoolean( boolean value )
+ throws IOException;
+
void writeBytes( byte[] bytes )
throws IOException;
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,12 +18,12 @@
*/
package org.apache.directmemory.lightning.base;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.Marshaller;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
public abstract class AbstractMarshaller
@@ -31,24 +31,24 @@ public abstract class AbstractMarshaller
{
@Override
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
return null;
}
- protected boolean writePossibleNull( Object value, DataOutput dataOutput )
+ protected boolean writePossibleNull( Object value, Target target )
throws IOException
{
- dataOutput.writeByte( value == null ? 1 : 0 );
+ target.writeByte( (byte) ( value == null ? 1 : 0 ) );
return value != null;
}
- protected boolean isNull( DataInput dataInput )
+ protected boolean isNull( Source source )
throws IOException
{
- byte isNull = dataInput.readByte();
+ byte isNull = source.readByte();
return isNull == 1 ? true : false;
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractObjectMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractObjectMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractObjectMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/AbstractObjectMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,10 +18,10 @@
*/
package org.apache.directmemory.lightning.base;
-import java.io.DataInput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
public abstract class AbstractObjectMarshaller
@@ -30,16 +30,16 @@ public abstract class AbstractObjectMars
@Override
@SuppressWarnings( "unchecked" )
- public final <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public final <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
Object value =
serializationContext.getObjectInstantiatorFactory().getInstantiatorOf( propertyDescriptor.getType() );
- return unmarshall( (V) value, propertyDescriptor, dataInput, serializationContext );
+ return unmarshall( (V) value, propertyDescriptor, source, serializationContext );
}
- public abstract <V> V unmarshall( V value, PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public abstract <V> V unmarshall( V value, PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException;
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/ObjenesisDelegatingMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/ObjenesisDelegatingMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/ObjenesisDelegatingMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/base/ObjenesisDelegatingMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,12 +18,12 @@
*/
package org.apache.directmemory.lightning.base;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.Marshaller;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.instantiator.ObjectInstantiatorFactory;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -49,22 +49,22 @@ class ObjenesisDelegatingMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- delegatedMarshaller.marshall( value, propertyDescriptor, dataOutput, serializationContext );
+ delegatedMarshaller.marshall( value, propertyDescriptor, target, serializationContext );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
V value = (V) objectInstantiatorFactory.newInstance( propertyDescriptor.getType() );
- return delegatedMarshaller.unmarshall( value, propertyDescriptor, dataInput, serializationContext );
+ return delegatedMarshaller.unmarshall( value, propertyDescriptor, source, serializationContext );
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializer.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializer.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializer.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializer.java Fri Nov 2 19:46:14 2012
@@ -18,17 +18,8 @@
*/
package org.apache.directmemory.lightning.internal;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
@@ -39,15 +30,13 @@ import org.apache.directmemory.lightning
import org.apache.directmemory.lightning.MarshallerStrategy;
import org.apache.directmemory.lightning.SerializationContext;
import org.apache.directmemory.lightning.SerializationStrategy;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.exceptions.ClassDefinitionInconsistentException;
import org.apache.directmemory.lightning.exceptions.SerializerExecutionException;
import org.apache.directmemory.lightning.instantiator.ObjectInstantiatorFactory;
import org.apache.directmemory.lightning.internal.generator.BytecodeMarshallerGenerator;
import org.apache.directmemory.lightning.internal.generator.MarshallerGenerator;
-import org.apache.directmemory.lightning.internal.io.BufferInputStream;
-import org.apache.directmemory.lightning.internal.io.BufferOutputStream;
-import org.apache.directmemory.lightning.internal.io.ReaderInputStream;
-import org.apache.directmemory.lightning.internal.io.WriterOutputStream;
import org.apache.directmemory.lightning.logging.Logger;
import org.apache.directmemory.lightning.metadata.ClassDefinition;
import org.apache.directmemory.lightning.metadata.ClassDefinitionContainer;
@@ -130,7 +119,7 @@ class InternalSerializer
}
@Override
- public <V> void serialize( V value, DataOutput dataOutput )
+ public <V> void serialize( V value, Target target )
{
try
{
@@ -144,8 +133,8 @@ class InternalSerializer
Marshaller marshaller = classDescriptor.getMarshaller();
PropertyDescriptor pd = new CheatPropertyDescriptor( "serialize", classDescriptor.getType(), marshaller );
- dataOutput.writeLong( classDescriptor.getClassDefinition().getId() );
- marshaller.marshall( value, pd, dataOutput, serializationContext );
+ target.writeLong( classDescriptor.getClassDefinition().getId() );
+ marshaller.marshall( value, pd, target, serializationContext );
}
catch ( IOException e )
{
@@ -154,29 +143,8 @@ class InternalSerializer
}
@Override
- public <V> void serialize( V value, OutputStream outputStream )
- {
- if ( outputStream instanceof DataOutput )
- serialize( value, (DataOutput) outputStream );
- else
- serialize( value, (DataOutput) new DataOutputStream( outputStream ) );
- }
-
- @Override
- public <V> void serialize( V value, Writer writer )
- {
- serialize( value, (DataOutput) new DataOutputStream( new WriterOutputStream( writer, "UTF-8" ) ) );
- }
-
- @Override
- public <V> void serialize( V value, ByteBuffer buffer )
- {
- serialize( value, (DataOutput) new DataOutputStream( new BufferOutputStream( buffer ) ) );
- }
-
- @Override
@SuppressWarnings( "unchecked" )
- public <V> V deserialize( DataInput dataInput )
+ public <V> V deserialize( Source source )
{
try
{
@@ -185,13 +153,13 @@ class InternalSerializer
marshallerStrategy, objectInstantiatorFactory,
valueNullableEvaluator, definedMarshallers );
- long typeId = dataInput.readLong();
+ long typeId = source.readLong();
Class<?> clazz = classDefinitionContainer.get().getTypeById( typeId );
ClassDescriptor classDescriptor = findClassDescriptor( clazz );
Marshaller marshaller = classDescriptor.getMarshaller();
PropertyDescriptor pd = new CheatPropertyDescriptor( "serialize", classDescriptor.getType(), marshaller );
- return (V) marshaller.unmarshall( pd, dataInput, serializationContext );
+ return (V) marshaller.unmarshall( pd, source, serializationContext );
}
catch ( IOException e )
{
@@ -200,29 +168,6 @@ class InternalSerializer
}
@Override
- public <V> V deserialize( InputStream inputStream )
- {
- if ( inputStream instanceof DataInput )
- {
- return deserialize( (DataInput) inputStream );
- }
-
- return deserialize( (DataInput) new DataInputStream( inputStream ) );
- }
-
- @Override
- public <V> V deserialize( Reader reader )
- {
- return deserialize( (DataInput) new DataInputStream( new ReaderInputStream( reader, "UTF-8" ) ) );
- }
-
- @Override
- public <V> V deserialize( ByteBuffer buffer )
- {
- return deserialize( (DataInput) new DataInputStream( new BufferInputStream( buffer ) ) );
- }
-
- @Override
public ClassDescriptor findClassDescriptor( Class<?> type )
{
return classDescriptors.get( type );
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/AbstractGeneratedMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/AbstractGeneratedMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/AbstractGeneratedMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/AbstractGeneratedMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,7 +18,6 @@
*/
package org.apache.directmemory.lightning.internal.generator;
-import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.Collections;
@@ -28,6 +27,8 @@ import java.util.Map;
import org.apache.directmemory.lightning.Marshaller;
import org.apache.directmemory.lightning.SerializationContext;
import org.apache.directmemory.lightning.SerializationStrategy;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.exceptions.SerializerDefinitionException;
import org.apache.directmemory.lightning.instantiator.ObjectInstantiator;
import org.apache.directmemory.lightning.instantiator.ObjectInstantiatorFactory;
@@ -71,7 +72,7 @@ public abstract class AbstractGeneratedM
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
@@ -79,7 +80,7 @@ public abstract class AbstractGeneratedM
{
if ( ClassUtil.isReferenceCapable( propertyDescriptor.getType() ) )
{
- long referenceId = dataInput.readLong();
+ long referenceId = source.readLong();
V instance;
if ( containsReferenceId( referenceId, serializationContext ) )
{
@@ -88,7 +89,7 @@ public abstract class AbstractGeneratedM
else
{
// Instance not yet received, for first time deserialize it
- instance = unmarshall( (V) newInstance(), propertyDescriptor, dataInput, serializationContext );
+ instance = unmarshall( (V) newInstance(), propertyDescriptor, source, serializationContext );
cacheObjectForUnmarshall( referenceId, instance, serializationContext );
}
@@ -102,10 +103,10 @@ public abstract class AbstractGeneratedM
value = (V) newInstance();
}
- return unmarshall( value, propertyDescriptor, dataInput, serializationContext );
+ return unmarshall( value, propertyDescriptor, source, serializationContext );
}
- protected abstract <V> V unmarshall( V value, PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ protected abstract <V> V unmarshall( V value, PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException;
@@ -226,7 +227,7 @@ public abstract class AbstractGeneratedM
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
@@ -242,11 +243,11 @@ public abstract class AbstractGeneratedM
throw new SerializerDefinitionException( "No marshaller for property " + marshalledProperty + " found" );
}
- marshaller.marshall( value, propertyDescriptor, dataOutput, serializationContext );
+ marshaller.marshall( value, propertyDescriptor, target, serializationContext );
}
@Override
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
@@ -261,7 +262,7 @@ public abstract class AbstractGeneratedM
throw new SerializerDefinitionException( "No marshaller for property " + marshalledProperty + " found" );
}
- return marshaller.unmarshall( propertyDescriptor, dataInput, serializationContext );
+ return marshaller.unmarshall( propertyDescriptor, source, serializationContext );
}
private synchronized Marshaller getMarshaller()
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigDecimalMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,13 +18,13 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import java.math.BigDecimal;
import java.nio.charset.Charset;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -41,36 +41,36 @@ public class BigDecimalMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
String representation = ( (BigDecimal) value ).toString();
byte[] data = representation.getBytes( CHARSET );
- dataOutput.writeInt( data.length );
- dataOutput.write( data );
+ target.writeInt( data.length );
+ target.writeBytes( data );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- int length = dataInput.readInt();
+ int length = source.readInt();
byte[] data = new byte[length];
- dataInput.readFully( data );
+ source.readBytes( data );
return (V) new BigDecimal( new String( data, CHARSET ) );
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BigIntegerMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,12 +18,12 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import java.math.BigInteger;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -38,35 +38,35 @@ public class BigIntegerMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
byte[] data = ( (BigInteger) value ).toByteArray();
- dataOutput.writeInt( data.length );
- dataOutput.write( data );
+ target.writeInt( data.length );
+ target.writeBytes( data );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- int length = dataInput.readInt();
+ int length = source.readInt();
byte[] data = new byte[length];
- dataInput.readFully( data );
+ source.readBytes( data );
return (V) new BigInteger( data );
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanArrayMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanArrayMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanArrayMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanArrayMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,12 +37,12 @@ public class BooleanArrayMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
@@ -50,43 +50,43 @@ public class BooleanArrayMarshaller
if ( boolean[].class == propertyDescriptor.getType() )
{
boolean[] array = (boolean[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( boolean arrayValue : array )
{
- dataOutput.writeBoolean( arrayValue );
+ target.writeBoolean( arrayValue );
}
}
else
{
Boolean[] array = (Boolean[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( boolean arrayValue : array )
{
- dataOutput.writeBoolean( arrayValue );
+ target.writeBoolean( arrayValue );
}
}
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- int size = dataInput.readInt();
+ int size = source.readInt();
if ( boolean[].class == propertyDescriptor.getType() )
{
boolean[] array = new boolean[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readBoolean();
+ array[i] = source.readBoolean();
}
return (V) array;
@@ -96,7 +96,7 @@ public class BooleanArrayMarshaller
Boolean[] array = new Boolean[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readBoolean();
+ array[i] = source.readBoolean();
}
return (V) array;
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/BooleanMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,36 +37,36 @@ public class BooleanMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
if ( Boolean.class == propertyDescriptor.getType() )
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
}
- dataOutput.writeBoolean( (Boolean) value );
+ target.writeBoolean( (Boolean) value );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
if ( Boolean.class == propertyDescriptor.getType() )
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
}
- return (V) Boolean.valueOf( dataInput.readBoolean() );
+ return (V) Boolean.valueOf( source.readBoolean() );
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteArrayMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteArrayMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteArrayMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteArrayMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,12 +37,12 @@ public class ByteArrayMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
@@ -50,43 +50,43 @@ public class ByteArrayMarshaller
if ( byte[].class == propertyDescriptor.getType() )
{
byte[] array = (byte[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( byte arrayValue : array )
{
- dataOutput.writeByte( arrayValue );
+ target.writeByte( arrayValue );
}
}
else
{
Byte[] array = (Byte[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( byte arrayValue : array )
{
- dataOutput.writeByte( arrayValue );
+ target.writeByte( arrayValue );
}
}
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- int size = dataInput.readInt();
+ int size = source.readInt();
if ( byte[].class == propertyDescriptor.getType() )
{
byte[] array = new byte[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readByte();
+ array[i] = source.readByte();
}
return (V) array;
@@ -96,7 +96,7 @@ public class ByteArrayMarshaller
Byte[] array = new Byte[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readByte();
+ array[i] = source.readByte();
}
return (V) array;
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ByteMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,36 +37,36 @@ public class ByteMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
if ( Byte.class == propertyDescriptor.getType() )
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
}
- dataOutput.writeByte( (Byte) value );
+ target.writeByte( (Byte) value );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
if ( Byte.class == propertyDescriptor.getType() )
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
}
- return (V) Byte.valueOf( dataInput.readByte() );
+ return (V) Byte.valueOf( source.readByte() );
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterArrayMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterArrayMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterArrayMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterArrayMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,12 +37,12 @@ public class CharacterArrayMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
@@ -50,43 +50,43 @@ public class CharacterArrayMarshaller
if ( char[].class == propertyDescriptor.getType() )
{
char[] array = (char[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( char arrayValue : array )
{
- dataOutput.writeChar( arrayValue );
+ target.writeChar( arrayValue );
}
}
else
{
Character[] array = (Character[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( char arrayValue : array )
{
- dataOutput.writeChar( arrayValue );
+ target.writeChar( arrayValue );
}
}
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- int size = dataInput.readInt();
+ int size = source.readInt();
if ( char[].class == propertyDescriptor.getType() )
{
char[] array = new char[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readChar();
+ array[i] = source.readChar();
}
return (V) array;
@@ -96,7 +96,7 @@ public class CharacterArrayMarshaller
Character[] array = new Character[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readChar();
+ array[i] = source.readChar();
}
return (V) array;
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/CharacterMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,36 +37,36 @@ public class CharacterMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
if ( Character.class == propertyDescriptor.getType() )
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
}
- dataOutput.writeChar( (Character) value );
+ target.writeChar( (Character) value );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
if ( Character.class == propertyDescriptor.getType() )
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
}
- return (V) Character.valueOf( dataInput.readChar() );
+ return (V) Character.valueOf( source.readChar() );
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleArrayMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleArrayMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleArrayMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleArrayMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,12 +37,12 @@ public class DoubleArrayMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
@@ -50,43 +50,43 @@ public class DoubleArrayMarshaller
if ( double[].class == propertyDescriptor.getType() )
{
double[] array = (double[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( double arrayValue : array )
{
- dataOutput.writeDouble( arrayValue );
+ target.writeDouble( arrayValue );
}
}
else
{
Double[] array = (Double[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( double arrayValue : array )
{
- dataOutput.writeDouble( arrayValue );
+ target.writeDouble( arrayValue );
}
}
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- int size = dataInput.readInt();
+ int size = source.readInt();
if ( double[].class == propertyDescriptor.getType() )
{
double[] array = new double[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readDouble();
+ array[i] = source.readDouble();
}
return (V) array;
@@ -96,7 +96,7 @@ public class DoubleArrayMarshaller
Double[] array = new Double[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readDouble();
+ array[i] = source.readDouble();
}
return (V) array;
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/DoubleMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,36 +37,36 @@ public class DoubleMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
if ( Double.class == propertyDescriptor.getType() )
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
}
- dataOutput.writeDouble( (Double) value );
+ target.writeDouble( (Double) value );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
if ( Double.class == propertyDescriptor.getType() )
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
}
- return (V) Double.valueOf( dataInput.readDouble() );
+ return (V) Double.valueOf( source.readDouble() );
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/EnumMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/EnumMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/EnumMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/EnumMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,35 +37,35 @@ public class EnumMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
- dataOutput.writeLong( serializationContext.getClassDefinitionContainer().getClassDefinitionByType( propertyDescriptor.getType() ).getId() );
- dataOutput.writeInt( ( (Enum<?>) value ).ordinal() );
+ target.writeLong( serializationContext.getClassDefinitionContainer().getClassDefinitionByType( propertyDescriptor.getType() ).getId() );
+ target.writeInt( ( (Enum<?>) value ).ordinal() );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- long typeId = dataInput.readLong();
+ long typeId = source.readLong();
Class<?> propertyType = serializationContext.getClassDefinitionContainer().getTypeById( typeId );
- int ordinal = dataInput.readInt();
+ int ordinal = source.readInt();
Enum<?>[] values = ( (Class<Enum<?>>) propertyType ).getEnumConstants();
for ( Enum<?> value : values )
{
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ExternalizableMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ExternalizableMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ExternalizableMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ExternalizableMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,14 +18,16 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.Externalizable;
import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractObjectMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -40,22 +42,31 @@ public class ExternalizableMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
-
- ( (Externalizable) value ).writeExternal( (ObjectOutput) dataOutput );
+ ByteArrayOutputStream stream = new ByteArrayOutputStream( 1024 );
+ ObjectOutputStream oos = new ObjectOutputStream( stream );
+ ( (Externalizable) value ).writeExternal( oos );
+ byte[] data = stream.toByteArray();
+ target.writeInt( data.length );
+ target.writeBytes( data );
}
@Override
- public <V> V unmarshall( V value, PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( V value, PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
try
{
- ( (Externalizable) value ).readExternal( (ObjectInput) dataInput );
+ int length = source.readInt();
+ byte[] data = new byte[length];
+ source.readBytes( data );
+ ByteArrayInputStream stream = new ByteArrayInputStream( data );
+ ObjectInputStream ois = new ObjectInputStream( stream );
+ ( (Externalizable) value ).readExternal( ois );
return value;
}
catch ( ClassNotFoundException e )
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatArrayMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatArrayMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatArrayMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatArrayMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,12 +37,12 @@ public class FloatArrayMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
@@ -50,43 +50,43 @@ public class FloatArrayMarshaller
if ( float[].class == propertyDescriptor.getType() )
{
float[] array = (float[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( float arrayValue : array )
{
- dataOutput.writeFloat( arrayValue );
+ target.writeFloat( arrayValue );
}
}
else
{
Float[] array = (Float[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( float arrayValue : array )
{
- dataOutput.writeFloat( arrayValue );
+ target.writeFloat( arrayValue );
}
}
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- int size = dataInput.readInt();
+ int size = source.readInt();
if ( float[].class == propertyDescriptor.getType() )
{
float[] array = new float[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readFloat();
+ array[i] = source.readFloat();
}
return (V) array;
@@ -96,7 +96,7 @@ public class FloatArrayMarshaller
Float[] array = new Float[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readFloat();
+ array[i] = source.readFloat();
}
return (V) array;
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/FloatMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,36 +37,36 @@ public class FloatMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
if ( Float.class == propertyDescriptor.getType() )
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
}
- dataOutput.writeFloat( (Float) value );
+ target.writeFloat( (Float) value );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
if ( Float.class == propertyDescriptor.getType() )
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
}
- return (V) Float.valueOf( dataInput.readFloat() );
+ return (V) Float.valueOf( source.readFloat() );
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerArrayMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerArrayMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerArrayMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerArrayMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,12 +37,12 @@ public class IntegerArrayMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
@@ -50,43 +50,43 @@ public class IntegerArrayMarshaller
if ( int[].class == propertyDescriptor.getType() )
{
int[] array = (int[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( int arrayValue : array )
{
- dataOutput.writeInt( arrayValue );
+ target.writeInt( arrayValue );
}
}
else
{
Integer[] array = (Integer[]) value;
- dataOutput.writeInt( array.length );
+ target.writeInt( array.length );
for ( int arrayValue : array )
{
- dataOutput.writeInt( arrayValue );
+ target.writeInt( arrayValue );
}
}
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- int size = dataInput.readInt();
+ int size = source.readInt();
if ( int[].class == propertyDescriptor.getType() )
{
int[] array = new int[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readInt();
+ array[i] = source.readInt();
}
return (V) array;
@@ -96,7 +96,7 @@ public class IntegerArrayMarshaller
Integer[] array = new Integer[size];
for ( int i = 0; i < size; i++ )
{
- array[i] = dataInput.readInt();
+ array[i] = source.readInt();
}
return (V) array;
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/IntegerMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,11 +18,11 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -37,36 +37,36 @@ public class IntegerMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
if ( Integer.class == propertyDescriptor.getType() )
{
- if ( !writePossibleNull( value, dataOutput ) )
+ if ( !writePossibleNull( value, target ) )
{
return;
}
}
- dataOutput.writeInt( (Integer) value );
+ target.writeInt( (Integer) value );
}
@Override
@SuppressWarnings( "unchecked" )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
if ( Integer.class == propertyDescriptor.getType() )
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
}
- return (V) Integer.valueOf( dataInput.readInt() );
+ return (V) Integer.valueOf( source.readInt() );
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java?rev=1405125&r1=1405124&r2=1405125&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshaller.java Fri Nov 2 19:46:14 2012
@@ -18,8 +18,6 @@
*/
package org.apache.directmemory.lightning.internal.marshaller;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -28,6 +26,8 @@ import java.util.List;
import org.apache.directmemory.lightning.Marshaller;
import org.apache.directmemory.lightning.SerializationContext;
+import org.apache.directmemory.lightning.Source;
+import org.apache.directmemory.lightning.Target;
import org.apache.directmemory.lightning.TypeBindableMarshaller;
import org.apache.directmemory.lightning.base.AbstractMarshaller;
import org.apache.directmemory.lightning.exceptions.SerializerExecutionException;
@@ -62,15 +62,15 @@ public class ListMarshaller
}
@Override
- public void marshall( Object value, PropertyDescriptor propertyDescriptor, DataOutput dataOutput,
+ public void marshall( Object value, PropertyDescriptor propertyDescriptor, Target target,
SerializationContext serializationContext )
throws IOException
{
- if ( writePossibleNull( value, dataOutput ) )
+ if ( writePossibleNull( value, target ) )
{
List<?> list = (List<?>) value;
- dataOutput.writeInt( list.size() );
+ target.writeInt( list.size() );
Marshaller marshaller = null;
ClassDefinition classDefinition = null;
@@ -87,7 +87,7 @@ public class ListMarshaller
for ( Object entry : list )
{
- if ( writePossibleNull( entry, dataOutput ) )
+ if ( writePossibleNull( entry, target ) )
{
if ( listType == null )
{
@@ -104,8 +104,8 @@ public class ListMarshaller
throw new SerializerExecutionException( "No ClassDefinition found for type " + entry.getClass() );
}
- dataOutput.writeLong( classDefinition.getId() );
- marshaller.marshall( entry, pd, dataOutput, serializationContext );
+ target.writeLong( classDefinition.getId() );
+ marshaller.marshall( entry, pd, target, serializationContext );
}
}
}
@@ -113,28 +113,28 @@ public class ListMarshaller
@Override
@SuppressWarnings( { "rawtypes", "unchecked" } )
- public <V> V unmarshall( PropertyDescriptor propertyDescriptor, DataInput dataInput,
+ public <V> V unmarshall( PropertyDescriptor propertyDescriptor, Source source,
SerializationContext serializationContext )
throws IOException
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
return null;
}
- int size = dataInput.readInt();
+ int size = source.readInt();
List list = new ArrayList( size );
if ( size > 0 )
{
for ( int i = 0; i < size; i++ )
{
- if ( isNull( dataInput ) )
+ if ( isNull( source ) )
{
list.add( null );
}
else
{
- long classId = dataInput.readLong();
+ long classId = source.readLong();
ClassDefinition classDefinition =
serializationContext.getClassDefinitionContainer().getClassDefinitionById( classId );
@@ -152,7 +152,7 @@ public class ListMarshaller
PropertyDescriptor pd =
new CheatPropertyDescriptor( propertyDescriptor.getPropertyName() + "List",
classDefinition.getType(), marshaller );
- list.add( marshaller.unmarshall( pd, dataInput, serializationContext ) );
+ list.add( marshaller.unmarshall( pd, source, serializationContext ) );
}
}
}