You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/12/12 14:33:07 UTC
svn commit: r1420665 [3/7] - in /qpid/proton/trunk/proton-j:
contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/
contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/
proton/src/main/java/org/apache/qpid/proton/amq...
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declared.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declared.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declared.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declared.java Wed Dec 12 13:32:32 2012
@@ -21,28 +21,16 @@
*/
-package org.apache.qpid.proton.type.transaction;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.transaction;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.messaging.Outcome;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-public class Declared
- implements DescribedType , org.apache.qpid.proton.type.transport.DeliveryState, org.apache.qpid.proton.type.messaging.Outcome
+public final class Declared
+ implements DeliveryState, Outcome
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000033L), Symbol.valueOf("amqp:declared:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000033L);
- private final DeclaredWrapper _wrapper = new DeclaredWrapper();
-
private Binary _txnId;
public Binary getTxnId()
@@ -59,91 +47,13 @@ public class Declared
_txnId = txnId;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _txnId;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return 1;
-
- }
-
-
- public final class DeclaredWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Declared.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Declared.this.size();
- }
- }
- private static class DeclaredConstructor implements DescribedTypeConstructor<Declared>
+ @Override
+ public String toString()
{
- public Declared newInstance(Object described)
- {
- List l = (List) described;
-
- Declared o = new Declared();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The txn-id field cannot be omitted");
- }
-
- switch(1 - l.size())
- {
-
- case 0:
- o.setTxnId( (Binary) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Declared> getTypeClass()
- {
- return Declared.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- DeclaredConstructor constructor = new DeclaredConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return "Declared{" +
+ "txnId=" + _txnId +
+ '}';
}
}
\ No newline at end of file
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Discharge.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Discharge.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Discharge.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Discharge.java Wed Dec 12 13:32:32 2012
@@ -21,28 +21,13 @@
*/
-package org.apache.qpid.proton.type.transaction;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.transaction;
+import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class Discharge
- implements DescribedType
+public final class Discharge
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000032L), Symbol.valueOf("amqp:discharge:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000032L);
- private final DischargeWrapper _wrapper = new DischargeWrapper();
-
private Binary _txnId;
private Boolean _fail;
@@ -70,97 +55,14 @@ public class Discharge
{
_fail = fail;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _txnId;
- case 1:
- return _fail;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _fail != null
- ? 2
- : 1;
-
- }
-
-
- public final class DischargeWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Discharge.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Discharge.this.size();
- }
- }
- private static class DischargeConstructor implements DescribedTypeConstructor<Discharge>
+ @Override
+ public String toString()
{
- public Discharge newInstance(Object described)
- {
- List l = (List) described;
-
- Discharge o = new Discharge();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The txn-id field cannot be omitted");
- }
-
- switch(2 - l.size())
- {
-
- case 0:
- o.setFail( (Boolean) l.get( 1 ) );
- case 1:
- o.setTxnId( (Binary) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Discharge> getTypeClass()
- {
- return Discharge.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- DischargeConstructor constructor = new DischargeConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return "Discharge{" +
+ "txnId=" + _txnId +
+ ", fail=" + _fail +
+ '}';
}
}
\ No newline at end of file
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/GlobalTxId.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/GlobalTxId.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/GlobalTxId.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/GlobalTxId.java Wed Dec 12 13:32:32 2012
@@ -18,8 +18,8 @@
* under the License.
*
*/
-package org.apache.qpid.proton.type.transaction;
+package org.apache.qpid.proton.amqp.transaction;
-public class GlobalTxId
+public interface GlobalTxId
{
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionErrors.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionErrors.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionErrors.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionErrors.java Wed Dec 12 13:32:32 2012
@@ -21,9 +21,9 @@
*/
-package org.apache.qpid.proton.type.transaction;
+package org.apache.qpid.proton.amqp.transaction;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.Symbol;
public interface TransactionErrors
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionalState.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionalState.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionalState.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionalState.java Wed Dec 12 13:32:32 2012
@@ -21,28 +21,16 @@
*/
-package org.apache.qpid.proton.type.transaction;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.transaction;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
+import org.apache.qpid.proton.amqp.messaging.Outcome;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-import org.apache.qpid.proton.type.messaging.Outcome;
-
-public class TransactionalState
- implements DescribedType , org.apache.qpid.proton.type.transport.DeliveryState
+public final class TransactionalState
+ implements DeliveryState
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000034L), Symbol.valueOf("amqp:transactional-state:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000034L);
- private final TransactionalStateWrapper _wrapper = new TransactionalStateWrapper();
-
private Binary _txnId;
private Outcome _outcome;
@@ -70,97 +58,14 @@ public class TransactionalState
{
_outcome = outcome;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
+ @Override
+ public String toString()
{
-
- switch(index)
- {
- case 0:
- return _txnId;
- case 1:
- return _outcome;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _outcome != null
- ? 2
- : 1;
-
- }
-
-
- public final class TransactionalStateWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return TransactionalState.this.get(index);
- }
-
- @Override
- public int size()
- {
- return TransactionalState.this.size();
- }
- }
-
- private static class TransactionalStateConstructor implements DescribedTypeConstructor<TransactionalState>
- {
- public TransactionalState newInstance(Object described)
- {
- List l = (List) described;
-
- TransactionalState o = new TransactionalState();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The txn-id field cannot be omitted");
- }
-
- switch(2 - l.size())
- {
-
- case 0:
- o.setOutcome( (Outcome) l.get( 1 ) );
- case 1:
- o.setTxnId( (Binary) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<TransactionalState> getTypeClass()
- {
- return TransactionalState.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- TransactionalStateConstructor constructor = new TransactionalStateConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return "TransactionalState{" +
+ "txnId=" + _txnId +
+ ", outcome=" + _outcome +
+ '}';
}
}
\ No newline at end of file
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TxnCapability.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TxnCapability.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TxnCapability.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/TxnCapability.java Wed Dec 12 13:32:32 2012
@@ -21,9 +21,9 @@
*/
-package org.apache.qpid.proton.type.transaction;
+package org.apache.qpid.proton.amqp.transaction;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.Symbol;
public interface TxnCapability
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/AmqpError.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/AmqpError.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/AmqpError.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/AmqpError.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/AmqpError.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/AmqpError.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/AmqpError.java Wed Dec 12 13:32:32 2012
@@ -21,9 +21,9 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.Symbol;
public interface AmqpError
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Attach.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Attach.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Attach.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Attach.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Attach.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Attach.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Attach.java Wed Dec 12 13:32:32 2012
@@ -21,40 +21,24 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.DescribedType;
-import org.apache.qpid.proton.type.Symbol;
-import org.apache.qpid.proton.type.UnsignedByte;
-import org.apache.qpid.proton.type.UnsignedInteger;
-import org.apache.qpid.proton.type.UnsignedLong;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.UnsignedLong;
-import java.util.AbstractList;
import java.util.Arrays;
-import java.util.List;
import java.util.Map;
-
-public class Attach
- implements DescribedType , FrameBody
+public final class Attach implements FrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000012L), Symbol.valueOf("amqp:attach:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000012L);
- private final AttachWrapper _wrapper = new AttachWrapper();
private String _name;
private UnsignedInteger _handle;
- private boolean _role;
- private UnsignedByte _sndSettleMode = UnsignedByte.valueOf((byte) 2);
- private UnsignedByte _rcvSettleMode = UnsignedByte.valueOf((byte) 0);
+ private Role _role = Role.SENDER;
+ private SenderSettleMode _sndSettleMode = SenderSettleMode.MIXED;
+ private ReceiverSettleMode _rcvSettleMode = ReceiverSettleMode.FIRST;
private Source _source;
private Target _target;
private Map _unsettled;
@@ -95,34 +79,38 @@ public class Attach
_handle = handle;
}
- public boolean getRole()
+ public Role getRole()
{
return _role;
}
- public void setRole(boolean role)
+ public void setRole(Role role)
{
+ if(role == null)
+ {
+ throw new NullPointerException("Role cannot be null");
+ }
_role = role;
}
- public UnsignedByte getSndSettleMode()
+ public SenderSettleMode getSndSettleMode()
{
return _sndSettleMode;
}
- public void setSndSettleMode(UnsignedByte sndSettleMode)
+ public void setSndSettleMode(SenderSettleMode sndSettleMode)
{
- _sndSettleMode = sndSettleMode;
+ _sndSettleMode = sndSettleMode == null ? SenderSettleMode.MIXED : sndSettleMode;
}
- public UnsignedByte getRcvSettleMode()
+ public ReceiverSettleMode getRcvSettleMode()
{
return _rcvSettleMode;
}
- public void setRcvSettleMode(UnsignedByte rcvSettleMode)
+ public void setRcvSettleMode(ReceiverSettleMode rcvSettleMode)
{
- _rcvSettleMode = rcvSettleMode;
+ _rcvSettleMode = rcvSettleMode == null ? ReceiverSettleMode.FIRST : rcvSettleMode;
}
public Source getSource()
@@ -215,197 +203,19 @@ public class Attach
_properties = properties;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _name;
- case 1:
- return _handle;
- case 2:
- return _role;
- case 3:
- return _sndSettleMode;
- case 4:
- return _rcvSettleMode;
- case 5:
- return _source;
- case 6:
- return _target;
- case 7:
- return _unsettled;
- case 8:
- return _incompleteUnsettled;
- case 9:
- return _initialDeliveryCount;
- case 10:
- return _maxMessageSize;
- case 11:
- return _offeredCapabilities;
- case 12:
- return _desiredCapabilities;
- case 13:
- return _properties;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _properties != null
- ? 14
- : _desiredCapabilities != null
- ? 13
- : _offeredCapabilities != null
- ? 12
- : _maxMessageSize != null
- ? 11
- : _initialDeliveryCount != null
- ? 10
- : (_incompleteUnsettled != false)
- ? 9
- : _unsettled != null
- ? 8
- : _target != null
- ? 7
- : _source != null
- ? 6
- : (_rcvSettleMode != null && !_rcvSettleMode.equals(ReceiverSettleMode.FIRST))
- ? 5
- : (_sndSettleMode != null && !_sndSettleMode.equals(SenderSettleMode.MIXED))
- ? 4
- : 3;
-
- }
-
-
- public final class AttachWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Attach.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Attach.this.size();
- }
- }
-
- private static class AttachConstructor implements DescribedTypeConstructor<Attach>
- {
- public Attach newInstance(Object described)
- {
- List l = (List) described;
-
- Attach o = new Attach();
-
- if(l.size() <= 2)
- {
- throw new DecodeException("The role field cannot be omitted");
- }
-
- switch(14 - l.size())
- {
-
- case 0:
- o.setProperties( (Map) l.get( 13 ) );
- case 1:
- Object val1 = l.get( 12 );
- if( val1 == null || val1.getClass().isArray() )
- {
- o.setDesiredCapabilities( (Symbol[]) val1 );
- }
- else
- {
- o.setDesiredCapabilities( (Symbol) val1 );
- }
- case 2:
- Object val2 = l.get( 11 );
- if( val2 == null || val2.getClass().isArray() )
- {
- o.setOfferedCapabilities( (Symbol[]) val2 );
- }
- else
- {
- o.setOfferedCapabilities( (Symbol) val2 );
- }
- case 3:
- o.setMaxMessageSize( (UnsignedLong) l.get( 10 ) );
- case 4:
- o.setInitialDeliveryCount( (UnsignedInteger) l.get( 9 ) );
- case 5:
- Boolean incompleteUnsettled = (Boolean) l.get(8);
- o.setIncompleteUnsettled(incompleteUnsettled == null ? false : incompleteUnsettled);
- case 6:
- o.setUnsettled( (Map) l.get( 7 ) );
- case 7:
- o.setTarget( (Target) l.get( 6 ) );
- case 8:
- o.setSource( (Source) l.get( 5 ) );
- case 9:
- UnsignedByte rcvSettleMode = (UnsignedByte) l.get(4);
- o.setRcvSettleMode(rcvSettleMode == null ? ReceiverSettleMode.FIRST : rcvSettleMode);
- case 10:
- UnsignedByte sndSettleMode = (UnsignedByte) l.get(3);
- o.setSndSettleMode(sndSettleMode == null ? SenderSettleMode.MIXED : sndSettleMode);
- case 11:
- o.setRole( (Boolean) l.get( 2 ) );
- case 12:
- o.setHandle( (UnsignedInteger) l.get( 1 ) );
- case 13:
- o.setName( (String) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Attach> getTypeClass()
- {
- return Attach.class;
- }
- }
-
public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
{
handler.handleAttach(this, payload, context);
}
- public static void register(Decoder decoder)
- {
- AttachConstructor constructor = new AttachConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
return "Attach{" +
"name='" + _name + '\'' +
", handle=" + _handle +
- ", role=" + (_role ? "RECEIVER" : "SENDER") +
+ ", role=" + _role +
", sndSettleMode=" + _sndSettleMode +
", rcvSettleMode=" + _rcvSettleMode +
", source=" + _source +
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Begin.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Begin.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Begin.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Begin.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Begin.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Begin.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Begin.java Wed Dec 12 13:32:32 2012
@@ -21,35 +21,20 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.DescribedType;
-import org.apache.qpid.proton.type.Symbol;
-import org.apache.qpid.proton.type.UnsignedInteger;
-import org.apache.qpid.proton.type.UnsignedLong;
-import org.apache.qpid.proton.type.UnsignedShort;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.UnsignedShort;
-import java.util.AbstractList;
import java.util.Arrays;
-import java.util.List;
import java.util.Map;
-public class Begin
- implements DescribedType , FrameBody
+public final class Begin implements FrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000011L), Symbol.valueOf("amqp:begin:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000011L);
- private final BeginWrapper _wrapper = new BeginWrapper();
-
private UnsignedShort _remoteChannel;
private UnsignedInteger _nextOutgoingId;
private UnsignedInteger _incomingWindow;
@@ -153,135 +138,6 @@ public class Begin
{
_properties = properties;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _remoteChannel;
- case 1:
- return _nextOutgoingId;
- case 2:
- return _incomingWindow;
- case 3:
- return _outgoingWindow;
- case 4:
- return _handleMax;
- case 5:
- return _offeredCapabilities;
- case 6:
- return _desiredCapabilities;
- case 7:
- return _properties;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _properties != null
- ? 8
- : _desiredCapabilities != null
- ? 7
- : _offeredCapabilities != null
- ? 6
- : (_handleMax != null && !_handleMax.equals(UnsignedInteger.MAX_VALUE))
- ? 5
- : 4;
-
- }
-
-
- public final class BeginWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Begin.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Begin.this.size();
- }
- }
-
- private static class BeginConstructor implements DescribedTypeConstructor<Begin>
- {
- public Begin newInstance(Object described)
- {
- List l = (List) described;
-
- Begin o = new Begin();
-
- if(l.size() <= 3)
- {
- throw new DecodeException("The outgoing-window field cannot be omitted");
- }
-
- switch(8 - l.size())
- {
-
- case 0:
- o.setProperties( (Map) l.get( 7 ) );
- case 1:
- Object val1 = l.get( 6 );
- if( val1 == null || val1.getClass().isArray() )
- {
- o.setDesiredCapabilities( (Symbol[]) val1 );
- }
- else
- {
- o.setDesiredCapabilities( (Symbol) val1 );
- }
- case 2:
- Object val2 = l.get( 5 );
- if( val2 == null || val2.getClass().isArray() )
- {
- o.setOfferedCapabilities( (Symbol[]) val2 );
- }
- else
- {
- o.setOfferedCapabilities( (Symbol) val2 );
- }
- case 3:
- UnsignedInteger handleMax = (UnsignedInteger) l.get(4);
- o.setHandleMax(handleMax == null ? UnsignedInteger.MAX_VALUE : handleMax);
- case 4:
- o.setOutgoingWindow( (UnsignedInteger) l.get( 3 ) );
- case 5:
- o.setIncomingWindow( (UnsignedInteger) l.get( 2 ) );
- case 6:
- o.setNextOutgoingId( (UnsignedInteger) l.get( 1 ) );
- case 7:
- o.setRemoteChannel( (UnsignedShort) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Begin> getTypeClass()
- {
- return Begin.class;
- }
- }
public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
{
@@ -289,15 +145,6 @@ public class Begin
}
- public static void register(Decoder decoder)
- {
- BeginConstructor constructor = new BeginConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Close.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Close.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Close.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Close.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Close.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Close.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Close.java Wed Dec 12 13:32:32 2012
@@ -21,128 +21,29 @@
*/
-package org.apache.qpid.proton.type.transport;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.transport;
+import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class Close
- implements DescribedType , FrameBody
+public final class Close implements FrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000018L), Symbol.valueOf("amqp:close:list"),
- };
+ private ErrorCondition _error;
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000018L);
- private final CloseWrapper _wrapper = new CloseWrapper();
-
- private Error _error;
-
- public Error getError()
+ public ErrorCondition getError()
{
return _error;
}
- public void setError(Error error)
+ public void setError(ErrorCondition error)
{
_error = error;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _error;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _error != null
- ? 1
- : 0;
-
- }
-
-
- public final class CloseWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Close.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Close.this.size();
- }
- }
-
- private static class CloseConstructor implements DescribedTypeConstructor<Close>
- {
- public Close newInstance(Object described)
- {
- List l = (List) described;
-
- Close o = new Close();
-
-
- switch(1 - l.size())
- {
-
- case 0:
- o.setError( (Error) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Close> getTypeClass()
- {
- return Close.class;
- }
- }
public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
{
handler.handleClose(this, payload, context);
}
-
- public static void register(Decoder decoder)
- {
- CloseConstructor constructor = new CloseConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ConnectionError.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/ConnectionError.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ConnectionError.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ConnectionError.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/ConnectionError.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/ConnectionError.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ConnectionError.java Wed Dec 12 13:32:32 2012
@@ -21,9 +21,9 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.Symbol;
public interface ConnectionError
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/DeliveryState.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/DeliveryState.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/DeliveryState.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/DeliveryState.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/DeliveryState.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/DeliveryState.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/DeliveryState.java Wed Dec 12 13:32:32 2012
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
public interface DeliveryState
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Detach.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Detach.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Detach.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Detach.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Detach.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Detach.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Detach.java Wed Dec 12 13:32:32 2012
@@ -21,31 +21,17 @@
*/
-package org.apache.qpid.proton.type.transport;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.transport;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class Detach
- implements DescribedType , FrameBody
+public final class Detach implements FrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000016L), Symbol.valueOf("amqp:detach:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000016L);
- private final DetachWrapper _wrapper = new DetachWrapper();
-
private UnsignedInteger _handle;
private boolean _closed;
- private Error _error;
+ private ErrorCondition _error;
public UnsignedInteger getHandle()
{
@@ -72,120 +58,21 @@ public class Detach
_closed = closed;
}
- public Error getError()
+ public ErrorCondition getError()
{
return _error;
}
- public void setError(Error error)
+ public void setError(ErrorCondition error)
{
_error = error;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _handle;
- case 1:
- return _closed;
- case 2:
- return _error;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _error != null
- ? 3
- : (_closed != false)
- ? 2
- : 1;
-
- }
-
-
- public final class DetachWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Detach.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Detach.this.size();
- }
- }
-
- private static class DetachConstructor implements DescribedTypeConstructor<Detach>
- {
- public Detach newInstance(Object described)
- {
- List l = (List) described;
-
- Detach o = new Detach();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The handle field cannot be omitted");
- }
-
- switch(3 - l.size())
- {
-
- case 0:
- o.setError( (Error) l.get( 2 ) );
- case 1:
- Boolean closed = (Boolean) l.get(1);
- o.setClosed(closed == null ? false : closed);
- case 2:
- o.setHandle( (UnsignedInteger) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Detach> getTypeClass()
- {
- return Detach.class;
- }
- }
-
public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
{
handler.handleDetach(this, payload, context);
}
-
- public static void register(Decoder decoder)
- {
- DetachConstructor constructor = new DetachConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Disposition.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Disposition.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Disposition.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Disposition.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Disposition.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Disposition.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Disposition.java Wed Dec 12 13:32:32 2012
@@ -21,42 +21,31 @@
*/
-package org.apache.qpid.proton.type.transport;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.transport;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class Disposition
- implements DescribedType , FrameBody
+public final class Disposition implements FrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000015L), Symbol.valueOf("amqp:disposition:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000015L);
- private final DispositionWrapper _wrapper = new DispositionWrapper();
-
- private boolean _role;
+ private Role _role = Role.SENDER;
private UnsignedInteger _first;
private UnsignedInteger _last;
private boolean _settled;
private DeliveryState _state;
private boolean _batchable;
- public boolean getRole()
+ public Role getRole()
{
return _role;
}
- public void setRole(boolean role)
+ public void setRole(Role role)
{
+ if(role == null)
+ {
+ throw new NullPointerException("Role cannot be null");
+ }
_role = role;
}
@@ -115,132 +104,16 @@ public class Disposition
_batchable = batchable;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _role;
- case 1:
- return _first;
- case 2:
- return _last;
- case 3:
- return _settled;
- case 4:
- return _state;
- case 5:
- return _batchable;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return (_batchable != false)
- ? 6
- : _state != null
- ? 5
- : (_settled != false)
- ? 4
- : _last != null
- ? 3
- : 2;
-
- }
-
-
- public final class DispositionWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Disposition.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Disposition.this.size();
- }
- }
-
- private static class DispositionConstructor implements DescribedTypeConstructor<Disposition>
- {
- public Disposition newInstance(Object described)
- {
- List l = (List) described;
-
- Disposition o = new Disposition();
-
- if(l.size() <= 1)
- {
- throw new DecodeException("The first field cannot be omitted");
- }
-
- switch(6 - l.size())
- {
-
- case 0:
- Boolean batchable = (Boolean) l.get(5);
- o.setBatchable(batchable == null ? false : batchable);
- case 1:
- o.setState( (DeliveryState) l.get( 4 ) );
- case 2:
- Boolean settled = (Boolean) l.get(3);
- o.setSettled(settled == null ? false : settled);
- case 3:
- o.setLast( (UnsignedInteger) l.get( 2 ) );
- case 4:
- o.setFirst( (UnsignedInteger) l.get( 1 ) );
- case 5:
- o.setRole( (Boolean) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Disposition> getTypeClass()
- {
- return Disposition.class;
- }
- }
-
public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
{
handler.handleDisposition(this, payload, context);
}
-
- public static void register(Decoder decoder)
- {
- DispositionConstructor constructor = new DispositionConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
return "Disposition{" +
- "role=" + (_role ? "RECIEVER" : "SENDER") +
+ "role=" + _role +
", first=" + _first +
", last=" + _last +
", settled=" + _settled +
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/End.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/End.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/End.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/End.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/End.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/End.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/End.java Wed Dec 12 13:32:32 2012
@@ -21,128 +21,29 @@
*/
-package org.apache.qpid.proton.type.transport;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.transport;
+import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class End
- implements DescribedType , FrameBody
+public final class End implements FrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000017L), Symbol.valueOf("amqp:end:list"),
- };
+ private ErrorCondition _error;
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000017L);
- private final EndWrapper _wrapper = new EndWrapper();
-
- private Error _error;
-
- public Error getError()
+ public ErrorCondition getError()
{
return _error;
}
- public void setError(Error error)
+ public void setError(ErrorCondition error)
{
_error = error;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _error;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _error != null
- ? 1
- : 0;
-
- }
-
-
- public final class EndWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return End.this.get(index);
- }
-
- @Override
- public int size()
- {
- return End.this.size();
- }
- }
-
- private static class EndConstructor implements DescribedTypeConstructor<End>
- {
- public End newInstance(Object described)
- {
- List l = (List) described;
-
- End o = new End();
-
-
- switch(1 - l.size())
- {
-
- case 0:
- o.setError( (Error) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<End> getTypeClass()
- {
- return End.class;
- }
- }
public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
{
handler.handleEnd(this, payload, context);
}
-
- public static void register(Decoder decoder)
- {
- EndConstructor constructor = new EndConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ErrorCondition.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Error.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ErrorCondition.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ErrorCondition.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Error.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Error.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ErrorCondition.java Wed Dec 12 13:32:32 2012
@@ -21,29 +21,15 @@
*/
-package org.apache.qpid.proton.type.transport;
-import java.util.Map;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.transport;
+import java.util.Map;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.Symbol;
-public class Error
- implements DescribedType
+public final class ErrorCondition
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x000000000000001dL), Symbol.valueOf("amqp:error:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x000000000000001dL);
- private final ErrorWrapper _wrapper = new ErrorWrapper();
-
private Symbol _condition;
private String _description;
private Map _info;
@@ -82,104 +68,6 @@ public class Error
{
_info = info;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _condition;
- case 1:
- return _description;
- case 2:
- return _info;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _info != null
- ? 3
- : _description != null
- ? 2
- : 1;
-
- }
-
-
- public final class ErrorWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Error.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Error.this.size();
- }
- }
-
- private static class ErrorConstructor implements DescribedTypeConstructor<Error>
- {
- public Error newInstance(Object described)
- {
- List l = (List) described;
-
- Error o = new Error();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The condition field cannot be omitted");
- }
-
- switch(3 - l.size())
- {
-
- case 0:
- o.setInfo( (Map) l.get( 2 ) );
- case 1:
- o.setDescription( (String) l.get( 1 ) );
- case 2:
- o.setCondition( (Symbol) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Error> getTypeClass()
- {
- return Error.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- ErrorConstructor constructor = new ErrorConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
@Override
public String toString()
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Flow.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Flow.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Flow.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Flow.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Flow.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Flow.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Flow.java Wed Dec 12 13:32:32 2012
@@ -21,29 +21,15 @@
*/
-package org.apache.qpid.proton.type.transport;
-import java.util.Map;
-import java.util.List;
-import java.util.AbstractList;
-
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
+import java.util.Map;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
-public class Flow
- implements DescribedType , FrameBody
+public final class Flow implements FrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000013L), Symbol.valueOf("amqp:flow:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000013L);
- private final FlowWrapper _wrapper = new FlowWrapper();
-
private UnsignedInteger _nextIncomingId;
private UnsignedInteger _incomingWindow;
private UnsignedInteger _nextOutgoingId;
@@ -180,154 +166,12 @@ public class Flow
{
_properties = properties;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _nextIncomingId;
- case 1:
- return _incomingWindow;
- case 2:
- return _nextOutgoingId;
- case 3:
- return _outgoingWindow;
- case 4:
- return _handle;
- case 5:
- return _deliveryCount;
- case 6:
- return _linkCredit;
- case 7:
- return _available;
- case 8:
- return _drain;
- case 9:
- return _echo;
- case 10:
- return _properties;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _properties != null
- ? 11
- : (_echo != false)
- ? 10
- : (_drain != false)
- ? 9
- : _available != null
- ? 8
- : _linkCredit != null
- ? 7
- : _deliveryCount != null
- ? 6
- : _handle != null
- ? 5
- : 4;
-
- }
-
-
- public final class FlowWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Flow.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Flow.this.size();
- }
- }
-
- private static class FlowConstructor implements DescribedTypeConstructor<Flow>
- {
- public Flow newInstance(Object described)
- {
- List l = (List) described;
-
- Flow o = new Flow();
-
- if(l.size() <= 3)
- {
- throw new DecodeException("The outgoing-window field cannot be omitted");
- }
-
- switch(11 - l.size())
- {
-
- case 0:
- o.setProperties( (Map) l.get( 10 ) );
- case 1:
- Boolean echo = (Boolean) l.get(9);
- o.setEcho(echo == null ? false : echo);
- case 2:
- Boolean drain = (Boolean) l.get(8);
- o.setDrain(drain == null ? false : drain );
- case 3:
- o.setAvailable( (UnsignedInteger) l.get( 7 ) );
- case 4:
- o.setLinkCredit( (UnsignedInteger) l.get( 6 ) );
- case 5:
- o.setDeliveryCount( (UnsignedInteger) l.get( 5 ) );
- case 6:
- o.setHandle( (UnsignedInteger) l.get( 4 ) );
- case 7:
- o.setOutgoingWindow( (UnsignedInteger) l.get( 3 ) );
- case 8:
- o.setNextOutgoingId( (UnsignedInteger) l.get( 2 ) );
- case 9:
- o.setIncomingWindow( (UnsignedInteger) l.get( 1 ) );
- case 10:
- o.setNextIncomingId( (UnsignedInteger) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Flow> getTypeClass()
- {
- return Flow.class;
- }
- }
public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
{
handler.handleFlow(this, payload, context);
}
-
- public static void register(Decoder decoder)
- {
- FlowConstructor constructor = new FlowConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/FrameBody.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/FrameBody.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/FrameBody.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/FrameBody.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/FrameBody.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/FrameBody.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/FrameBody.java Wed Dec 12 13:32:32 2012
@@ -1,4 +1,4 @@
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.qpid.proton.type.tran
*/
-import org.apache.qpid.proton.type.Binary;
+import org.apache.qpid.proton.amqp.Binary;
public interface FrameBody
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/LinkError.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/LinkError.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/LinkError.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/LinkError.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/LinkError.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/LinkError.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/LinkError.java Wed Dec 12 13:32:32 2012
@@ -21,9 +21,9 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.Symbol;
public interface LinkError
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Open.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Open.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Open.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Open.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Open.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Open.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Open.java Wed Dec 12 13:32:32 2012
@@ -21,35 +21,19 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.DescribedType;
-import org.apache.qpid.proton.type.Symbol;
-import org.apache.qpid.proton.type.UnsignedInteger;
-import org.apache.qpid.proton.type.UnsignedLong;
-import org.apache.qpid.proton.type.UnsignedShort;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.UnsignedShort;
-import java.util.AbstractList;
import java.util.Arrays;
-import java.util.List;
import java.util.Map;
-public class Open
- implements DescribedType , FrameBody
+public final class Open implements FrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000010L), Symbol.valueOf("amqp:open:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000010L);
- private final OpenWrapper _wrapper = new OpenWrapper();
-
private String _containerId;
private String _hostname;
private UnsignedInteger _maxFrameSize = UnsignedInteger.valueOf(0xffffffff);
@@ -165,186 +149,12 @@ public class Open
{
_properties = properties;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _containerId;
- case 1:
- return _hostname;
- case 2:
- return _maxFrameSize;
- case 3:
- return _channelMax;
- case 4:
- return _idleTimeOut;
- case 5:
- return _outgoingLocales;
- case 6:
- return _incomingLocales;
- case 7:
- return _offeredCapabilities;
- case 8:
- return _desiredCapabilities;
- case 9:
- return _properties;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _properties != null
- ? 10
- : _desiredCapabilities != null
- ? 9
- : _offeredCapabilities != null
- ? 8
- : _incomingLocales != null
- ? 7
- : _outgoingLocales != null
- ? 6
- : _idleTimeOut != null
- ? 5
- : (_channelMax != null && !_channelMax.equals(UnsignedShort.MAX_VALUE))
- ? 4
- : (_maxFrameSize != null && !_maxFrameSize.equals(UnsignedInteger.MAX_VALUE))
- ? 3
- : _hostname != null
- ? 2
- : 1;
-
- }
-
-
- public final class OpenWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Open.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Open.this.size();
- }
- }
-
- private static class OpenConstructor implements DescribedTypeConstructor<Open>
- {
- public Open newInstance(Object described)
- {
- List l = (List) described;
-
- Open o = new Open();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The container-id field cannot be omitted");
- }
-
- switch(10 - l.size())
- {
-
- case 0:
- o.setProperties( (Map) l.get( 9 ) );
- case 1:
- Object val1 = l.get( 8 );
- if( val1 == null || val1.getClass().isArray() )
- {
- o.setDesiredCapabilities( (Symbol[]) val1 );
- }
- else
- {
- o.setDesiredCapabilities( (Symbol) val1 );
- }
- case 2:
- Object val2 = l.get( 7 );
- if( val2 == null || val2.getClass().isArray() )
- {
- o.setOfferedCapabilities( (Symbol[]) val2 );
- }
- else
- {
- o.setOfferedCapabilities( (Symbol) val2 );
- }
- case 3:
- Object val3 = l.get( 6 );
- if( val3 == null || val3.getClass().isArray() )
- {
- o.setIncomingLocales( (Symbol[]) val3 );
- }
- else
- {
- o.setIncomingLocales( (Symbol) val3 );
- }
- case 4:
- Object val4 = l.get( 5 );
- if( val4 == null || val4.getClass().isArray() )
- {
- o.setOutgoingLocales( (Symbol[]) val4 );
- }
- else
- {
- o.setOutgoingLocales( (Symbol) val4 );
- }
- case 5:
- o.setIdleTimeOut( (UnsignedInteger) l.get( 4 ) );
- case 6:
- UnsignedShort channelMax = (UnsignedShort) l.get(3);
- o.setChannelMax(channelMax == null ? UnsignedShort.MAX_VALUE : channelMax);
- case 7:
- UnsignedInteger maxFrameSize = (UnsignedInteger) l.get(2);
- o.setMaxFrameSize(maxFrameSize == null ? UnsignedInteger.MAX_VALUE : maxFrameSize);
- case 8:
- o.setHostname( (String) l.get( 1 ) );
- case 9:
- o.setContainerId( (String) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Open> getTypeClass()
- {
- return Open.class;
- }
- }
public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
{
handler.handleOpen(this, payload, context);
}
-
- public static void register(Decoder decoder)
- {
- OpenConstructor constructor = new OpenConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ReceiverSettleMode.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/ReceiverSettleMode.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ReceiverSettleMode.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ReceiverSettleMode.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/ReceiverSettleMode.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/ReceiverSettleMode.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/ReceiverSettleMode.java Wed Dec 12 13:32:32 2012
@@ -21,14 +21,17 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.UnsignedByte;
-public interface ReceiverSettleMode
+public enum ReceiverSettleMode
{
- final static UnsignedByte FIRST = UnsignedByte.valueOf((byte) 0);
+ FIRST, SECOND;
- final static UnsignedByte SECOND = UnsignedByte.valueOf((byte) 1);
+ public UnsignedByte getValue()
+ {
+ return UnsignedByte.valueOf((byte)ordinal());
+ }
}
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Role.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Role.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Role.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Role.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Role.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Role.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Role.java Wed Dec 12 13:32:32 2012
@@ -21,12 +21,14 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-public interface Role
+public enum Role
{
- final static boolean SENDER = false;
-
- final static boolean RECEIVER = true;
+ SENDER, RECEIVER;
+ public boolean getValue()
+ {
+ return this == RECEIVER;
+ }
}
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SenderSettleMode.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/SenderSettleMode.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SenderSettleMode.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SenderSettleMode.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/SenderSettleMode.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/SenderSettleMode.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SenderSettleMode.java Wed Dec 12 13:32:32 2012
@@ -21,16 +21,17 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.UnsignedByte;
-public interface SenderSettleMode
+public enum SenderSettleMode
{
- final static UnsignedByte UNSETTLED = UnsignedByte.valueOf((byte) 0);
+ UNSETTLED, SETTLED, MIXED;
- final static UnsignedByte SETTLED = UnsignedByte.valueOf((byte) 1);
-
- final static UnsignedByte MIXED = UnsignedByte.valueOf((byte) 2);
+ public UnsignedByte getValue()
+ {
+ return UnsignedByte.valueOf((byte)ordinal());
+ }
}
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SessionError.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/SessionError.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SessionError.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SessionError.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/SessionError.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/SessionError.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/SessionError.java Wed Dec 12 13:32:32 2012
@@ -21,9 +21,9 @@
*/
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.Symbol;
public interface SessionError
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Source.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Source.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Source.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Source.java Wed Dec 12 13:32:32 2012
@@ -1,4 +1,4 @@
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Target.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Target.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Target.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Target.java Wed Dec 12 13:32:32 2012
@@ -1,4 +1,4 @@
-package org.apache.qpid.proton.type.transport;
+package org.apache.qpid.proton.amqp.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Transfer.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Transfer.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Transfer.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Transfer.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Transfer.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/transport/Transfer.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transport/Transfer.java Wed Dec 12 13:32:32 2012
@@ -21,35 +21,21 @@
*/
-package org.apache.qpid.proton.type.transport;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.transport;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.UnsignedByte;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
-import org.apache.qpid.proton.codec.DecodeException;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class Transfer
- implements DescribedType , FrameBody
+public final class Transfer implements FrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000014L), Symbol.valueOf("amqp:transfer:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000014L);
- private final TransferWrapper _wrapper = new TransferWrapper();
-
private UnsignedInteger _handle;
private UnsignedInteger _deliveryId;
private Binary _deliveryTag;
private UnsignedInteger _messageFormat;
private Boolean _settled;
private boolean _more;
- private UnsignedByte _rcvSettleMode;
+ private ReceiverSettleMode _rcvSettleMode;
private DeliveryState _state;
private boolean _resume;
private boolean _aborted;
@@ -120,12 +106,12 @@ public class Transfer
_more = more;
}
- public UnsignedByte getRcvSettleMode()
+ public ReceiverSettleMode getRcvSettleMode()
{
return _rcvSettleMode;
}
- public void setRcvSettleMode(UnsignedByte rcvSettleMode)
+ public void setRcvSettleMode(ReceiverSettleMode rcvSettleMode)
{
_rcvSettleMode = rcvSettleMode;
}
@@ -169,162 +155,12 @@ public class Transfer
{
_batchable = batchable;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _handle;
- case 1:
- return _deliveryId;
- case 2:
- return _deliveryTag;
- case 3:
- return _messageFormat;
- case 4:
- return _settled;
- case 5:
- return _more;
- case 6:
- return _rcvSettleMode;
- case 7:
- return _state;
- case 8:
- return _resume;
- case 9:
- return _aborted;
- case 10:
- return _batchable;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return (_batchable != false)
- ? 11
- : (_aborted != false)
- ? 10
- : (_resume != false)
- ? 9
- : _state != null
- ? 8
- : _rcvSettleMode != null
- ? 7
- : (_more != false)
- ? 6
- : _settled != null
- ? 5
- : _messageFormat != null
- ? 4
- : _deliveryTag != null
- ? 3
- : _deliveryId != null
- ? 2
- : 1;
-
- }
-
-
- public final class TransferWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Transfer.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Transfer.this.size();
- }
- }
-
- private static class TransferConstructor implements DescribedTypeConstructor<Transfer>
- {
- public Transfer newInstance(Object described)
- {
- List l = (List) described;
-
- Transfer o = new Transfer();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The handle field cannot be omitted");
- }
-
- switch(11 - l.size())
- {
-
- case 0:
- Boolean batchable = (Boolean) l.get(10);
- o.setBatchable(batchable == null ? false : batchable);
- case 1:
- Boolean aborted = (Boolean) l.get(9);
- o.setAborted(aborted == null ? false : aborted);
- case 2:
- Boolean resume = (Boolean) l.get(8);
- o.setResume(resume == null ? false : resume);
- case 3:
- o.setState( (DeliveryState) l.get( 7 ) );
- case 4:
- o.setRcvSettleMode( (UnsignedByte) l.get( 6 ) );
- case 5:
- Boolean more = (Boolean) l.get(5);
- o.setMore(more == null ? false : more );
- case 6:
- o.setSettled( (Boolean) l.get( 4 ) );
- case 7:
- o.setMessageFormat( (UnsignedInteger) l.get( 3 ) );
- case 8:
- o.setDeliveryTag( (Binary) l.get( 2 ) );
- case 9:
- o.setDeliveryId( (UnsignedInteger) l.get( 1 ) );
- case 10:
- o.setHandle( (UnsignedInteger) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Transfer> getTypeClass()
- {
- return Transfer.class;
- }
- }
public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
{
handler.handleTransfer(this, payload, context);
}
-
- public static void register(Decoder decoder)
- {
- TransferConstructor constructor = new TransferConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org