diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java b/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java index ee3ebab3ba..e5ff5202ff 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java @@ -17,7 +17,9 @@ */ package org.apache.activemq.openwire; +import java.io.DataInput; import java.io.DataInputStream; +import java.io.DataOutput; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; @@ -61,7 +63,7 @@ final public class BooleanStream { } } - public void marshal(DataOutputStream dataOut) throws IOException { + public void marshal(DataOutput dataOut) throws IOException { if( arrayLimit < 64 ) { dataOut.writeByte(arrayLimit); } else if( arrayLimit < 256 ) { // max value of unsigned byte @@ -91,7 +93,7 @@ final public class BooleanStream { } - public void unmarshal(DataInputStream dataIn) throws IOException { + public void unmarshal(DataInput dataIn) throws IOException { arrayLimit = (short) (dataIn.readByte() & 0xFF); if ( arrayLimit == 0xC0 ) { diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java index 08fba2f945..8b2ce3b364 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java @@ -17,7 +17,9 @@ */ package org.apache.activemq.openwire; +import java.io.DataInput; import java.io.DataInputStream; +import java.io.DataOutput; import java.io.DataOutputStream; import java.io.IOException; @@ -29,10 +31,10 @@ public interface DataStreamMarshaller { DataStructure createObject(); int tightMarshal1(OpenWireFormat format, Object c, BooleanStream bs) throws IOException; - void tightMarshal2(OpenWireFormat format, Object c, DataOutputStream ds, BooleanStream bs) throws IOException; - void tightUnmarshal(OpenWireFormat format, Object data, DataInputStream dis, BooleanStream bs) throws IOException; + void tightMarshal2(OpenWireFormat format, Object c, DataOutput ds, BooleanStream bs) throws IOException; + void tightUnmarshal(OpenWireFormat format, Object data, DataInput dis, BooleanStream bs) throws IOException; - void looseMarshal(OpenWireFormat format, Object c, DataOutputStream ds) throws IOException; - void looseUnmarshal(OpenWireFormat format, Object data, DataInputStream dis) throws IOException; + void looseMarshal(OpenWireFormat format, Object c, DataOutput ds) throws IOException; + void looseUnmarshal(OpenWireFormat format, Object data, DataInput dis) throws IOException; } diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java index 4366668613..890d4bb6d2 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java @@ -17,8 +17,8 @@ */ package org.apache.activemq.openwire; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import java.lang.reflect.Method; import java.util.HashMap; @@ -27,11 +27,11 @@ import org.apache.activemq.command.CommandTypes; import org.apache.activemq.command.DataStructure; import org.apache.activemq.command.MarshallAware; import org.apache.activemq.command.WireFormatInfo; -import org.apache.activemq.util.ByteArrayInputStream; -import org.apache.activemq.util.ByteArrayOutputStream; import org.apache.activemq.util.ByteSequence; import org.apache.activemq.util.ByteSequenceData; import org.apache.activemq.util.ClassLoading; +import org.apache.activemq.util.DataByteArrayInputStream; +import org.apache.activemq.util.DataByteArrayOutputStream; import org.apache.activemq.util.IdGenerator; import org.apache.activemq.wireformat.WireFormat; @@ -59,11 +59,12 @@ final public class OpenWireFormat implements WireFormat { private HashMap marshallCacheMap = new HashMap(); private DataStructure marshallCache[] = new DataStructure[MARSHAL_CACHE_SIZE]; private DataStructure unmarshallCache[] = new DataStructure[MARSHAL_CACHE_SIZE]; - + private DataByteArrayOutputStream bytesOut = new DataByteArrayOutputStream(); + private DataByteArrayInputStream bytesIn = new DataByteArrayInputStream(); private WireFormatInfo preferedWireFormatInfo; public OpenWireFormat() { - this(1); + this(2); } public OpenWireFormat(int i) { @@ -148,28 +149,23 @@ final public class OpenWireFormat implements WireFormat { size += dsm.tightMarshal1(this, c, bs); size += bs.marshalledSize(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(size); - DataOutputStream ds = new DataOutputStream(baos); + bytesOut.restart(size); if( !sizePrefixDisabled ) { - ds.writeInt(size); + bytesOut.writeInt(size); } - ds.writeByte(type); - bs.marshal(ds); - dsm.tightMarshal2(this, c, ds, bs); - ds.close(); - sequence = baos.toByteSequence(); + bytesOut.writeByte(type); + bs.marshal(bytesOut); + dsm.tightMarshal2(this, c, bytesOut, bs); + sequence = bytesOut.toByteSequence(); } else { - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - DataOutputStream ds = new DataOutputStream(baos); + bytesOut.restart(); if( !sizePrefixDisabled ) { - ds.writeInt(0); // we don't know the final size yet but write this here for now. + bytesOut.writeInt(0); // we don't know the final size yet but write this here for now. } - ds.writeByte(type); - dsm.looseMarshal(this, c, ds); - ds.close(); - sequence = baos.toByteSequence(); + bytesOut.writeByte(type); + dsm.looseMarshal(this, c, bytesOut); + sequence = bytesOut.toByteSequence(); if( !sizePrefixDisabled ) { size = sequence.getLength()-4; @@ -181,13 +177,10 @@ final public class OpenWireFormat implements WireFormat { } else { - - ByteArrayOutputStream baos = new ByteArrayOutputStream(5); - DataOutputStream daos = new DataOutputStream(baos); - daos.writeInt(size); - daos.writeByte(NULL_TYPE); - daos.close(); - sequence = baos.toByteSequence(); + bytesOut.restart(5); + bytesOut.writeInt(size); + bytesOut.writeByte(NULL_TYPE); + sequence = bytesOut.toByteSequence(); } if( ma!=null ) { @@ -198,23 +191,24 @@ final public class OpenWireFormat implements WireFormat { } public Object unmarshal(ByteSequence sequence) throws IOException { - DataInputStream dis = new DataInputStream(new ByteArrayInputStream(sequence)); + bytesIn.restart(sequence); + //DataInputStream dis = new DataInputStream(new ByteArrayInputStream(sequence)); if( !sizePrefixDisabled ) { - int size = dis.readInt(); + int size = bytesIn.readInt(); if( sequence.getLength()-4 != size ) { // throw new IOException("Packet size does not match marshaled size"); } } - Object command = doUnmarshal(dis); + Object command = doUnmarshal(bytesIn); if( !cacheEnabled && ((DataStructure)command).isMarshallAware() ) { ((MarshallAware) command).setCachedMarshalledForm(this, sequence); } return command; } - public void marshal(Object o, DataOutputStream dataOut) throws IOException { + public void marshal(Object o, DataOutput dataOut) throws IOException { if( cacheEnabled ) { runMarshallCacheEvictionSweep(); @@ -243,20 +237,18 @@ final public class OpenWireFormat implements WireFormat { dsm.tightMarshal2(this, c, dataOut, bs); } else { - DataOutputStream looseOut = dataOut; - ByteArrayOutputStream baos=null; - + DataOutput looseOut = dataOut; + if( !sizePrefixDisabled ) { - baos = new ByteArrayOutputStream(); - looseOut = new DataOutputStream(baos); + bytesOut.restart(); + looseOut = bytesOut; } looseOut.writeByte(type); dsm.looseMarshal(this, c, looseOut); if( !sizePrefixDisabled ) { - looseOut.close(); - ByteSequence sequence = baos.toByteSequence(); + ByteSequence sequence = bytesOut.toByteSequence(); dataOut.writeInt(sequence.getLength()); dataOut.write(sequence.getData(), sequence.getOffset(), sequence.getLength()); } @@ -269,11 +261,16 @@ final public class OpenWireFormat implements WireFormat { } } - public Object unmarshal(DataInputStream dis) throws IOException { + public Object unmarshal(DataInput dis) throws IOException { + DataInput dataIn = dis; if( !sizePrefixDisabled ) { - dis.readInt(); + int size = dis.readInt(); + //byte[] data = new byte[size]; + //dis.readFully(data); + //bytesIn.restart(data); + //dataIn = bytesIn; } - return doUnmarshal(dis); + return doUnmarshal(dataIn); } /** @@ -297,7 +294,7 @@ final public class OpenWireFormat implements WireFormat { /** * Used by NIO or AIO transports; note that the size is not written as part of this method. */ - public void tightMarshal2(Object o, DataOutputStream ds, BooleanStream bs) throws IOException { + public void tightMarshal2(Object o, DataOutput ds, BooleanStream bs) throws IOException { if( cacheEnabled ) { runMarshallCacheEvictionSweep(); } @@ -337,7 +334,7 @@ final public class OpenWireFormat implements WireFormat { this.version = version; } - public Object doUnmarshal(DataInputStream dis) throws IOException { + public Object doUnmarshal(DataInput dis) throws IOException { byte dataType = dis.readByte(); if( dataType!=NULL_TYPE ) { DataStreamMarshaller dsm = (DataStreamMarshaller) dataMarshallers[dataType & 0xFF]; @@ -382,7 +379,7 @@ final public class OpenWireFormat implements WireFormat { return 1 + dsm.tightMarshal1(this, o, bs); } - public void tightMarshalNestedObject2(DataStructure o, DataOutputStream ds, BooleanStream bs) throws IOException { + public void tightMarshalNestedObject2(DataStructure o, DataOutput ds, BooleanStream bs) throws IOException { if( !bs.readBoolean() ) return; @@ -405,7 +402,7 @@ final public class OpenWireFormat implements WireFormat { } } - public DataStructure tightUnmarshalNestedObject(DataInputStream dis, BooleanStream bs) throws IOException { + public DataStructure tightUnmarshalNestedObject(DataInput dis, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { byte dataType = dis.readByte(); @@ -437,7 +434,7 @@ final public class OpenWireFormat implements WireFormat { } } - public DataStructure looseUnmarshalNestedObject(DataInputStream dis) throws IOException { + public DataStructure looseUnmarshalNestedObject(DataInput dis) throws IOException { if( dis.readBoolean() ) { byte dataType = dis.readByte(); @@ -453,7 +450,7 @@ final public class OpenWireFormat implements WireFormat { } } - public void looseMarshalNestedObject(DataStructure o, DataOutputStream dataOut) throws IOException { + public void looseMarshalNestedObject(DataStructure o, DataOutput dataOut) throws IOException { dataOut.writeBoolean(o!=null); if( o!=null ) { byte type = o.getDataStructureType(); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java index 3daa0b8ac0..f9be711665 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java index 78160453f1..fc3d53ccf4 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarsha * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ActiveMQDestination info = (ActiveMQDestination)o; @@ -76,7 +76,7 @@ public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarsha * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ActiveMQDestination info = (ActiveMQDestination)o; @@ -91,7 +91,7 @@ public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarsha * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ActiveMQDestination info = (ActiveMQDestination)o; @@ -103,7 +103,7 @@ public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarsha /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ActiveMQDestination info = (ActiveMQDestination)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java index d1e140e6fe..30792da492 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java index 7a179ccfb1..20d1188a30 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQMessageMarshaller extends MessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQMessageMarshaller extends MessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQMessageMarshaller extends MessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQMessageMarshaller extends MessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java index f43e4c2fd9..ddf792e4f8 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java index a7da25efa8..3eb5307ee3 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java index 891695845e..d72686d4f7 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java index fbc4a8d8a9..ad6603a734 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinat * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -70,7 +70,7 @@ public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinat * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -82,7 +82,7 @@ public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinat * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -91,7 +91,7 @@ public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinat /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java index 4ff2dc1f18..381c8d9a5f 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshall * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshall * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshall * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshall /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java index 56a286a41d..3560c5b211 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshall * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshall * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshall * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshall /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java index 557ef1f0bf..9dc275a906 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQTextMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQTextMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQTextMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQTextMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java index 6050db240d..c79c517bf3 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQTopicMarshaller extends ActiveMQDestinationMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQTopicMarshaller extends ActiveMQDestinationMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQTopicMarshaller extends ActiveMQDestinationMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQTopicMarshaller extends ActiveMQDestinationMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java index 1feb97d34d..41a27d590d 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class BaseCommandMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); BaseCommand info = (BaseCommand)o; @@ -77,7 +77,7 @@ public abstract class BaseCommandMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); BaseCommand info = (BaseCommand)o; @@ -93,7 +93,7 @@ public abstract class BaseCommandMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); BaseCommand info = (BaseCommand)o; @@ -106,7 +106,7 @@ public abstract class BaseCommandMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { BaseCommand info = (BaseCommand)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java index 170db26698..97f4c6f580 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java @@ -17,8 +17,8 @@ */ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import java.lang.reflect.Constructor; @@ -49,9 +49,9 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException { return 0; } - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { } - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { } public int tightMarshalLong1(OpenWireFormat wireFormat, long o, BooleanStream bs) throws IOException { @@ -73,7 +73,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return 8; } } - public void tightMarshalLong2(OpenWireFormat wireFormat, long o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshalLong2(OpenWireFormat wireFormat, long o, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { if( bs.readBoolean() ) { dataOut.writeLong(o); @@ -86,7 +86,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } } - public long tightUnmarshalLong(OpenWireFormat wireFormat, DataInputStream dataIn, BooleanStream bs) throws IOException { + public long tightUnmarshalLong(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { if( bs.readBoolean() ) { return dataIn.readLong(); @@ -114,18 +114,18 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return answer & 0xffffffffL; } - protected DataStructure tightUnmarsalNestedObject(OpenWireFormat wireFormat, DataInputStream dataIn, BooleanStream bs) throws IOException { + protected DataStructure tightUnmarsalNestedObject(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException { return wireFormat.tightUnmarshalNestedObject(dataIn, bs); } protected int tightMarshalNestedObject1(OpenWireFormat wireFormat, DataStructure o, BooleanStream bs) throws IOException { return wireFormat.tightMarshalNestedObject1(o, bs); } - protected void tightMarshalNestedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalNestedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut, BooleanStream bs) throws IOException { wireFormat.tightMarshalNestedObject2(o, dataOut, bs); } - protected DataStructure tightUnmarsalCachedObject(OpenWireFormat wireFormat, DataInputStream dataIn, BooleanStream bs) throws IOException { + protected DataStructure tightUnmarsalCachedObject(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException { if( wireFormat.isCacheEnabled() ) { if( bs.readBoolean() ) { short index = dataIn.readShort(); @@ -155,7 +155,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return wireFormat.tightMarshalNestedObject1(o, bs); } } - protected void tightMarshalCachedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalCachedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut, BooleanStream bs) throws IOException { if( wireFormat.isCacheEnabled() ) { Short index = wireFormat.getMarshallCacheIndex(o); if( bs.readBoolean() ) { @@ -169,7 +169,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected Throwable tightUnmarsalThrowable(OpenWireFormat wireFormat, DataInputStream dataIn, BooleanStream bs) throws IOException { + protected Throwable tightUnmarsalThrowable(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { String clazz = tightUnmarshalString(dataIn, bs); String message = tightUnmarshalString(dataIn, bs); @@ -244,7 +244,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalThrowable2(OpenWireFormat wireFormat, Throwable o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalThrowable2(OpenWireFormat wireFormat, Throwable o, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { tightMarshalString2(o.getClass().getName(), dataOut, bs); tightMarshalString2(o.getMessage(), dataOut, bs); @@ -263,7 +263,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected String tightUnmarshalString(DataInputStream dataIn, BooleanStream bs) throws IOException { + protected String tightUnmarshalString(DataInput dataIn, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { if( bs.readBoolean() ) { int size = dataIn.readShort(); @@ -314,7 +314,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalString2(String value, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalString2(String value, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { // If we verified it only holds ascii values if( bs.readBoolean() ) { @@ -341,7 +341,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalObjectArray2(OpenWireFormat wireFormat, DataStructure[] objects, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalObjectArray2(OpenWireFormat wireFormat, DataStructure[] objects, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { dataOut.writeShort(objects.length); for( int i=0; i < objects.length; i++ ) { @@ -353,11 +353,11 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { protected int tightMarshalConstByteArray1(byte[] data, BooleanStream bs, int i) throws IOException { return i; } - protected void tightMarshalConstByteArray2(byte[] data, DataOutputStream dataOut, BooleanStream bs, int i) throws IOException { + protected void tightMarshalConstByteArray2(byte[] data, DataOutput dataOut, BooleanStream bs, int i) throws IOException { dataOut.write(data, 0, i); } - protected byte[] tightUnmarshalConstByteArray(DataInputStream dataIn, BooleanStream bs, int i) throws IOException { + protected byte[] tightUnmarshalConstByteArray(DataInput dataIn, BooleanStream bs, int i) throws IOException { byte data[] = new byte[i]; dataIn.readFully(data); return data; @@ -372,14 +372,14 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalByteArray2(byte[] data, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalByteArray2(byte[] data, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ){ dataOut.writeInt(data.length); dataOut.write(data); } } - protected byte[] tightUnmarshalByteArray(DataInputStream dataIn, BooleanStream bs) throws IOException { + protected byte[] tightUnmarshalByteArray(DataInput dataIn, BooleanStream bs) throws IOException { byte rc[]=null; if( bs.readBoolean() ) { int size = dataIn.readInt(); @@ -398,14 +398,14 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalByteSequence2(ByteSequence data, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalByteSequence2(ByteSequence data, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ){ dataOut.writeInt(data.getLength()); dataOut.write(data.getData(), data.getOffset(), data.getLength()); } } - protected ByteSequence tightUnmarshalByteSequence(DataInputStream dataIn, BooleanStream bs) throws IOException { + protected ByteSequence tightUnmarshalByteSequence(DataInput dataIn, BooleanStream bs) throws IOException { ByteSequence rc=null; if( bs.readBoolean() ) { int size = dataIn.readInt(); @@ -420,26 +420,26 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { // The loose marshaling logic // - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { } - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { } - public void looseMarshalLong(OpenWireFormat wireFormat, long o, DataOutputStream dataOut) throws IOException { + public void looseMarshalLong(OpenWireFormat wireFormat, long o, DataOutput dataOut) throws IOException { dataOut.writeLong(o); } - public long looseUnmarshalLong(OpenWireFormat wireFormat, DataInputStream dataIn) throws IOException { + public long looseUnmarshalLong(OpenWireFormat wireFormat, DataInput dataIn) throws IOException { return dataIn.readLong(); } - protected DataStructure looseUnmarsalNestedObject(OpenWireFormat wireFormat, DataInputStream dataIn) throws IOException { + protected DataStructure looseUnmarsalNestedObject(OpenWireFormat wireFormat, DataInput dataIn) throws IOException { return wireFormat.looseUnmarshalNestedObject(dataIn); } - protected void looseMarshalNestedObject(OpenWireFormat wireFormat, DataStructure o, DataOutputStream dataOut) throws IOException { + protected void looseMarshalNestedObject(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut) throws IOException { wireFormat.looseMarshalNestedObject(o, dataOut); } - protected DataStructure looseUnmarsalCachedObject(OpenWireFormat wireFormat, DataInputStream dataIn) throws IOException { + protected DataStructure looseUnmarsalCachedObject(OpenWireFormat wireFormat, DataInput dataIn) throws IOException { if( wireFormat.isCacheEnabled() ) { if( dataIn.readBoolean() ) { short index = dataIn.readShort(); @@ -454,7 +454,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return wireFormat.looseUnmarshalNestedObject(dataIn); } } - protected void looseMarshalCachedObject(OpenWireFormat wireFormat, DataStructure o, DataOutputStream dataOut) throws IOException { + protected void looseMarshalCachedObject(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut) throws IOException { if( wireFormat.isCacheEnabled() ) { Short index = wireFormat.getMarshallCacheIndex(o); dataOut.writeBoolean(index == null); @@ -470,7 +470,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected Throwable looseUnmarsalThrowable(OpenWireFormat wireFormat, DataInputStream dataIn) throws IOException { + protected Throwable looseUnmarsalThrowable(OpenWireFormat wireFormat, DataInput dataIn) throws IOException { if( dataIn.readBoolean() ) { String clazz = looseUnmarshalString(dataIn); String message = looseUnmarshalString(dataIn); @@ -511,7 +511,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } - protected void looseMarshalThrowable(OpenWireFormat wireFormat, Throwable o, DataOutputStream dataOut) throws IOException { + protected void looseMarshalThrowable(OpenWireFormat wireFormat, Throwable o, DataOutput dataOut) throws IOException { dataOut.writeBoolean(o!=null); if( o!=null ) { looseMarshalString(o.getClass().getName(), dataOut); @@ -531,7 +531,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected String looseUnmarshalString(DataInputStream dataIn) throws IOException { + protected String looseUnmarshalString(DataInput dataIn) throws IOException { if( dataIn.readBoolean() ) { return dataIn.readUTF(); } else { @@ -539,14 +539,14 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void looseMarshalString(String value, DataOutputStream dataOut) throws IOException { + protected void looseMarshalString(String value, DataOutput dataOut) throws IOException { dataOut.writeBoolean(value!=null); if( value!=null ) { dataOut.writeUTF(value); } } - protected void looseMarshalObjectArray(OpenWireFormat wireFormat, DataStructure[] objects, DataOutputStream dataOut) throws IOException { + protected void looseMarshalObjectArray(OpenWireFormat wireFormat, DataStructure[] objects, DataOutput dataOut) throws IOException { dataOut.writeBoolean(objects!=null); if( objects!=null ) { dataOut.writeShort(objects.length); @@ -556,17 +556,17 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void looseMarshalConstByteArray(OpenWireFormat wireFormat, byte[] data, DataOutputStream dataOut, int i) throws IOException { + protected void looseMarshalConstByteArray(OpenWireFormat wireFormat, byte[] data, DataOutput dataOut, int i) throws IOException { dataOut.write(data, 0, i); } - protected byte[] looseUnmarshalConstByteArray(DataInputStream dataIn, int i) throws IOException { + protected byte[] looseUnmarshalConstByteArray(DataInput dataIn, int i) throws IOException { byte data[] = new byte[i]; dataIn.readFully(data); return data; } - protected void looseMarshalByteArray(OpenWireFormat wireFormat, byte[] data, DataOutputStream dataOut) throws IOException { + protected void looseMarshalByteArray(OpenWireFormat wireFormat, byte[] data, DataOutput dataOut) throws IOException { dataOut.writeBoolean(data!=null); if( data!=null ){ dataOut.writeInt(data.length); @@ -574,7 +574,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected byte[] looseUnmarshalByteArray(DataInputStream dataIn) throws IOException { + protected byte[] looseUnmarshalByteArray(DataInput dataIn) throws IOException { byte rc[]=null; if( dataIn.readBoolean() ) { int size = dataIn.readInt(); @@ -584,7 +584,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return rc; } - protected void looseMarshalByteSequence(OpenWireFormat wireFormat, ByteSequence data, DataOutputStream dataOut) throws IOException { + protected void looseMarshalByteSequence(OpenWireFormat wireFormat, ByteSequence data, DataOutput dataOut) throws IOException { dataOut.writeBoolean(data!=null); if( data!=null ){ dataOut.writeInt(data.getLength()); @@ -592,7 +592,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected ByteSequence looseUnmarshalByteSequence(DataInputStream dataIn) throws IOException { + protected ByteSequence looseUnmarshalByteSequence(DataInput dataIn) throws IOException { ByteSequence rc=null; if( dataIn.readBoolean() ) { int size = dataIn.readInt(); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java index 066b3e3496..421813ec7a 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class BrokerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); BrokerId info = (BrokerId)o; @@ -91,7 +91,7 @@ public class BrokerIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); BrokerId info = (BrokerId)o; @@ -106,7 +106,7 @@ public class BrokerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); BrokerId info = (BrokerId)o; @@ -118,7 +118,7 @@ public class BrokerIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { BrokerId info = (BrokerId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java index bd93ae95a2..4acb99712b 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); BrokerInfo info = (BrokerInfo)o; @@ -114,7 +114,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); BrokerInfo info = (BrokerInfo)o; @@ -135,7 +135,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); BrokerInfo info = (BrokerInfo)o; @@ -164,7 +164,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { BrokerInfo info = (BrokerInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java index 674e68e67d..8d2bfbcbed 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionControlMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConnectionControlMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionControl info = (ConnectionControl)o; @@ -99,7 +99,7 @@ public class ConnectionControlMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionControl info = (ConnectionControl)o; @@ -118,7 +118,7 @@ public class ConnectionControlMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionControl info = (ConnectionControl)o; @@ -134,7 +134,7 @@ public class ConnectionControlMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConnectionControl info = (ConnectionControl)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java index 166e0d3703..602baccd72 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionError info = (ConnectionError)o; @@ -93,7 +93,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionError info = (ConnectionError)o; @@ -109,7 +109,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionError info = (ConnectionError)o; @@ -122,7 +122,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConnectionError info = (ConnectionError)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java index f72fb589d0..34e76a5615 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConnectionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionId info = (ConnectionId)o; @@ -91,7 +91,7 @@ public class ConnectionIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionId info = (ConnectionId)o; @@ -106,7 +106,7 @@ public class ConnectionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionId info = (ConnectionId)o; @@ -118,7 +118,7 @@ public class ConnectionIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConnectionId info = (ConnectionId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java index 7ecd69cc4b..a19d0ceb1f 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionInfo info = (ConnectionInfo)o; @@ -114,7 +114,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionInfo info = (ConnectionInfo)o; @@ -135,7 +135,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionInfo info = (ConnectionInfo)o; @@ -164,7 +164,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConnectionInfo info = (ConnectionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java index 1ec9c4a26b..b0439e942d 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerControlMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConsumerControlMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConsumerControl info = (ConsumerControl)o; @@ -94,7 +94,7 @@ public class ConsumerControlMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConsumerControl info = (ConsumerControl)o; @@ -111,7 +111,7 @@ public class ConsumerControlMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConsumerControl info = (ConsumerControl)o; @@ -125,7 +125,7 @@ public class ConsumerControlMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConsumerControl info = (ConsumerControl)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java index 43ec8b0acb..ba0c5655a9 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConsumerId info = (ConsumerId)o; @@ -95,7 +95,7 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConsumerId info = (ConsumerId)o; @@ -112,7 +112,7 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConsumerId info = (ConsumerId)o; @@ -126,7 +126,7 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConsumerId info = (ConsumerId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java index e1c75e8b74..ae4291f1f9 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConsumerInfo info = (ConsumerInfo)o; @@ -131,7 +131,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConsumerInfo info = (ConsumerInfo)o; @@ -162,7 +162,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConsumerInfo info = (ConsumerInfo)o; @@ -201,7 +201,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConsumerInfo info = (ConsumerInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java index a34cda330d..a789b65e2c 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ControlCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ControlCommand info = (ControlCommand)o; @@ -91,7 +91,7 @@ public class ControlCommandMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ControlCommand info = (ControlCommand)o; @@ -106,7 +106,7 @@ public class ControlCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ControlCommand info = (ControlCommand)o; @@ -118,7 +118,7 @@ public class ControlCommandMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ControlCommand info = (ControlCommand)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java index 1ed286d05c..5bdd9ed1b1 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); DataArrayResponse info = (DataArrayResponse)o; @@ -102,7 +102,7 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); DataArrayResponse info = (DataArrayResponse)o; @@ -117,7 +117,7 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); DataArrayResponse info = (DataArrayResponse)o; @@ -140,7 +140,7 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { DataArrayResponse info = (DataArrayResponse)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java index 321b326747..0f376167eb 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); DataResponse info = (DataResponse)o; @@ -91,7 +91,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); DataResponse info = (DataResponse)o; @@ -106,7 +106,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); DataResponse info = (DataResponse)o; @@ -118,7 +118,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { DataResponse info = (DataResponse)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java index 7994b729dd..e7333257cc 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataStructureSupportMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -46,7 +46,7 @@ public abstract class DataStructureSupportMarshaller extends BaseDataStreamMarsh * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -69,7 +69,7 @@ public abstract class DataStructureSupportMarshaller extends BaseDataStreamMarsh * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -81,7 +81,7 @@ public abstract class DataStructureSupportMarshaller extends BaseDataStreamMarsh * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -90,7 +90,7 @@ public abstract class DataStructureSupportMarshaller extends BaseDataStreamMarsh /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java index 3e4f45d51f..1cfbd83411 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); DestinationInfo info = (DestinationInfo)o; @@ -109,7 +109,7 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); DestinationInfo info = (DestinationInfo)o; @@ -128,7 +128,7 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); DestinationInfo info = (DestinationInfo)o; @@ -155,7 +155,7 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { DestinationInfo info = (DestinationInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java index d7b8446016..c30d6e7608 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class DiscoveryEventMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); DiscoveryEvent info = (DiscoveryEvent)o; @@ -93,7 +93,7 @@ public class DiscoveryEventMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); DiscoveryEvent info = (DiscoveryEvent)o; @@ -109,7 +109,7 @@ public class DiscoveryEventMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); DiscoveryEvent info = (DiscoveryEvent)o; @@ -122,7 +122,7 @@ public class DiscoveryEventMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { DiscoveryEvent info = (DiscoveryEvent)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java index a201373ef3..bad5e7e773 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ExceptionResponse info = (ExceptionResponse)o; @@ -91,7 +91,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ExceptionResponse info = (ExceptionResponse)o; @@ -106,7 +106,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ExceptionResponse info = (ExceptionResponse)o; @@ -118,7 +118,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ExceptionResponse info = (ExceptionResponse)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java index c2596fe8b4..a0ef3a778d 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class FlushCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class FlushCommandMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class FlushCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class FlushCommandMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java index 0f12d01f26..480ebe6c28 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class IntegerResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); IntegerResponse info = (IntegerResponse)o; @@ -90,7 +90,7 @@ public class IntegerResponseMarshaller extends ResponseMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); IntegerResponse info = (IntegerResponse)o; @@ -105,7 +105,7 @@ public class IntegerResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); IntegerResponse info = (IntegerResponse)o; @@ -117,7 +117,7 @@ public class IntegerResponseMarshaller extends ResponseMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { IntegerResponse info = (IntegerResponse)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java index d409243b45..fd0c585bbb 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalQueueAck info = (JournalQueueAck)o; @@ -93,7 +93,7 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalQueueAck info = (JournalQueueAck)o; @@ -109,7 +109,7 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); JournalQueueAck info = (JournalQueueAck)o; @@ -122,7 +122,7 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { JournalQueueAck info = (JournalQueueAck)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java index 80e0b73ca2..4a0ef28779 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTopicAck info = (JournalTopicAck)o; @@ -101,7 +101,7 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTopicAck info = (JournalTopicAck)o; @@ -121,7 +121,7 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); JournalTopicAck info = (JournalTopicAck)o; @@ -138,7 +138,7 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { JournalTopicAck info = (JournalTopicAck)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java index 8e4f31c731..b35668223a 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class JournalTraceMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTrace info = (JournalTrace)o; @@ -91,7 +91,7 @@ public class JournalTraceMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTrace info = (JournalTrace)o; @@ -106,7 +106,7 @@ public class JournalTraceMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); JournalTrace info = (JournalTrace)o; @@ -118,7 +118,7 @@ public class JournalTraceMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { JournalTrace info = (JournalTrace)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java index 611590c3f8..4edc682a33 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTransaction info = (JournalTransaction)o; @@ -94,7 +94,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTransaction info = (JournalTransaction)o; @@ -111,7 +111,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); JournalTransaction info = (JournalTransaction)o; @@ -125,7 +125,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { JournalTransaction info = (JournalTransaction)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java index ea45703725..1c65d4d7b1 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class KeepAliveInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class KeepAliveInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class KeepAliveInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class KeepAliveInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java index 0183e94059..70b1451603 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LastPartialCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class LastPartialCommandMarshaller extends PartialCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class LastPartialCommandMarshaller extends PartialCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class LastPartialCommandMarshaller extends PartialCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class LastPartialCommandMarshaller extends PartialCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java index b54ae33983..bd904a4385 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); LocalTransactionId info = (LocalTransactionId)o; @@ -93,7 +93,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); LocalTransactionId info = (LocalTransactionId)o; @@ -109,7 +109,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); LocalTransactionId info = (LocalTransactionId)o; @@ -122,7 +122,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { LocalTransactionId info = (LocalTransactionId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java index 0ad5e93326..248d84252d 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageAck info = (MessageAck)o; @@ -101,7 +101,7 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageAck info = (MessageAck)o; @@ -122,7 +122,7 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); MessageAck info = (MessageAck)o; @@ -140,7 +140,7 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { MessageAck info = (MessageAck)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java index 00c8cf5951..29f516b801 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageDispatch info = (MessageDispatch)o; @@ -96,7 +96,7 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageDispatch info = (MessageDispatch)o; @@ -114,7 +114,7 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); MessageDispatch info = (MessageDispatch)o; @@ -129,7 +129,7 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { MessageDispatch info = (MessageDispatch)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java index 740a305a82..7cc712867c 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageDispatchNotification info = (MessageDispatchNotification)o; @@ -97,7 +97,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageDispatchNotification info = (MessageDispatchNotification)o; @@ -115,7 +115,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); MessageDispatchNotification info = (MessageDispatchNotification)o; @@ -130,7 +130,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { MessageDispatchNotification info = (MessageDispatchNotification)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java index 11b6ad302a..749b6b5f21 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageId info = (MessageId)o; @@ -95,7 +95,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageId info = (MessageId)o; @@ -112,7 +112,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); MessageId info = (MessageId)o; @@ -126,7 +126,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { MessageId info = (MessageId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java index 6040ec98be..226fbc51e8 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); Message info = (Message)o; @@ -139,7 +139,7 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); Message info = (Message)o; @@ -180,7 +180,7 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); Message info = (Message)o; @@ -232,7 +232,7 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { Message info = (Message)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java index c78117b74c..aab5e85c01 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); NetworkBridgeFilter info = (NetworkBridgeFilter)o; @@ -92,7 +92,7 @@ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); NetworkBridgeFilter info = (NetworkBridgeFilter)o; @@ -108,7 +108,7 @@ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); NetworkBridgeFilter info = (NetworkBridgeFilter)o; @@ -121,7 +121,7 @@ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { NetworkBridgeFilter info = (NetworkBridgeFilter)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java index f5cba3f234..8af76da3fa 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/PartialCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class PartialCommandMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); PartialCommand info = (PartialCommand)o; @@ -92,7 +92,7 @@ public class PartialCommandMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); PartialCommand info = (PartialCommand)o; @@ -108,7 +108,7 @@ public class PartialCommandMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); PartialCommand info = (PartialCommand)o; @@ -121,7 +121,7 @@ public class PartialCommandMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { PartialCommand info = (PartialCommand)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java index 7fe67530ac..2b71362638 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ProducerId info = (ProducerId)o; @@ -95,7 +95,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ProducerId info = (ProducerId)o; @@ -112,7 +112,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ProducerId info = (ProducerId)o; @@ -126,7 +126,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ProducerId info = (ProducerId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java index 27899fe279..6bf9918c7b 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ProducerInfo info = (ProducerInfo)o; @@ -106,7 +106,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ProducerInfo info = (ProducerInfo)o; @@ -123,7 +123,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ProducerInfo info = (ProducerInfo)o; @@ -148,7 +148,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ProducerInfo info = (ProducerInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java index 6801786e41..870af140ac 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); RemoveInfo info = (RemoveInfo)o; @@ -91,7 +91,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); RemoveInfo info = (RemoveInfo)o; @@ -106,7 +106,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); RemoveInfo info = (RemoveInfo)o; @@ -118,7 +118,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { RemoveInfo info = (RemoveInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java index a6063b56ec..8015e1a5e5 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; @@ -95,7 +95,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; @@ -112,7 +112,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; @@ -126,7 +126,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java index 0cc4a8b8e1..53fd9ba47e 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ReplayCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ReplayCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ReplayCommand info = (ReplayCommand)o; @@ -91,7 +91,7 @@ public class ReplayCommandMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ReplayCommand info = (ReplayCommand)o; @@ -107,7 +107,7 @@ public class ReplayCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ReplayCommand info = (ReplayCommand)o; @@ -120,7 +120,7 @@ public class ReplayCommandMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ReplayCommand info = (ReplayCommand)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java index 7bf6dfc33c..8c5194bcb0 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ResponseMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); Response info = (Response)o; @@ -90,7 +90,7 @@ public class ResponseMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); Response info = (Response)o; @@ -105,7 +105,7 @@ public class ResponseMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); Response info = (Response)o; @@ -117,7 +117,7 @@ public class ResponseMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { Response info = (Response)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java index 13e389bd1e..fb2005f349 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); SessionId info = (SessionId)o; @@ -93,7 +93,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); SessionId info = (SessionId)o; @@ -109,7 +109,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); SessionId info = (SessionId)o; @@ -122,7 +122,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { SessionId info = (SessionId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java index a7da51bc81..03dd9da867 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); SessionInfo info = (SessionInfo)o; @@ -91,7 +91,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); SessionInfo info = (SessionInfo)o; @@ -106,7 +106,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); SessionInfo info = (SessionInfo)o; @@ -118,7 +118,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { SessionInfo info = (SessionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java index 19f18eeee1..bbc8dae9af 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ShutdownInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ShutdownInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ShutdownInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ShutdownInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java index a7e73f1e0f..ac77c1f0ce 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); SubscriptionInfo info = (SubscriptionInfo)o; @@ -97,7 +97,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); SubscriptionInfo info = (SubscriptionInfo)o; @@ -115,7 +115,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); SubscriptionInfo info = (SubscriptionInfo)o; @@ -130,7 +130,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { SubscriptionInfo info = (SubscriptionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java index 6c60dd423b..051a8add09 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class TransactionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -70,7 +70,7 @@ public abstract class TransactionIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -82,7 +82,7 @@ public abstract class TransactionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -91,7 +91,7 @@ public abstract class TransactionIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java index 363f3054dd..3172627d66 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); TransactionInfo info = (TransactionInfo)o; @@ -94,7 +94,7 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); TransactionInfo info = (TransactionInfo)o; @@ -111,7 +111,7 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); TransactionInfo info = (TransactionInfo)o; @@ -125,7 +125,7 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { TransactionInfo info = (TransactionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java index c7923c1850..cce9691c0b 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); WireFormatInfo info = (WireFormatInfo)o; @@ -101,7 +101,7 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); WireFormatInfo info = (WireFormatInfo)o; @@ -120,7 +120,7 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); WireFormatInfo info = (WireFormatInfo)o; @@ -139,7 +139,7 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { WireFormatInfo info = (WireFormatInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java index 9766e4a323..2dfd8b98b4 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v1; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); XATransactionId info = (XATransactionId)o; @@ -94,7 +94,7 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); XATransactionId info = (XATransactionId)o; @@ -111,7 +111,7 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); XATransactionId info = (XATransactionId)o; @@ -125,7 +125,7 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { XATransactionId info = (XATransactionId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java index 3b55596c3c..94107fb655 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQBytesMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java index e26c3ad035..ace5eea8f8 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQDestinationMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarsha * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ActiveMQDestination info = (ActiveMQDestination)o; @@ -76,7 +76,7 @@ public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarsha * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ActiveMQDestination info = (ActiveMQDestination)o; @@ -91,7 +91,7 @@ public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarsha * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ActiveMQDestination info = (ActiveMQDestination)o; @@ -103,7 +103,7 @@ public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarsha /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ActiveMQDestination info = (ActiveMQDestination)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java index 2cfec821e4..83d81fda4d 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMapMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java index d7fe103544..84afdf8585 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQMessageMarshaller extends MessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQMessageMarshaller extends MessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQMessageMarshaller extends MessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQMessageMarshaller extends MessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java index 5de675f6d9..1d83b9a2c3 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQObjectMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java index b7329259b4..6deadb3acc 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQQueueMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java index ab983a3761..f637d4ba12 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQStreamMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java index 1cea623798..1d5d924527 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempDestinationMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinat * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -70,7 +70,7 @@ public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinat * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -82,7 +82,7 @@ public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinat * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -91,7 +91,7 @@ public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinat /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java index dab1a7d4fc..33b7b7e6c4 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempQueueMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshall * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshall * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshall * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshall /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java index 7c9979cff2..6711c206a7 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTempTopicMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshall * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshall * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshall * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshall /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java index 09fb78e33c..13f75029a9 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTextMessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQTextMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQTextMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQTextMessageMarshaller extends ActiveMQMessageMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQTextMessageMarshaller extends ActiveMQMessageMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java index 445ca7f8f5..e97ac4202a 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ActiveMQTopicMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ActiveMQTopicMarshaller extends ActiveMQDestinationMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ActiveMQTopicMarshaller extends ActiveMQDestinationMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ActiveMQTopicMarshaller extends ActiveMQDestinationMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ActiveMQTopicMarshaller extends ActiveMQDestinationMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java index 09bab1e189..b6a7efedd2 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class BaseCommandMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); BaseCommand info = (BaseCommand)o; @@ -77,7 +77,7 @@ public abstract class BaseCommandMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); BaseCommand info = (BaseCommand)o; @@ -93,7 +93,7 @@ public abstract class BaseCommandMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); BaseCommand info = (BaseCommand)o; @@ -106,7 +106,7 @@ public abstract class BaseCommandMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { BaseCommand info = (BaseCommand)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java index 7bff318e49..9a7c263061 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java @@ -17,8 +17,8 @@ */ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import java.lang.reflect.Constructor; @@ -49,9 +49,9 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException { return 0; } - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { } - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { } public int tightMarshalLong1(OpenWireFormat wireFormat, long o, BooleanStream bs) throws IOException { @@ -73,7 +73,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return 8; } } - public void tightMarshalLong2(OpenWireFormat wireFormat, long o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshalLong2(OpenWireFormat wireFormat, long o, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { if( bs.readBoolean() ) { dataOut.writeLong(o); @@ -86,7 +86,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } } - public long tightUnmarshalLong(OpenWireFormat wireFormat, DataInputStream dataIn, BooleanStream bs) throws IOException { + public long tightUnmarshalLong(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { if( bs.readBoolean() ) { return dataIn.readLong(); @@ -114,18 +114,18 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return answer & 0xffffffffL; } - protected DataStructure tightUnmarsalNestedObject(OpenWireFormat wireFormat, DataInputStream dataIn, BooleanStream bs) throws IOException { + protected DataStructure tightUnmarsalNestedObject(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException { return wireFormat.tightUnmarshalNestedObject(dataIn, bs); } protected int tightMarshalNestedObject1(OpenWireFormat wireFormat, DataStructure o, BooleanStream bs) throws IOException { return wireFormat.tightMarshalNestedObject1(o, bs); } - protected void tightMarshalNestedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalNestedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut, BooleanStream bs) throws IOException { wireFormat.tightMarshalNestedObject2(o, dataOut, bs); } - protected DataStructure tightUnmarsalCachedObject(OpenWireFormat wireFormat, DataInputStream dataIn, BooleanStream bs) throws IOException { + protected DataStructure tightUnmarsalCachedObject(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException { if( wireFormat.isCacheEnabled() ) { if( bs.readBoolean() ) { short index = dataIn.readShort(); @@ -155,7 +155,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return wireFormat.tightMarshalNestedObject1(o, bs); } } - protected void tightMarshalCachedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalCachedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut, BooleanStream bs) throws IOException { if( wireFormat.isCacheEnabled() ) { Short index = wireFormat.getMarshallCacheIndex(o); if( bs.readBoolean() ) { @@ -169,7 +169,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected Throwable tightUnmarsalThrowable(OpenWireFormat wireFormat, DataInputStream dataIn, BooleanStream bs) throws IOException { + protected Throwable tightUnmarsalThrowable(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { String clazz = tightUnmarshalString(dataIn, bs); String message = tightUnmarshalString(dataIn, bs); @@ -244,7 +244,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalThrowable2(OpenWireFormat wireFormat, Throwable o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalThrowable2(OpenWireFormat wireFormat, Throwable o, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { tightMarshalString2(o.getClass().getName(), dataOut, bs); tightMarshalString2(o.getMessage(), dataOut, bs); @@ -263,7 +263,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected String tightUnmarshalString(DataInputStream dataIn, BooleanStream bs) throws IOException { + protected String tightUnmarshalString(DataInput dataIn, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { if( bs.readBoolean() ) { int size = dataIn.readShort(); @@ -314,7 +314,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalString2(String value, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalString2(String value, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { // If we verified it only holds ascii values if( bs.readBoolean() ) { @@ -341,7 +341,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalObjectArray2(OpenWireFormat wireFormat, DataStructure[] objects, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalObjectArray2(OpenWireFormat wireFormat, DataStructure[] objects, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ) { dataOut.writeShort(objects.length); for( int i=0; i < objects.length; i++ ) { @@ -353,11 +353,11 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { protected int tightMarshalConstByteArray1(byte[] data, BooleanStream bs, int i) throws IOException { return i; } - protected void tightMarshalConstByteArray2(byte[] data, DataOutputStream dataOut, BooleanStream bs, int i) throws IOException { + protected void tightMarshalConstByteArray2(byte[] data, DataOutput dataOut, BooleanStream bs, int i) throws IOException { dataOut.write(data, 0, i); } - protected byte[] tightUnmarshalConstByteArray(DataInputStream dataIn, BooleanStream bs, int i) throws IOException { + protected byte[] tightUnmarshalConstByteArray(DataInput dataIn, BooleanStream bs, int i) throws IOException { byte data[] = new byte[i]; dataIn.readFully(data); return data; @@ -372,14 +372,14 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalByteArray2(byte[] data, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalByteArray2(byte[] data, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ){ dataOut.writeInt(data.length); dataOut.write(data); } } - protected byte[] tightUnmarshalByteArray(DataInputStream dataIn, BooleanStream bs) throws IOException { + protected byte[] tightUnmarshalByteArray(DataInput dataIn, BooleanStream bs) throws IOException { byte rc[]=null; if( bs.readBoolean() ) { int size = dataIn.readInt(); @@ -398,14 +398,14 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void tightMarshalByteSequence2(ByteSequence data, DataOutputStream dataOut, BooleanStream bs) throws IOException { + protected void tightMarshalByteSequence2(ByteSequence data, DataOutput dataOut, BooleanStream bs) throws IOException { if( bs.readBoolean() ){ dataOut.writeInt(data.getLength()); dataOut.write(data.getData(), data.getOffset(), data.getLength()); } } - protected ByteSequence tightUnmarshalByteSequence(DataInputStream dataIn, BooleanStream bs) throws IOException { + protected ByteSequence tightUnmarshalByteSequence(DataInput dataIn, BooleanStream bs) throws IOException { ByteSequence rc=null; if( bs.readBoolean() ) { int size = dataIn.readInt(); @@ -420,26 +420,26 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { // The loose marshaling logic // - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { } - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { } - public void looseMarshalLong(OpenWireFormat wireFormat, long o, DataOutputStream dataOut) throws IOException { + public void looseMarshalLong(OpenWireFormat wireFormat, long o, DataOutput dataOut) throws IOException { dataOut.writeLong(o); } - public long looseUnmarshalLong(OpenWireFormat wireFormat, DataInputStream dataIn) throws IOException { + public long looseUnmarshalLong(OpenWireFormat wireFormat, DataInput dataIn) throws IOException { return dataIn.readLong(); } - protected DataStructure looseUnmarsalNestedObject(OpenWireFormat wireFormat, DataInputStream dataIn) throws IOException { + protected DataStructure looseUnmarsalNestedObject(OpenWireFormat wireFormat, DataInput dataIn) throws IOException { return wireFormat.looseUnmarshalNestedObject(dataIn); } - protected void looseMarshalNestedObject(OpenWireFormat wireFormat, DataStructure o, DataOutputStream dataOut) throws IOException { + protected void looseMarshalNestedObject(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut) throws IOException { wireFormat.looseMarshalNestedObject(o, dataOut); } - protected DataStructure looseUnmarsalCachedObject(OpenWireFormat wireFormat, DataInputStream dataIn) throws IOException { + protected DataStructure looseUnmarsalCachedObject(OpenWireFormat wireFormat, DataInput dataIn) throws IOException { if( wireFormat.isCacheEnabled() ) { if( dataIn.readBoolean() ) { short index = dataIn.readShort(); @@ -454,7 +454,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return wireFormat.looseUnmarshalNestedObject(dataIn); } } - protected void looseMarshalCachedObject(OpenWireFormat wireFormat, DataStructure o, DataOutputStream dataOut) throws IOException { + protected void looseMarshalCachedObject(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut) throws IOException { if( wireFormat.isCacheEnabled() ) { Short index = wireFormat.getMarshallCacheIndex(o); dataOut.writeBoolean(index == null); @@ -470,7 +470,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected Throwable looseUnmarsalThrowable(OpenWireFormat wireFormat, DataInputStream dataIn) throws IOException { + protected Throwable looseUnmarsalThrowable(OpenWireFormat wireFormat, DataInput dataIn) throws IOException { if( dataIn.readBoolean() ) { String clazz = looseUnmarshalString(dataIn); String message = looseUnmarshalString(dataIn); @@ -511,7 +511,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } - protected void looseMarshalThrowable(OpenWireFormat wireFormat, Throwable o, DataOutputStream dataOut) throws IOException { + protected void looseMarshalThrowable(OpenWireFormat wireFormat, Throwable o, DataOutput dataOut) throws IOException { dataOut.writeBoolean(o!=null); if( o!=null ) { looseMarshalString(o.getClass().getName(), dataOut); @@ -531,7 +531,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected String looseUnmarshalString(DataInputStream dataIn) throws IOException { + protected String looseUnmarshalString(DataInput dataIn) throws IOException { if( dataIn.readBoolean() ) { return dataIn.readUTF(); } else { @@ -539,14 +539,14 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void looseMarshalString(String value, DataOutputStream dataOut) throws IOException { + protected void looseMarshalString(String value, DataOutput dataOut) throws IOException { dataOut.writeBoolean(value!=null); if( value!=null ) { dataOut.writeUTF(value); } } - protected void looseMarshalObjectArray(OpenWireFormat wireFormat, DataStructure[] objects, DataOutputStream dataOut) throws IOException { + protected void looseMarshalObjectArray(OpenWireFormat wireFormat, DataStructure[] objects, DataOutput dataOut) throws IOException { dataOut.writeBoolean(objects!=null); if( objects!=null ) { dataOut.writeShort(objects.length); @@ -556,17 +556,17 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected void looseMarshalConstByteArray(OpenWireFormat wireFormat, byte[] data, DataOutputStream dataOut, int i) throws IOException { + protected void looseMarshalConstByteArray(OpenWireFormat wireFormat, byte[] data, DataOutput dataOut, int i) throws IOException { dataOut.write(data, 0, i); } - protected byte[] looseUnmarshalConstByteArray(DataInputStream dataIn, int i) throws IOException { + protected byte[] looseUnmarshalConstByteArray(DataInput dataIn, int i) throws IOException { byte data[] = new byte[i]; dataIn.readFully(data); return data; } - protected void looseMarshalByteArray(OpenWireFormat wireFormat, byte[] data, DataOutputStream dataOut) throws IOException { + protected void looseMarshalByteArray(OpenWireFormat wireFormat, byte[] data, DataOutput dataOut) throws IOException { dataOut.writeBoolean(data!=null); if( data!=null ){ dataOut.writeInt(data.length); @@ -574,7 +574,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected byte[] looseUnmarshalByteArray(DataInputStream dataIn) throws IOException { + protected byte[] looseUnmarshalByteArray(DataInput dataIn) throws IOException { byte rc[]=null; if( dataIn.readBoolean() ) { int size = dataIn.readInt(); @@ -584,7 +584,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { return rc; } - protected void looseMarshalByteSequence(OpenWireFormat wireFormat, ByteSequence data, DataOutputStream dataOut) throws IOException { + protected void looseMarshalByteSequence(OpenWireFormat wireFormat, ByteSequence data, DataOutput dataOut) throws IOException { dataOut.writeBoolean(data!=null); if( data!=null ){ dataOut.writeInt(data.getLength()); @@ -592,7 +592,7 @@ abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller { } } - protected ByteSequence looseUnmarshalByteSequence(DataInputStream dataIn) throws IOException { + protected ByteSequence looseUnmarshalByteSequence(DataInput dataIn) throws IOException { ByteSequence rc=null; if( dataIn.readBoolean() ) { int size = dataIn.readInt(); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java index cb2656f235..9deb1761da 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class BrokerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); BrokerId info = (BrokerId)o; @@ -91,7 +91,7 @@ public class BrokerIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); BrokerId info = (BrokerId)o; @@ -106,7 +106,7 @@ public class BrokerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); BrokerId info = (BrokerId)o; @@ -118,7 +118,7 @@ public class BrokerIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { BrokerId info = (BrokerId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java index 0646a68525..564ddd1f48 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/BrokerInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); BrokerInfo info = (BrokerInfo)o; @@ -118,7 +118,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); BrokerInfo info = (BrokerInfo)o; @@ -141,7 +141,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); BrokerInfo info = (BrokerInfo)o; @@ -172,7 +172,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { BrokerInfo info = (BrokerInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java index 87d55cabf1..21b2292adb 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionControlMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConnectionControlMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionControl info = (ConnectionControl)o; @@ -99,7 +99,7 @@ public class ConnectionControlMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionControl info = (ConnectionControl)o; @@ -118,7 +118,7 @@ public class ConnectionControlMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionControl info = (ConnectionControl)o; @@ -134,7 +134,7 @@ public class ConnectionControlMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConnectionControl info = (ConnectionControl)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java index 642126a027..6b8efbe2ed 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionErrorMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionError info = (ConnectionError)o; @@ -93,7 +93,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionError info = (ConnectionError)o; @@ -109,7 +109,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionError info = (ConnectionError)o; @@ -122,7 +122,7 @@ public class ConnectionErrorMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConnectionError info = (ConnectionError)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java index c613c04800..9063f2c1af 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConnectionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionId info = (ConnectionId)o; @@ -91,7 +91,7 @@ public class ConnectionIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionId info = (ConnectionId)o; @@ -106,7 +106,7 @@ public class ConnectionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionId info = (ConnectionId)o; @@ -118,7 +118,7 @@ public class ConnectionIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConnectionId info = (ConnectionId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java index 8296f8062f..a94a08c752 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConnectionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionInfo info = (ConnectionInfo)o; @@ -116,7 +116,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionInfo info = (ConnectionInfo)o; @@ -138,7 +138,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConnectionInfo info = (ConnectionInfo)o; @@ -168,7 +168,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConnectionInfo info = (ConnectionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java index fe97c07afd..8d0aa5de2a 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerControlMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConsumerControlMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConsumerControl info = (ConsumerControl)o; @@ -100,7 +100,7 @@ public class ConsumerControlMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConsumerControl info = (ConsumerControl)o; @@ -120,7 +120,7 @@ public class ConsumerControlMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConsumerControl info = (ConsumerControl)o; @@ -137,7 +137,7 @@ public class ConsumerControlMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConsumerControl info = (ConsumerControl)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java index 98b8c7e3b6..116aebc7fc 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConsumerId info = (ConsumerId)o; @@ -95,7 +95,7 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConsumerId info = (ConsumerId)o; @@ -112,7 +112,7 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConsumerId info = (ConsumerId)o; @@ -126,7 +126,7 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConsumerId info = (ConsumerId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java index 404c9898d0..bc80046beb 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConsumerInfo info = (ConsumerInfo)o; @@ -131,7 +131,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConsumerInfo info = (ConsumerInfo)o; @@ -162,7 +162,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ConsumerInfo info = (ConsumerInfo)o; @@ -201,7 +201,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ConsumerInfo info = (ConsumerInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java index dcfd9a9e81..1a5eb1ffa2 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ControlCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ControlCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ControlCommand info = (ControlCommand)o; @@ -91,7 +91,7 @@ public class ControlCommandMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ControlCommand info = (ControlCommand)o; @@ -106,7 +106,7 @@ public class ControlCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ControlCommand info = (ControlCommand)o; @@ -118,7 +118,7 @@ public class ControlCommandMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ControlCommand info = (ControlCommand)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java index 080c0bf8ab..b11ad29b4a 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataArrayResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); DataArrayResponse info = (DataArrayResponse)o; @@ -102,7 +102,7 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); DataArrayResponse info = (DataArrayResponse)o; @@ -117,7 +117,7 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); DataArrayResponse info = (DataArrayResponse)o; @@ -140,7 +140,7 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { DataArrayResponse info = (DataArrayResponse)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java index 9af0170494..62577fce6a 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DataResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); DataResponse info = (DataResponse)o; @@ -91,7 +91,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); DataResponse info = (DataResponse)o; @@ -106,7 +106,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); DataResponse info = (DataResponse)o; @@ -118,7 +118,7 @@ public class DataResponseMarshaller extends ResponseMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { DataResponse info = (DataResponse)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java index ce06751ec2..4d19e61d16 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DestinationInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); DestinationInfo info = (DestinationInfo)o; @@ -109,7 +109,7 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); DestinationInfo info = (DestinationInfo)o; @@ -128,7 +128,7 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); DestinationInfo info = (DestinationInfo)o; @@ -155,7 +155,7 @@ public class DestinationInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { DestinationInfo info = (DestinationInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java index e41b3e6a22..417f713ce4 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/DiscoveryEventMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class DiscoveryEventMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); DiscoveryEvent info = (DiscoveryEvent)o; @@ -93,7 +93,7 @@ public class DiscoveryEventMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); DiscoveryEvent info = (DiscoveryEvent)o; @@ -109,7 +109,7 @@ public class DiscoveryEventMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); DiscoveryEvent info = (DiscoveryEvent)o; @@ -122,7 +122,7 @@ public class DiscoveryEventMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { DiscoveryEvent info = (DiscoveryEvent)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java index f86a66460d..a9cde1f4e0 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ExceptionResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ExceptionResponse info = (ExceptionResponse)o; @@ -91,7 +91,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ExceptionResponse info = (ExceptionResponse)o; @@ -106,7 +106,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ExceptionResponse info = (ExceptionResponse)o; @@ -118,7 +118,7 @@ public class ExceptionResponseMarshaller extends ResponseMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ExceptionResponse info = (ExceptionResponse)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java index 85af4b0dcf..06a7e4a7fb 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/FlushCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class FlushCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class FlushCommandMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class FlushCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class FlushCommandMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java index 6a09092126..29b97f5a89 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/IntegerResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class IntegerResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); IntegerResponse info = (IntegerResponse)o; @@ -90,7 +90,7 @@ public class IntegerResponseMarshaller extends ResponseMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); IntegerResponse info = (IntegerResponse)o; @@ -105,7 +105,7 @@ public class IntegerResponseMarshaller extends ResponseMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); IntegerResponse info = (IntegerResponse)o; @@ -117,7 +117,7 @@ public class IntegerResponseMarshaller extends ResponseMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { IntegerResponse info = (IntegerResponse)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java index 02de3c8b13..97836b2acd 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalQueueAckMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalQueueAck info = (JournalQueueAck)o; @@ -93,7 +93,7 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalQueueAck info = (JournalQueueAck)o; @@ -109,7 +109,7 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); JournalQueueAck info = (JournalQueueAck)o; @@ -122,7 +122,7 @@ public class JournalQueueAckMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { JournalQueueAck info = (JournalQueueAck)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java index 0272e130d3..bffda15598 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTopicAckMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTopicAck info = (JournalTopicAck)o; @@ -101,7 +101,7 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTopicAck info = (JournalTopicAck)o; @@ -121,7 +121,7 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); JournalTopicAck info = (JournalTopicAck)o; @@ -138,7 +138,7 @@ public class JournalTopicAckMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { JournalTopicAck info = (JournalTopicAck)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java index 295725d603..9beb380e78 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTraceMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class JournalTraceMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTrace info = (JournalTrace)o; @@ -91,7 +91,7 @@ public class JournalTraceMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTrace info = (JournalTrace)o; @@ -106,7 +106,7 @@ public class JournalTraceMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); JournalTrace info = (JournalTrace)o; @@ -118,7 +118,7 @@ public class JournalTraceMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { JournalTrace info = (JournalTrace)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java index 41b54e8e78..4cb4e02d03 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/JournalTransactionMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTransaction info = (JournalTransaction)o; @@ -94,7 +94,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTransaction info = (JournalTransaction)o; @@ -111,7 +111,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); JournalTransaction info = (JournalTransaction)o; @@ -125,7 +125,7 @@ public class JournalTransactionMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { JournalTransaction info = (JournalTransaction)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java index 41ded9451e..0180272a7b 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/KeepAliveInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class KeepAliveInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class KeepAliveInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class KeepAliveInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class KeepAliveInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java index 94542a1340..7df61956ef 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LastPartialCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class LastPartialCommandMarshaller extends PartialCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class LastPartialCommandMarshaller extends PartialCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class LastPartialCommandMarshaller extends PartialCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class LastPartialCommandMarshaller extends PartialCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java index 7a022df04b..92439fa620 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/LocalTransactionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); LocalTransactionId info = (LocalTransactionId)o; @@ -93,7 +93,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); LocalTransactionId info = (LocalTransactionId)o; @@ -109,7 +109,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); LocalTransactionId info = (LocalTransactionId)o; @@ -122,7 +122,7 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { LocalTransactionId info = (LocalTransactionId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java index afbe5df560..6b4f1c5b65 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageAckMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageAck info = (MessageAck)o; @@ -101,7 +101,7 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageAck info = (MessageAck)o; @@ -122,7 +122,7 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); MessageAck info = (MessageAck)o; @@ -140,7 +140,7 @@ public class MessageAckMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { MessageAck info = (MessageAck)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java index 3c0270367a..149ec8ba07 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageDispatch info = (MessageDispatch)o; @@ -96,7 +96,7 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageDispatch info = (MessageDispatch)o; @@ -114,7 +114,7 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); MessageDispatch info = (MessageDispatch)o; @@ -129,7 +129,7 @@ public class MessageDispatchMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { MessageDispatch info = (MessageDispatch)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java index 1bfb13ec49..32b4281493 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageDispatchNotification info = (MessageDispatchNotification)o; @@ -97,7 +97,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageDispatchNotification info = (MessageDispatchNotification)o; @@ -115,7 +115,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); MessageDispatchNotification info = (MessageDispatchNotification)o; @@ -130,7 +130,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { MessageDispatchNotification info = (MessageDispatchNotification)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java index 99442d3df2..52b9474527 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageId info = (MessageId)o; @@ -95,7 +95,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageId info = (MessageId)o; @@ -112,7 +112,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); MessageId info = (MessageId)o; @@ -126,7 +126,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { MessageId info = (MessageId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java index db867f1c55..6ec48684a2 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessageMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); Message info = (Message)o; @@ -141,7 +141,7 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); Message info = (Message)o; @@ -183,7 +183,7 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); Message info = (Message)o; @@ -236,7 +236,7 @@ public abstract class MessageMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { Message info = (Message)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java index c584789610..29611431b1 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MessagePullMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class MessagePullMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessagePull info = (MessagePull)o; @@ -95,7 +95,7 @@ public class MessagePullMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessagePull info = (MessagePull)o; @@ -112,7 +112,7 @@ public class MessagePullMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); MessagePull info = (MessagePull)o; @@ -126,7 +126,7 @@ public class MessagePullMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { MessagePull info = (MessagePull)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java index 8d292974e5..6a809f178f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); NetworkBridgeFilter info = (NetworkBridgeFilter)o; @@ -92,7 +92,7 @@ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); NetworkBridgeFilter info = (NetworkBridgeFilter)o; @@ -108,7 +108,7 @@ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); NetworkBridgeFilter info = (NetworkBridgeFilter)o; @@ -121,7 +121,7 @@ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { NetworkBridgeFilter info = (NetworkBridgeFilter)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java index cc004d38c6..912334060f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/PartialCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class PartialCommandMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); PartialCommand info = (PartialCommand)o; @@ -92,7 +92,7 @@ public class PartialCommandMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); PartialCommand info = (PartialCommand)o; @@ -108,7 +108,7 @@ public class PartialCommandMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); PartialCommand info = (PartialCommand)o; @@ -121,7 +121,7 @@ public class PartialCommandMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { PartialCommand info = (PartialCommand)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java index 903452ace1..3bc5a96a80 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ProducerId info = (ProducerId)o; @@ -95,7 +95,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ProducerId info = (ProducerId)o; @@ -112,7 +112,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ProducerId info = (ProducerId)o; @@ -126,7 +126,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ProducerId info = (ProducerId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java index a4ef5bda55..b11835c18b 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ProducerInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ProducerInfo info = (ProducerInfo)o; @@ -106,7 +106,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ProducerInfo info = (ProducerInfo)o; @@ -123,7 +123,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ProducerInfo info = (ProducerInfo)o; @@ -148,7 +148,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ProducerInfo info = (ProducerInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java index 243548b14c..0da53370af 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); RemoveInfo info = (RemoveInfo)o; @@ -91,7 +91,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); RemoveInfo info = (RemoveInfo)o; @@ -106,7 +106,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); RemoveInfo info = (RemoveInfo)o; @@ -118,7 +118,7 @@ public class RemoveInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { RemoveInfo info = (RemoveInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java index 3e8a0fa157..2041a87700 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; @@ -95,7 +95,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; @@ -112,7 +112,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; @@ -126,7 +126,7 @@ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java index faed81d4c5..25637658ca 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ReplayCommandMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ReplayCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ReplayCommand info = (ReplayCommand)o; @@ -91,7 +91,7 @@ public class ReplayCommandMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ReplayCommand info = (ReplayCommand)o; @@ -107,7 +107,7 @@ public class ReplayCommandMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); ReplayCommand info = (ReplayCommand)o; @@ -120,7 +120,7 @@ public class ReplayCommandMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { ReplayCommand info = (ReplayCommand)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java index eb0c4c5459..734c6f828e 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ResponseMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ResponseMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); Response info = (Response)o; @@ -90,7 +90,7 @@ public class ResponseMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); Response info = (Response)o; @@ -105,7 +105,7 @@ public class ResponseMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); Response info = (Response)o; @@ -117,7 +117,7 @@ public class ResponseMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { Response info = (Response)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java index 33ed6b8b6e..ed2246711f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); SessionId info = (SessionId)o; @@ -93,7 +93,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); SessionId info = (SessionId)o; @@ -109,7 +109,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); SessionId info = (SessionId)o; @@ -122,7 +122,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { SessionId info = (SessionId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java index 5d101fdc9e..1188e7e707 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SessionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); SessionInfo info = (SessionInfo)o; @@ -91,7 +91,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); SessionInfo info = (SessionInfo)o; @@ -106,7 +106,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); SessionInfo info = (SessionInfo)o; @@ -118,7 +118,7 @@ public class SessionInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { SessionInfo info = (SessionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java index 59d47a96bb..f2f9fb47bc 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ShutdownInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class ShutdownInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -85,7 +85,7 @@ public class ShutdownInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -97,7 +97,7 @@ public class ShutdownInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -106,7 +106,7 @@ public class ShutdownInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java index 4beb4a317c..464b3ebacf 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/SubscriptionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); SubscriptionInfo info = (SubscriptionInfo)o; @@ -97,7 +97,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); SubscriptionInfo info = (SubscriptionInfo)o; @@ -115,7 +115,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); SubscriptionInfo info = (SubscriptionInfo)o; @@ -130,7 +130,7 @@ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { SubscriptionInfo info = (SubscriptionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java index 5397c4ea34..c8646a4aff 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -47,7 +47,7 @@ public abstract class TransactionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); } @@ -70,7 +70,7 @@ public abstract class TransactionIdMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); } @@ -82,7 +82,7 @@ public abstract class TransactionIdMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); } @@ -91,7 +91,7 @@ public abstract class TransactionIdMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { super.looseMarshal(wireFormat, o, dataOut); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java index 1c7d418d37..7b3658dc61 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/TransactionInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); TransactionInfo info = (TransactionInfo)o; @@ -94,7 +94,7 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); TransactionInfo info = (TransactionInfo)o; @@ -111,7 +111,7 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); TransactionInfo info = (TransactionInfo)o; @@ -125,7 +125,7 @@ public class TransactionInfoMarshaller extends BaseCommandMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { TransactionInfo info = (TransactionInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java index 40281c5c41..612d9da8cc 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/WireFormatInfoMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); WireFormatInfo info = (WireFormatInfo)o; @@ -101,7 +101,7 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); WireFormatInfo info = (WireFormatInfo)o; @@ -120,7 +120,7 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); WireFormatInfo info = (WireFormatInfo)o; @@ -139,7 +139,7 @@ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { WireFormatInfo info = (WireFormatInfo)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java index 90eaf7c630..e65e6846a9 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/XATransactionIdMarshaller.java @@ -18,8 +18,8 @@ package org.apache.activemq.openwire.v2; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.openwire.*; @@ -62,7 +62,7 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); XATransactionId info = (XATransactionId)o; @@ -94,7 +94,7 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller { * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); XATransactionId info = (XATransactionId)o; @@ -111,7 +111,7 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller { * @param dataIn the data input stream to build the object from * @throws IOException */ - public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); XATransactionId info = (XATransactionId)o; @@ -125,7 +125,7 @@ public class XATransactionIdMarshaller extends TransactionIdMarshaller { /** * Write the booleans that this object uses to a BooleanStream */ - public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException { XATransactionId info = (XATransactionId)o; diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java index afbc565554..c976c7e188 100644 --- a/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java @@ -17,7 +17,9 @@ */ package org.apache.activemq.transport.stomp; +import java.io.DataInput; import java.io.DataInputStream; +import java.io.DataOutput; import java.io.DataOutputStream; import java.io.IOException; import java.util.HashMap; @@ -58,7 +60,7 @@ public class StompWireFormat implements WireFormat { return unmarshal(dis); } - public void marshal(Object command, DataOutputStream os) throws IOException { + public void marshal(Object command, DataOutput os) throws IOException { StompFrame stomp = (org.apache.activemq.transport.stomp.StompFrame) command; StringBuffer buffer = new StringBuffer(); @@ -83,7 +85,7 @@ public class StompWireFormat implements WireFormat { } - public Object unmarshal(DataInputStream in) throws IOException { + public Object unmarshal(DataInput in) throws IOException { try { String action = null; @@ -179,7 +181,7 @@ public class StompWireFormat implements WireFormat { } - private String readLine(DataInputStream in, int maxLength, String errorMessage) throws IOException { + private String readLine(DataInput in, int maxLength, String errorMessage) throws IOException { byte b; ByteArrayOutputStream baos=new ByteArrayOutputStream(maxLength); while ((b = in.readByte()) != '\n') { diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java b/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java index 420e374b47..e9d8075a01 100644 --- a/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java +++ b/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java @@ -17,10 +17,14 @@ */ package org.apache.activemq.wireformat; +import java.io.DataInput; import java.io.DataInputStream; +import java.io.DataOutput; import java.io.DataOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectOutputStream; +import java.io.OutputStream; import org.apache.activemq.util.ByteArrayInputStream; import org.apache.activemq.util.ByteArrayOutputStream; @@ -46,16 +50,16 @@ public class ObjectStreamWireFormat implements WireFormat { return unmarshal(new DataInputStream(new ByteArrayInputStream(packet))); } - public void marshal(Object command, DataOutputStream ds) throws IOException { - ObjectOutputStream out = new ObjectOutputStream(ds); + public void marshal(Object command, DataOutput ds) throws IOException { + ObjectOutputStream out = new ObjectOutputStream((OutputStream)ds); out.writeObject(command); out.flush(); out.reset(); } - public Object unmarshal(DataInputStream ds) throws IOException { + public Object unmarshal(DataInput ds) throws IOException { try { - ClassLoadingAwareObjectInputStream in = new ClassLoadingAwareObjectInputStream(ds); + ClassLoadingAwareObjectInputStream in = new ClassLoadingAwareObjectInputStream((InputStream)ds); Object command; command = in.readObject(); in.close(); diff --git a/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java b/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java index a04f186058..b1fe49982e 100644 --- a/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java +++ b/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java @@ -17,8 +17,8 @@ */ package org.apache.activemq.wireformat; -import java.io.DataInputStream; -import java.io.DataOutputStream; +import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.util.ByteSequence; @@ -45,12 +45,12 @@ public interface WireFormat { /** * Stream based marshaling */ - void marshal(Object command, DataOutputStream out) throws IOException; + void marshal(Object command, DataOutput out) throws IOException; /** * Packet based un-marshaling */ - Object unmarshal(DataInputStream in) throws IOException; + Object unmarshal(DataInput in) throws IOException; /** * @param the version of the wire format diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java index ae0f5f1855..762c7312c5 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java @@ -58,7 +58,7 @@ public class ConsumerInfoTest extends BaseCommandTestSupport { info.setMaximumPendingMessageLimit(2); info.setDispatchAsync(false); info.setSelector("Selector:3"); - info.setSubscriptionName("SubcriptionName:4"); + info.setSubscriptionName("SubscriptionName:4"); info.setNoLocal(true); info.setExclusive(false); info.setRetroactive(true);