Author: rhs
Date: Sat Oct 13 23:48:32 2007
New Revision: 584499
URL: http://svn.apache.org/viewvc?rev=584499&view=rev
Log:
removed unused fields
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java?rev=584499&r1=584498&r2=584499&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
Sat Oct 13 23:48:32 2007
@@ -42,14 +42,10 @@
abstract class AbstractDecoder implements Decoder
{
- private final byte major;
- private final byte minor;
private int count;
- protected AbstractDecoder(byte major, byte minor)
+ protected AbstractDecoder()
{
- this.major = major;
- this.minor = minor;
this.count = 0;
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java?rev=584499&r1=584498&r2=584499&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
Sat Oct 13 23:48:32 2007
@@ -61,19 +61,9 @@
ENCODINGS.put(byte[].class, Type.LONG_BINARY);
}
- // XXX: no longer need major/minor
- private final byte major;
- private final byte minor;
-
- protected AbstractEncoder(byte major, byte minor)
- {
- this.major = major;
- this.minor = minor;
- }
-
protected Sizer sizer()
{
- return new SizeEncoder(major, minor);
+ return new SizeEncoder();
}
protected abstract void doPut(byte b);
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java?rev=584499&r1=584498&r2=584499&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
Sat Oct 13 23:48:32 2007
@@ -34,9 +34,8 @@
private final ByteBuffer in;
- public BBDecoder(byte major, byte minor, ByteBuffer in)
+ public BBDecoder(ByteBuffer in)
{
- super(major, minor);
this.in = in;
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java?rev=584499&r1=584498&r2=584499&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
Sat Oct 13 23:48:32 2007
@@ -34,8 +34,7 @@
private final ByteBuffer out;
- public BBEncoder(byte major, byte minor, ByteBuffer out) {
- super(major, minor);
+ public BBEncoder(ByteBuffer out) {
this.out = out;
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java?rev=584499&r1=584498&r2=584499&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
Sat Oct 13 23:48:32 2007
@@ -40,9 +40,8 @@
private final Iterator<ByteBuffer> fragments;
private ByteBuffer current;
- public FragmentDecoder(byte major, byte minor, Iterator<ByteBuffer>
fragments)
+ public FragmentDecoder(Iterator<ByteBuffer> fragments)
{
- super(major, minor);
this.fragments = fragments;
this.current = null;
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java?rev=584499&r1=584498&r2=584499&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
Sat Oct 13 23:48:32 2007
@@ -36,12 +36,11 @@
private int size;
- public SizeEncoder(byte major, byte minor) {
- this(major, minor, 0);
+ public SizeEncoder() {
+ this(0);
}
- public SizeEncoder(byte major, byte minor, int size) {
- super(major, minor);
+ public SizeEncoder(int size) {
this.size = size;
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java?rev=584499&r1=584498&r2=584499&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
Sat Oct 13 23:48:32 2007
@@ -49,15 +49,11 @@
{
private final Receiver<ConnectionEvent> receiver;
- private final byte major;
- private final byte minor;
private final Map<Integer,List<ByteBuffer>> segments;
- public Assembler(Receiver<ConnectionEvent> receiver, byte major, byte
minor)
+ public Assembler(Receiver<ConnectionEvent> receiver)
{
this.receiver = receiver;
- this.major = major;
- this.minor = minor;
segments = new HashMap<Integer,List<ByteBuffer>>();
}
@@ -159,8 +155,7 @@
private ProtocolEvent decode(byte type, List<ByteBuffer> segment)
{
- FragmentDecoder dec =
- new FragmentDecoder(major, minor, segment.iterator());
+ FragmentDecoder dec = new FragmentDecoder(segment.iterator());
switch (type)
{
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java?rev=584499&r1=584498&r2=584499&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
Sat Oct 13 23:48:32 2007
@@ -53,11 +53,8 @@
private final Sender<NetworkEvent> sender;
private final int maxPayload;
- private final byte major;
- private final byte minor;
- public Disassembler(Sender<NetworkEvent> sender, byte major, byte minor,
- int maxFrame)
+ public Disassembler(Sender<NetworkEvent> sender, int maxFrame)
{
if (maxFrame <= HEADER_SIZE || maxFrame >= 64*1024)
{
@@ -65,8 +62,6 @@
("maxFrame must be > HEADER_SIZE and < 64K: " + maxFrame);
}
this.sender = sender;
- this.major = major;
- this.minor = minor;
this.maxPayload = maxFrame - HEADER_SIZE;
}
@@ -116,14 +111,12 @@
public void method(ConnectionEvent event, Method method)
{
- SizeEncoder sizer = new SizeEncoder(major, minor);
+ SizeEncoder sizer = new SizeEncoder();
sizer.writeShort(method.getEncodedType());
method.write(sizer);
- sizer.flush();
- int size = sizer.getSize();
- ByteBuffer buf = ByteBuffer.allocate(size);
- BBEncoder enc = new BBEncoder(major, minor, buf);
+ ByteBuffer buf = ByteBuffer.allocate(sizer.size());
+ BBEncoder enc = new BBEncoder(buf);
enc.writeShort(method.getEncodedType());
method.write(enc);
enc.flush();
@@ -141,14 +134,14 @@
public void header(ConnectionEvent event, Header header)
{
- SizeEncoder sizer = new SizeEncoder(major, minor);
+ SizeEncoder sizer = new SizeEncoder();
for (Struct st : header.getStructs())
{
sizer.writeLongStruct(st);
}
- ByteBuffer buf = ByteBuffer.allocate(sizer.getSize());
- BBEncoder enc = new BBEncoder(major, minor, buf);
+ ByteBuffer buf = ByteBuffer.allocate(sizer.size());
+ BBEncoder enc = new BBEncoder(buf);
for (Struct st : header.getStructs())
{
enc.writeLongStruct(st);
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java?rev=584499&r1=584498&r2=584499&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
Sat Oct 13 23:48:32 2007
@@ -98,14 +98,13 @@
public void sessionOpened(final IoSession ssn)
{
log.debug("opened: %s", this);
- // XXX: hardcoded version + max-frame
+ // XXX: hardcoded max-frame
Connection conn = new Connection
(new Disassembler(new OutputHandler(new MinaSender(ssn)),
- (byte)0, (byte)10, 64*1024 - 1),
+ 64*1024 - 1),
delegate);
- // XXX: hardcoded version
Receiver<java.nio.ByteBuffer> receiver =
- new InputHandler(new Assembler(conn, (byte)0, (byte)10), state);
+ new InputHandler(new Assembler(conn), state);
ssn.setAttachment(new Attachment(conn, receiver));
// XXX
synchronized (ssn)
