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 [2/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...
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Header.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Header.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Header.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Header.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Header.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Header.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Header.java Wed Dec 12 13:32:32 2012
@@ -21,26 +21,15 @@
*/
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.messaging;
+import org.apache.qpid.proton.amqp.UnsignedByte;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-public class Header
- implements DescribedType , Section
+public final class Header
+ implements Section
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000070L), Symbol.valueOf("amqp:header:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000070L);
- private final HeaderWrapper _wrapper = new HeaderWrapper();
private Boolean _durable;
private UnsignedByte _priority;
@@ -98,113 +87,6 @@ public class Header
_deliveryCount = deliveryCount;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _durable;
- case 1:
- return _priority;
- case 2:
- return _ttl;
- case 3:
- return _firstAcquirer;
- case 4:
- return _deliveryCount;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _deliveryCount != null
- ? 5
- : _firstAcquirer != null
- ? 4
- : _ttl != null
- ? 3
- : _priority != null
- ? 2
- : _durable != null
- ? 1
- : 0;
-
- }
-
-
- public final class HeaderWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Header.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Header.this.size();
- }
- }
-
- private static class HeaderConstructor implements DescribedTypeConstructor<Header>
- {
- public Header newInstance(Object described)
- {
- List l = (List) described;
-
- Header o = new Header();
-
-
- switch(5 - l.size())
- {
-
- case 0:
- o.setDeliveryCount( (UnsignedInteger) l.get( 4 ) );
- case 1:
- o.setFirstAcquirer( (Boolean) l.get( 3 ) );
- case 2:
- o.setTtl( (UnsignedInteger) l.get( 2 ) );
- case 3:
- o.setPriority( (UnsignedByte) l.get( 1 ) );
- case 4:
- o.setDurable( (Boolean) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Header> getTypeClass()
- {
- return Header.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- HeaderConstructor constructor = new HeaderConstructor();
- 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/messaging/LifetimePolicy.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/LifetimePolicy.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/LifetimePolicy.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/LifetimePolicy.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/LifetimePolicy.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/LifetimePolicy.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/LifetimePolicy.java Wed Dec 12 13:32:32 2012
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
public interface LifetimePolicy
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/MessageAnnotations.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/MessageAnnotations.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/MessageAnnotations.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/MessageAnnotations.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/MessageAnnotations.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/MessageAnnotations.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/MessageAnnotations.java Wed Dec 12 13:32:32 2012
@@ -21,24 +21,14 @@
*/
-package org.apache.qpid.proton.type.messaging;
-import java.util.Map;
-
+package org.apache.qpid.proton.amqp.messaging;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
+import java.util.Map;
-public class MessageAnnotations
- implements DescribedType , Section
+public final class MessageAnnotations implements Section
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000072L), Symbol.valueOf("amqp:message-annotations:map"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000072L);
private final Map _value;
public MessageAnnotations(Map value)
@@ -51,37 +41,10 @@ public class MessageAnnotations
return _value;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _value;
- }
-
- private static class MessageAnnotationsConstructor implements DescribedTypeConstructor<MessageAnnotations>
- {
- public MessageAnnotations newInstance(Object described)
- {
- return new MessageAnnotations( (Map) described );
- }
-
- public Class<MessageAnnotations> getTypeClass()
- {
- return MessageAnnotations.class;
- }
- }
-
-
- public static void register(Decoder decoder)
+ @Override
+ public String toString()
{
- MessageAnnotationsConstructor constructor = new MessageAnnotationsConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return "MessageAnnotations{" + _value + '}';
}
}
\ No newline at end of file
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Modified.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Modified.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Modified.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Modified.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Modified.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Modified.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Modified.java Wed Dec 12 13:32:32 2012
@@ -21,28 +21,16 @@
*/
-package org.apache.qpid.proton.type.messaging;
-import java.util.Map;
-import java.util.List;
-import java.util.AbstractList;
-
+package org.apache.qpid.proton.amqp.messaging;
-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.transport.DeliveryState;
-public class Modified
- implements DescribedType , org.apache.qpid.proton.type.transport.DeliveryState, Outcome
+public final class Modified
+ implements DeliveryState, Outcome
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000027L), Symbol.valueOf("amqp:modified:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000027L);
- private final ModifiedWrapper _wrapper = new ModifiedWrapper();
-
private Boolean _deliveryFailed;
private Boolean _undeliverableHere;
private Map _messageAnnotations;
@@ -76,101 +64,15 @@ public class Modified
{
_messageAnnotations = messageAnnotations;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _deliveryFailed;
- case 1:
- return _undeliverableHere;
- case 2:
- return _messageAnnotations;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _messageAnnotations != null
- ? 3
- : _undeliverableHere != null
- ? 2
- : _deliveryFailed != null
- ? 1
- : 0;
-
- }
-
-
- public final class ModifiedWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Modified.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Modified.this.size();
- }
- }
-
- private static class ModifiedConstructor implements DescribedTypeConstructor<Modified>
- {
- public Modified newInstance(Object described)
- {
- List l = (List) described;
-
- Modified o = new Modified();
-
-
- switch(3 - l.size())
- {
-
- case 0:
- o.setMessageAnnotations( (Map) l.get( 2 ) );
- case 1:
- o.setUndeliverableHere( (Boolean) l.get( 1 ) );
- case 2:
- o.setDeliveryFailed( (Boolean) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Modified> getTypeClass()
- {
- return Modified.class;
- }
- }
-
- public static void register(Decoder decoder)
+ @Override
+ public String toString()
{
- ModifiedConstructor constructor = new ModifiedConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return "Modified{" +
+ "deliveryFailed=" + _deliveryFailed +
+ ", undeliverableHere=" + _undeliverableHere +
+ ", messageAnnotations=" + _messageAnnotations +
+ '}';
}
}
\ No newline at end of file
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Outcome.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Outcome.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Outcome.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Outcome.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Outcome.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Outcome.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Outcome.java Wed Dec 12 13:32:32 2012
@@ -1,4 +1,4 @@
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Properties.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Properties.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Properties.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Properties.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Properties.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Properties.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Properties.java Wed Dec 12 13:32:32 2012
@@ -21,27 +21,22 @@
*/
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
+
+import java.util.AbstractList;
import java.util.Date;
import java.util.List;
-import java.util.AbstractList;
-
-
+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 org.apache.qpid.proton.codec.Decoder;
import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-public class Properties
- implements DescribedType , Section
+public final class Properties
+ implements Section
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000073L), Symbol.valueOf("amqp:properties:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000073L);
- private final PropertiesWrapper _wrapper = new PropertiesWrapper();
private Object _messageId;
private Binary _userId;
@@ -187,162 +182,6 @@ public class Properties
_replyToGroupId = replyToGroupId;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _messageId;
- case 1:
- return _userId;
- case 2:
- return _to;
- case 3:
- return _subject;
- case 4:
- return _replyTo;
- case 5:
- return _correlationId;
- case 6:
- return _contentType;
- case 7:
- return _contentEncoding;
- case 8:
- return _absoluteExpiryTime;
- case 9:
- return _creationTime;
- case 10:
- return _groupId;
- case 11:
- return _groupSequence;
- case 12:
- return _replyToGroupId;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _replyToGroupId != null
- ? 13
- : _groupSequence != null
- ? 12
- : _groupId != null
- ? 11
- : _creationTime != null
- ? 10
- : _absoluteExpiryTime != null
- ? 9
- : _contentEncoding != null
- ? 8
- : _contentType != null
- ? 7
- : _correlationId != null
- ? 6
- : _replyTo != null
- ? 5
- : _subject != null
- ? 4
- : _to != null
- ? 3
- : _userId != null
- ? 2
- : _messageId != null
- ? 1
- : 0;
-
- }
-
-
- public final class PropertiesWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Properties.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Properties.this.size();
- }
- }
-
- private static class PropertiesConstructor implements DescribedTypeConstructor<Properties>
- {
- public Properties newInstance(Object described)
- {
- List l = (List) described;
-
- Properties o = new Properties();
-
-
- switch(13 - l.size())
- {
-
- case 0:
- o.setReplyToGroupId( (String) l.get( 12 ) );
- case 1:
- o.setGroupSequence( (UnsignedInteger) l.get( 11 ) );
- case 2:
- o.setGroupId( (String) l.get( 10 ) );
- case 3:
- o.setCreationTime( (Date) l.get( 9 ) );
- case 4:
- o.setAbsoluteExpiryTime( (Date) l.get( 8 ) );
- case 5:
- o.setContentEncoding( (Symbol) l.get( 7 ) );
- case 6:
- o.setContentType( (Symbol) l.get( 6 ) );
- case 7:
- o.setCorrelationId( (Object) l.get( 5 ) );
- case 8:
- o.setReplyTo( (String) l.get( 4 ) );
- case 9:
- o.setSubject( (String) l.get( 3 ) );
- case 10:
- o.setTo( (String) l.get( 2 ) );
- case 11:
- o.setUserId( (Binary) l.get( 1 ) );
- case 12:
- o.setMessageId( (Object) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Properties> getTypeClass()
- {
- return Properties.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- PropertiesConstructor constructor = new PropertiesConstructor();
- 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/messaging/Received.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Received.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Received.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Received.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Received.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Received.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Received.java Wed Dec 12 13:32:32 2012
@@ -21,27 +21,18 @@
*/
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.messaging;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.UnsignedLong;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-public class Received
- implements DescribedType , org.apache.qpid.proton.type.transport.DeliveryState
+public final class Received
+ implements DeliveryState
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000023L), Symbol.valueOf("amqp:received:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000023L);
- private final ReceivedWrapper _wrapper = new ReceivedWrapper();
-
private UnsignedInteger _sectionNumber;
private UnsignedLong _sectionOffset;
@@ -64,95 +55,15 @@ public class Received
{
_sectionOffset = sectionOffset;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _sectionNumber;
- case 1:
- return _sectionOffset;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _sectionOffset != null
- ? 2
- : _sectionNumber != null
- ? 1
- : 0;
-
- }
-
-
- public final class ReceivedWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Received.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Received.this.size();
- }
- }
-
- private static class ReceivedConstructor implements DescribedTypeConstructor<Received>
- {
- public Received newInstance(Object described)
- {
- List l = (List) described;
-
- Received o = new Received();
-
-
- switch(2 - l.size())
- {
-
- case 0:
- o.setSectionOffset( (UnsignedLong) l.get( 1 ) );
- case 1:
- o.setSectionNumber( (UnsignedInteger) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Received> getTypeClass()
- {
- return Received.class;
- }
- }
- public static void register(Decoder decoder)
+ @Override
+ public String toString()
{
- ReceivedConstructor constructor = new ReceivedConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return "Received{" +
+ "sectionNumber=" + _sectionNumber +
+ ", sectionOffset=" + _sectionOffset +
+ '}';
}
}
\ No newline at end of file
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Rejected.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Rejected.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Rejected.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Rejected.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Rejected.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Rejected.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Rejected.java Wed Dec 12 13:32:32 2012
@@ -21,61 +21,27 @@
*/
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.messaging;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
+import org.apache.qpid.proton.amqp.transport.ErrorCondition;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-public class Rejected
- implements DescribedType , org.apache.qpid.proton.type.transport.DeliveryState, Outcome
+public final class Rejected
+ implements DeliveryState, Outcome
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000025L), Symbol.valueOf("amqp:rejected:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000025L);
- private final RejectedWrapper _wrapper = new RejectedWrapper();
-
- private List _error;
+ private ErrorCondition _error;
- public List getError()
+ public ErrorCondition getError()
{
return _error;
}
- public void setError(List 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()
{
@@ -85,57 +51,12 @@ public class Rejected
}
-
- public final class RejectedWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Rejected.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Rejected.this.size();
- }
- }
-
- private static class RejectedConstructor implements DescribedTypeConstructor<Rejected>
- {
- public Rejected newInstance(Object described)
- {
- List l = (List) described;
-
- Rejected o = new Rejected();
-
-
- switch(1 - l.size())
- {
-
- case 0:
- o.setError( (List) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Rejected> getTypeClass()
- {
- return Rejected.class;
- }
- }
-
-
- public static void register(Decoder decoder)
+ @Override
+ public String toString()
{
- RejectedConstructor constructor = new RejectedConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return "Rejected{" +
+ "error=" + _error +
+ '}';
}
}
\ No newline at end of file
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Released.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Released.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Released.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Released.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Released.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Released.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Released.java Wed Dec 12 13:32:32 2012
@@ -21,94 +21,25 @@
*/
-package org.apache.qpid.proton.type.messaging;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.messaging;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-public class Released
- implements DescribedType , org.apache.qpid.proton.type.transport.DeliveryState, Outcome
+public final class Released
+ implements DeliveryState, Outcome
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000026L), Symbol.valueOf("amqp:released:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000026L);
- private final ReleasedWrapper _wrapper = new ReleasedWrapper();
-
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return 0;
-
- }
-
+ private static final Released INSTANCE = new Released();
- public final class ReleasedWrapper extends AbstractList
+ @Override
+ public String toString()
{
-
- @Override
- public Object get(final int index)
- {
- return Released.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Released.this.size();
- }
+ return "Released{}";
}
- private static class ReleasedConstructor implements DescribedTypeConstructor<Released>
- {
- public Released newInstance(Object described)
- {
- List l = (List) described;
-
- Released o = new Released();
-
-
- return o;
- }
-
- public Class<Released> getTypeClass()
- {
- return Released.class;
- }
- }
-
-
- public static void register(Decoder decoder)
+ public static Released getInstance()
{
- ReleasedConstructor constructor = new ReleasedConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return INSTANCE;
}
}
\ No newline at end of file
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Section.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Section.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Section.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Section.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Section.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Section.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Section.java Wed Dec 12 13:32:32 2012
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
public interface Section
{
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Source.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Source.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Source.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Source.java Wed Dec 12 13:32:32 2012
@@ -21,103 +21,21 @@
*/
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-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 java.util.AbstractList;
import java.util.Arrays;
-import java.util.List;
import java.util.Map;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
-
-public class Source
- implements DescribedType , org.apache.qpid.proton.type.transport.Source
+public final class Source extends Terminus
+ implements org.apache.qpid.proton.amqp.transport.Source
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000028L), Symbol.valueOf("amqp:source:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000028L);
- private final SourceWrapper _wrapper = new SourceWrapper();
-
- private String _address;
- private UnsignedInteger _durable = UnsignedInteger.valueOf(0);
- private Symbol _expiryPolicy = Symbol.valueOf("session-end");
- private UnsignedInteger _timeout = UnsignedInteger.valueOf(0);
- private boolean _dynamic;
- private Map _dynamicNodeProperties;
private Symbol _distributionMode;
private Map _filter;
private Outcome _defaultOutcome;
private Symbol[] _outcomes;
- private Symbol[] _capabilities;
-
- public String getAddress()
- {
- return _address;
- }
-
- public void setAddress(String address)
- {
- _address = address;
- }
-
- public UnsignedInteger getDurable()
- {
- return _durable;
- }
-
- public void setDurable(UnsignedInteger durable)
- {
- _durable = durable;
- }
-
- public Symbol getExpiryPolicy()
- {
- return _expiryPolicy;
- }
-
- public void setExpiryPolicy(Symbol expiryPolicy)
- {
- _expiryPolicy = expiryPolicy;
- }
-
- public UnsignedInteger getTimeout()
- {
- return _timeout;
- }
-
- public void setTimeout(UnsignedInteger timeout)
- {
- _timeout = timeout;
- }
-
- public boolean getDynamic()
- {
- return _dynamic;
- }
-
- public void setDynamic(boolean dynamic)
- {
- _dynamic = dynamic;
- }
-
- public Map getDynamicNodeProperties()
- {
- return _dynamicNodeProperties;
- }
-
- public void setDynamicNodeProperties(Map dynamicNodeProperties)
- {
- _dynamicNodeProperties = dynamicNodeProperties;
- }
public Symbol getDistributionMode()
{
@@ -159,195 +77,22 @@ public class Source
_outcomes = outcomes;
}
- public Symbol[] getCapabilities()
- {
- return _capabilities;
- }
-
- public void setCapabilities(Symbol... capabilities)
- {
- _capabilities = capabilities;
- }
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _address;
- case 1:
- return _durable;
- case 2:
- return _expiryPolicy;
- case 3:
- return _timeout;
- case 4:
- return _dynamic;
- case 5:
- return _dynamicNodeProperties;
- case 6:
- return _distributionMode;
- case 7:
- return _filter;
- case 8:
- return _defaultOutcome;
- case 9:
- return _outcomes;
- case 10:
- return _capabilities;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _capabilities != null
- ? 11
- : _outcomes != null
- ? 10
- : _defaultOutcome != null
- ? 9
- : _filter != null
- ? 8
- : _distributionMode != null
- ? 7
- : _dynamicNodeProperties != null
- ? 6
- : (_dynamic != false)
- ? 5
- : (_timeout != null && !_timeout.equals(UnsignedInteger.ZERO))
- ? 4
- : (_expiryPolicy != null && !_expiryPolicy.equals(TerminusExpiryPolicy.SESSION_END))
- ? 3
- : (_durable != null && !_durable.equals(TerminusDurability.NONE))
- ? 2
- : _address != null
- ? 1
- : 0;
-
- }
-
-
- public final class SourceWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Source.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Source.this.size();
- }
- }
-
- private static class SourceConstructor implements DescribedTypeConstructor<Source>
- {
- public Source newInstance(Object described)
- {
- List l = (List) described;
-
- Source o = new Source();
-
-
- switch(11 - l.size())
- {
-
- case 0:
- Object val0 = l.get( 10 );
- if( val0 == null || val0.getClass().isArray() )
- {
- o.setCapabilities( (Symbol[]) val0 );
- }
- else
- {
- o.setCapabilities( (Symbol) val0 );
- }
- case 1:
- Object val1 = l.get( 9 );
- if( val1 == null || val1.getClass().isArray() )
- {
- o.setOutcomes( (Symbol[]) val1 );
- }
- else
- {
- o.setOutcomes( (Symbol) val1 );
- }
- case 2:
- o.setDefaultOutcome( (Outcome) l.get( 8 ) );
- case 3:
- o.setFilter( (Map) l.get( 7 ) );
- case 4:
- o.setDistributionMode( (Symbol) l.get( 6 ) );
- case 5:
- o.setDynamicNodeProperties( (Map) l.get( 5 ) );
- case 6:
- Boolean dynamic = (Boolean) l.get(4);
- o.setDynamic(dynamic == null ? false : dynamic);
- case 7:
- UnsignedInteger timeout = (UnsignedInteger) l.get(3);
- o.setTimeout(timeout == null ? UnsignedInteger.ZERO : timeout);
- case 8:
- Symbol expiryPolicy = (Symbol) l.get(2);
- o.setExpiryPolicy(expiryPolicy == null ? TerminusExpiryPolicy.SESSION_END : expiryPolicy);
- case 9:
- UnsignedInteger durable = (UnsignedInteger) l.get(1);
- o.setDurable(durable == null ? TerminusDurability.NONE : durable);
- case 10:
- o.setAddress( (String) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Source> getTypeClass()
- {
- return Source.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- SourceConstructor constructor = new SourceConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
@Override
public String toString()
{
return "Source{" +
- "address='" + _address + '\'' +
- ", durable=" + _durable +
- ", expiryPolicy=" + _expiryPolicy +
- ", timeout=" + _timeout +
- ", dynamic=" + _dynamic +
- ", dynamicNodeProperties=" + _dynamicNodeProperties +
+ "address='" + getAddress() + '\'' +
+ ", durable=" + getDurable() +
+ ", expiryPolicy=" + getExpiryPolicy() +
+ ", timeout=" + getTimeout() +
+ ", dynamic=" + getDynamic() +
+ ", dynamicNodeProperties=" + getDynamicNodeProperties() +
", distributionMode=" + _distributionMode +
", filter=" + _filter +
", defaultOutcome=" + _defaultOutcome +
", outcomes=" + (_outcomes == null ? null : Arrays.asList(_outcomes)) +
- ", capabilities=" + (_capabilities == null ? null : Arrays.asList(_capabilities)) +
+ ", capabilities=" + (getCapabilities() == null ? null : Arrays.asList(getCapabilities())) +
'}';
}
}
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Target.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Target.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/Target.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Target.java Wed Dec 12 13:32:32 2012
@@ -21,253 +21,26 @@
*/
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-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 java.util.AbstractList;
import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-public class Target
- implements DescribedType , org.apache.qpid.proton.type.transport.Target
+public final class Target extends Terminus
+ implements org.apache.qpid.proton.amqp.transport.Target
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000029L), Symbol.valueOf("amqp:target:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000029L);
- private final TargetWrapper _wrapper = new TargetWrapper();
-
- private String _address;
- private UnsignedInteger _durable = UnsignedInteger.valueOf(0);
- private Symbol _expiryPolicy = Symbol.valueOf("session-end");
- private UnsignedInteger _timeout = UnsignedInteger.valueOf(0);
- private boolean _dynamic;
- private Map _dynamicNodeProperties;
- private Symbol[] _capabilities;
-
- public String getAddress()
- {
- return _address;
- }
-
- public void setAddress(String address)
- {
- _address = address;
- }
-
- public UnsignedInteger getDurable()
- {
- return _durable;
- }
-
- public void setDurable(UnsignedInteger durable)
- {
- _durable = durable;
- }
-
- public Symbol getExpiryPolicy()
- {
- return _expiryPolicy;
- }
-
- public void setExpiryPolicy(Symbol expiryPolicy)
- {
- _expiryPolicy = expiryPolicy;
- }
-
- public UnsignedInteger getTimeout()
- {
- return _timeout;
- }
-
- public void setTimeout(UnsignedInteger timeout)
- {
- _timeout = timeout;
- }
- public boolean getDynamic()
- {
- return _dynamic;
- }
-
- public void setDynamic(boolean dynamic)
- {
- _dynamic = dynamic;
- }
-
- public Map getDynamicNodeProperties()
- {
- return _dynamicNodeProperties;
- }
-
- public void setDynamicNodeProperties(Map dynamicNodeProperties)
- {
- _dynamicNodeProperties = dynamicNodeProperties;
- }
-
- public Symbol[] getCapabilities()
- {
- return _capabilities;
- }
-
- public void setCapabilities(Symbol... capabilities)
- {
- _capabilities = capabilities;
- }
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _address;
- case 1:
- return _durable;
- case 2:
- return _expiryPolicy;
- case 3:
- return _timeout;
- case 4:
- return _dynamic;
- case 5:
- return _dynamicNodeProperties;
- case 6:
- return _capabilities;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _capabilities != null
- ? 7
- : _dynamicNodeProperties != null
- ? 6
- : (_dynamic != false)
- ? 5
- : (_timeout != null && !_timeout.equals(UnsignedInteger.ZERO))
- ? 4
- : (_expiryPolicy != null && !_expiryPolicy.equals(TerminusExpiryPolicy.SESSION_END))
- ? 3
- : (_durable != null && !_durable.equals(TerminusDurability.NONE))
- ? 2
- : _address != null
- ? 1
- : 0;
-
- }
-
-
- public final class TargetWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Target.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Target.this.size();
- }
- }
-
- private static class TargetConstructor implements DescribedTypeConstructor<Target>
- {
- public Target newInstance(Object described)
- {
- List l = (List) described;
-
- Target o = new Target();
-
-
- switch(7 - l.size())
- {
-
- case 0:
- Object val0 = l.get( 6 );
- if( val0 == null || val0.getClass().isArray() )
- {
- o.setCapabilities( (Symbol[]) val0 );
- }
- else
- {
- o.setCapabilities( (Symbol) val0 );
- }
- case 1:
- o.setDynamicNodeProperties( (Map) l.get( 5 ) );
- case 2:
- Boolean dynamic = (Boolean) l.get(4);
- o.setDynamic(dynamic == null ? false : dynamic);
- case 3:
- UnsignedInteger timeout = (UnsignedInteger) l.get(3);
- o.setTimeout(timeout == null ? UnsignedInteger.ZERO : timeout);
- case 4:
- Symbol expiryPolicy = (Symbol) l.get(2);
- o.setExpiryPolicy(expiryPolicy == null ? TerminusExpiryPolicy.SESSION_END : expiryPolicy);
- case 5:
- UnsignedInteger durable = (UnsignedInteger) l.get(1);
- o.setDurable(durable == null ? TerminusDurability.NONE : durable);
- case 6:
- o.setAddress( (String) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Target> getTypeClass()
- {
- return Target.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- TargetConstructor constructor = new TargetConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
@Override
public String toString()
{
return "Target{" +
- "address='" + _address + '\'' +
- ", durable=" + _durable +
- ", expiryPolicy=" + _expiryPolicy +
- ", timeout=" + _timeout +
- ", dynamic=" + _dynamic +
- ", dynamicNodeProperties=" + _dynamicNodeProperties +
- ", capabilities=" + (_capabilities == null ? null : Arrays.asList(_capabilities)) +
+ "address='" + getAddress() + '\'' +
+ ", durable=" + getDurable() +
+ ", expiryPolicy=" + getExpiryPolicy() +
+ ", timeout=" + getTimeout() +
+ ", dynamic=" + getDynamic() +
+ ", dynamicNodeProperties=" + getDynamicNodeProperties() +
+ ", capabilities=" + (getCapabilities() == null ? null : Arrays.asList(getCapabilities())) +
'}';
}
}
Added: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java?rev=1420665&view=auto
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java (added)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java Wed Dec 12 13:32:32 2012
@@ -0,0 +1,112 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.proton.amqp.messaging;
+
+import java.util.Map;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+
+public abstract class Terminus
+{
+ private String _address;
+ private TerminusDurability _durable = TerminusDurability.NONE;
+ private TerminusExpiryPolicy _expiryPolicy = TerminusExpiryPolicy.SESSION_END;
+ private UnsignedInteger _timeout = UnsignedInteger.valueOf(0);
+ private boolean _dynamic;
+ private Map _dynamicNodeProperties;
+ private Symbol[] _capabilities;
+
+ Terminus()
+ {
+ }
+
+ public final String getAddress()
+ {
+ return _address;
+ }
+
+ public final void setAddress(String address)
+ {
+ _address = address;
+ }
+
+ public final TerminusDurability getDurable()
+ {
+ return _durable;
+ }
+
+ public final void setDurable(TerminusDurability durable)
+ {
+ _durable = durable == null ? TerminusDurability.NONE : durable;
+ }
+
+ public final TerminusExpiryPolicy getExpiryPolicy()
+ {
+ return _expiryPolicy;
+ }
+
+ public final void setExpiryPolicy(TerminusExpiryPolicy expiryPolicy)
+ {
+ _expiryPolicy = expiryPolicy == null ? TerminusExpiryPolicy.SESSION_END : expiryPolicy;
+ }
+
+ public final UnsignedInteger getTimeout()
+ {
+ return _timeout;
+ }
+
+ public final void setTimeout(UnsignedInteger timeout)
+ {
+ _timeout = timeout;
+ }
+
+ public final boolean getDynamic()
+ {
+ return _dynamic;
+ }
+
+ public final void setDynamic(boolean dynamic)
+ {
+ _dynamic = dynamic;
+ }
+
+ public final Map getDynamicNodeProperties()
+ {
+ return _dynamicNodeProperties;
+ }
+
+ public final void setDynamicNodeProperties(Map dynamicNodeProperties)
+ {
+ _dynamicNodeProperties = dynamicNodeProperties;
+ }
+
+
+ public final Symbol[] getCapabilities()
+ {
+ return _capabilities;
+ }
+
+ public final void setCapabilities(Symbol... capabilities)
+ {
+ _capabilities = capabilities;
+ }
+
+}
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusDurability.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/TerminusDurability.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusDurability.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusDurability.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/TerminusDurability.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/TerminusDurability.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusDurability.java Wed Dec 12 13:32:32 2012
@@ -21,16 +21,32 @@
*/
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
-public interface TerminusDurability
+public enum TerminusDurability
{
- final static UnsignedInteger NONE = UnsignedInteger.ZERO;
+ NONE, CONFIGURATION, UNSETTLED_STATE;
- final static UnsignedInteger CONFIGURATION = UnsignedInteger.ONE;
-
- final static UnsignedInteger UNSETTLED_STATE = UnsignedInteger.valueOf(2);
+ public UnsignedInteger getValue()
+ {
+ return UnsignedInteger.valueOf(ordinal());
+ }
+
+ public static TerminusDurability get(UnsignedInteger value)
+ {
+
+ switch (value.intValue())
+ {
+ case 0:
+ return NONE;
+ case 1:
+ return CONFIGURATION;
+ case 2:
+ return UNSETTLED_STATE;
+ }
+ throw new IllegalArgumentException("Unknown TerminusDurablity: " + value);
+ }
}
Copied: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusExpiryPolicy.java (from r1418272, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/TerminusExpiryPolicy.java)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusExpiryPolicy.java?p2=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusExpiryPolicy.java&p1=qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/TerminusExpiryPolicy.java&r1=1418272&r2=1420665&rev=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/type/messaging/TerminusExpiryPolicy.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusExpiryPolicy.java Wed Dec 12 13:32:32 2012
@@ -21,18 +21,47 @@
*/
-package org.apache.qpid.proton.type.messaging;
+package org.apache.qpid.proton.amqp.messaging;
-import org.apache.qpid.proton.type.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.qpid.proton.amqp.Symbol;
-public interface TerminusExpiryPolicy
+public enum TerminusExpiryPolicy
{
- final static Symbol LINK_DETACH = Symbol.valueOf("link-detach");
-
- final static Symbol SESSION_END = Symbol.valueOf("session-end");
-
- final static Symbol CONNECTION_CLOSE = Symbol.valueOf("connection-close");
-
- final static Symbol NEVER = Symbol.valueOf("never");
-
+ LINK_DETACH("link-detach"),
+ SESSION_END("session-end"),
+ CONNECTION_CLOSE("connection-close"),
+ NEVER("never");
+
+ private Symbol _policy;
+ private static final Map<Symbol, TerminusExpiryPolicy> _map = new HashMap<Symbol, TerminusExpiryPolicy>();
+
+ TerminusExpiryPolicy(String policy)
+ {
+ _policy = Symbol.valueOf(policy);
+ }
+
+ public Symbol getPolicy()
+ {
+ return _policy;
+ }
+
+ static
+ {
+ _map.put(LINK_DETACH.getPolicy(), LINK_DETACH);
+ _map.put(SESSION_END.getPolicy(), SESSION_END);
+ _map.put(CONNECTION_CLOSE.getPolicy(), CONNECTION_CLOSE);
+ _map.put(NEVER.getPolicy(), NEVER);
+ }
+
+ public static TerminusExpiryPolicy valueOf(Symbol policy)
+ {
+ TerminusExpiryPolicy expiryPolicy = _map.get(policy);
+ if(expiryPolicy == null)
+ {
+ throw new IllegalArgumentException("Unknown TerminusExpiryPolicy: " + policy);
+ }
+ return expiryPolicy;
+ }
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslChallenge.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslChallenge.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslChallenge.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslChallenge.java Wed Dec 12 13:32:32 2012
@@ -21,28 +21,14 @@
*/
-package org.apache.qpid.proton.type.security;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.security;
-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.Binary;
-public class SaslChallenge
- implements DescribedType , SaslFrameBody
+public final class SaslChallenge implements SaslFrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000042L), Symbol.valueOf("amqp:sasl-challenge:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000042L);
- private final SaslChallengeWrapper _wrapper = new SaslChallengeWrapper();
-
private Binary _challenge;
public Binary getChallenge()
@@ -60,16 +46,6 @@ public class SaslChallenge
_challenge = challenge;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
public Object get(final int index)
{
@@ -94,63 +70,6 @@ public class SaslChallenge
handler.handleChallenge(this, payload, context);
}
-
- public final class SaslChallengeWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return SaslChallenge.this.get(index);
- }
-
- @Override
- public int size()
- {
- return SaslChallenge.this.size();
- }
- }
-
- private static class SaslChallengeConstructor implements DescribedTypeConstructor<SaslChallenge>
- {
- public SaslChallenge newInstance(Object described)
- {
- List l = (List) described;
-
- SaslChallenge o = new SaslChallenge();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The challenge field cannot be omitted");
- }
-
- switch(1 - l.size())
- {
-
- case 0:
- o.setChallenge( (Binary) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<SaslChallenge> getTypeClass()
- {
- return SaslChallenge.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- SaslChallengeConstructor constructor = new SaslChallengeConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
-
@Override
public String toString()
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslCode.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslCode.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslCode.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslCode.java Wed Dec 12 13:32:32 2012
@@ -21,20 +21,22 @@
*/
-package org.apache.qpid.proton.type.security;
+package org.apache.qpid.proton.amqp.security;
-import org.apache.qpid.proton.type.*;
+import org.apache.qpid.proton.amqp.UnsignedByte;
-public interface SaslCode
+public enum SaslCode
{
- final static UnsignedByte OK = UnsignedByte.valueOf((byte) 0);
+ OK, AUTH, SYS, SYS_PERM, SYS_TEMP;
- final static UnsignedByte AUTH = UnsignedByte.valueOf((byte) 1);
-
- final static UnsignedByte SYS = UnsignedByte.valueOf((byte) 2);
-
- final static UnsignedByte SYS_PERM = UnsignedByte.valueOf((byte) 3);
-
- final static UnsignedByte SYS_TEMP = UnsignedByte.valueOf((byte) 4);
+ public UnsignedByte getValue()
+ {
+ return UnsignedByte.valueOf((byte)ordinal());
+ }
+
+ public static SaslCode valueOf(UnsignedByte v)
+ {
+ return SaslCode.values()[v.byteValue()];
+ }
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslFrameBody.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslFrameBody.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslFrameBody.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslFrameBody.java Wed Dec 12 13:32:32 2012
@@ -18,12 +18,11 @@
* under the License.
*
*/
-package org.apache.qpid.proton.type.security;
+package org.apache.qpid.proton.amqp.security;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.DescribedType;
+import org.apache.qpid.proton.amqp.Binary;
-public interface SaslFrameBody extends DescribedType
+public interface SaslFrameBody
{
interface SaslFrameBodyHandler<E>
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslInit.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslInit.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslInit.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslInit.java Wed Dec 12 13:32:32 2012
@@ -21,27 +21,14 @@
*/
-package org.apache.qpid.proton.type.security;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.security;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
-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 SaslInit
- implements DescribedType , SaslFrameBody
+public final class SaslInit
+ implements SaslFrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000041L), Symbol.valueOf("amqp:sasl-init:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000041L);
- private final SaslInitWrapper _wrapper = new SaslInitWrapper();
private Symbol _mechanism;
private Binary _initialResponse;
@@ -82,41 +69,10 @@ public class SaslInit
_hostname = hostname;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _mechanism;
- case 1:
- return _initialResponse;
- case 2:
- return _hostname;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
- public int size()
+ public <E> void invoke(SaslFrameBodyHandler<E> handler, Binary payload, E context)
{
- return _hostname != null
- ? 3
- : _initialResponse != null
- ? 2
- : 1;
-
+ handler.handleInit(this, payload, context);
}
@Override
@@ -125,73 +81,7 @@ public class SaslInit
return "SaslInit{" +
"mechanism=" + _mechanism +
", initialResponse=" + _initialResponse +
- ", hostname=" + (_hostname == null ? "null":'\''+ _hostname + '\'') +
+ ", hostname='" + _hostname + '\'' +
'}';
}
-
- public <E> void invoke(SaslFrameBodyHandler<E> handler, Binary payload, E context)
- {
- handler.handleInit(this, payload, context);
- }
-
-
- public final class SaslInitWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return SaslInit.this.get(index);
- }
-
- @Override
- public int size()
- {
- return SaslInit.this.size();
- }
- }
-
- private static class SaslInitConstructor implements DescribedTypeConstructor<SaslInit>
- {
- public SaslInit newInstance(Object described)
- {
- List l = (List) described;
-
- SaslInit o = new SaslInit();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The mechanism field cannot be omitted");
- }
-
- switch(3 - l.size())
- {
-
- case 0:
- o.setHostname( (String) l.get( 2 ) );
- case 1:
- o.setInitialResponse( (Binary) l.get( 1 ) );
- case 2:
- o.setMechanism( (Symbol) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<SaslInit> getTypeClass()
- {
- return SaslInit.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- SaslInitConstructor constructor = new SaslInitConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslMechanisms.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslMechanisms.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslMechanisms.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslMechanisms.java Wed Dec 12 13:32:32 2012
@@ -21,30 +21,15 @@
*/
-package org.apache.qpid.proton.type.security;
+package org.apache.qpid.proton.amqp.security;
-import java.util.AbstractList;
import java.util.Arrays;
-import java.util.List;
-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.UnsignedLong;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
-
-public class SaslMechanisms
- implements DescribedType , SaslFrameBody
+public final class SaslMechanisms
+ implements SaslFrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000040L), Symbol.valueOf("amqp:sasl-mechanisms:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000040L);
- private final SaslMechanismsWrapper _wrapper = new SaslMechanismsWrapper();
private Symbol[] _saslServerMechanisms;
@@ -63,34 +48,6 @@ public class SaslMechanisms
_saslServerMechanisms = saslServerMechanisms;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _saslServerMechanisms;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return 1;
-
- }
public <E> void invoke(SaslFrameBodyHandler<E> handler, Binary payload, E context)
{
@@ -98,69 +55,6 @@ public class SaslMechanisms
}
- public final class SaslMechanismsWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return SaslMechanisms.this.get(index);
- }
-
- @Override
- public int size()
- {
- return SaslMechanisms.this.size();
- }
- }
-
- private static class SaslMechanismsConstructor implements DescribedTypeConstructor<SaslMechanisms>
- {
- public SaslMechanisms newInstance(Object described)
- {
- List l = (List) described;
-
- SaslMechanisms o = new SaslMechanisms();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The sasl-server-mechanisms field cannot be omitted");
- }
-
- switch(1 - l.size())
- {
-
- case 0:
- Object val0 = l.get( 0 );
- if( val0 == null || val0.getClass().isArray() )
- {
- o.setSaslServerMechanisms( (Symbol[]) val0 );
- }
- else
- {
- o.setSaslServerMechanisms( (Symbol) val0 );
- }
- }
-
-
- return o;
- }
-
- public Class<SaslMechanisms> getTypeClass()
- {
- return SaslMechanisms.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- SaslMechanismsConstructor constructor = new SaslMechanismsConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
@Override
public String toString()
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslOutcome.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslOutcome.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslOutcome.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslOutcome.java Wed Dec 12 13:32:32 2012
@@ -21,37 +21,26 @@
*/
-package org.apache.qpid.proton.type.security;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.security;
-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.Binary;
-public class SaslOutcome
- implements DescribedType , SaslFrameBody
-{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000044L), Symbol.valueOf("amqp:sasl-outcome:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000044L);
- private final SaslOutcomeWrapper _wrapper = new SaslOutcomeWrapper();
+public final class SaslOutcome
+ implements SaslFrameBody
+{
- private UnsignedByte _code;
+ private SaslCode _code;
private Binary _additionalData;
- public UnsignedByte getCode()
+ public SaslCode getCode()
{
return _code;
}
- public void setCode(UnsignedByte code)
+ public void setCode(SaslCode code)
{
if( code == null )
{
@@ -71,38 +60,6 @@ public class SaslOutcome
_additionalData = additionalData;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _code;
- case 1:
- return _additionalData;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _additionalData != null
- ? 2
- : 1;
-
- }
@Override
public String toString()
@@ -119,61 +76,5 @@ public class SaslOutcome
}
- public final class SaslOutcomeWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return SaslOutcome.this.get(index);
- }
- @Override
- public int size()
- {
- return SaslOutcome.this.size();
- }
- }
-
- private static class SaslOutcomeConstructor implements DescribedTypeConstructor<SaslOutcome>
- {
- public SaslOutcome newInstance(Object described)
- {
- List l = (List) described;
-
- SaslOutcome o = new SaslOutcome();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The code field cannot be omitted");
- }
-
- switch(2 - l.size())
- {
-
- case 0:
- o.setAdditionalData( (Binary) l.get( 1 ) );
- case 1:
- o.setCode( (UnsignedByte) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<SaslOutcome> getTypeClass()
- {
- return SaslOutcome.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- SaslOutcomeConstructor constructor = new SaslOutcomeConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
- }
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslResponse.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslResponse.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslResponse.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/security/SaslResponse.java Wed Dec 12 13:32:32 2012
@@ -21,27 +21,13 @@
*/
-package org.apache.qpid.proton.type.security;
-import java.util.List;
-import java.util.AbstractList;
+package org.apache.qpid.proton.amqp.security;
+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 SaslResponse
- implements DescribedType , SaslFrameBody
+public final class SaslResponse
+ implements SaslFrameBody
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000043L), Symbol.valueOf("amqp:sasl-response:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000043L);
- private final SaslResponseWrapper _wrapper = new SaslResponseWrapper();
private Binary _response;
@@ -60,34 +46,6 @@ public class SaslResponse
_response = response;
}
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _response;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return 1;
-
- }
@Override
public String toString()
@@ -102,59 +60,4 @@ public class SaslResponse
}
- public final class SaslResponseWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return SaslResponse.this.get(index);
- }
-
- @Override
- public int size()
- {
- return SaslResponse.this.size();
- }
- }
-
- private static class SaslResponseConstructor implements DescribedTypeConstructor<SaslResponse>
- {
- public SaslResponse newInstance(Object described)
- {
- List l = (List) described;
-
- SaslResponse o = new SaslResponse();
-
- if(l.size() <= 0)
- {
- throw new DecodeException("The response field cannot be omitted");
- }
-
- switch(1 - l.size())
- {
-
- case 0:
- o.setResponse( (Binary) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<SaslResponse> getTypeClass()
- {
- return SaslResponse.class;
- }
- }
-
-
- public static void register(Decoder decoder)
- {
- SaslResponseConstructor constructor = new SaslResponseConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
}
-}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java Wed Dec 12 13:32:32 2012
@@ -21,27 +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 java.util.Arrays;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.transport.Target;
-import org.apache.qpid.proton.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-public class Coordinator
- implements DescribedType , org.apache.qpid.proton.type.transport.Target
+public final class Coordinator
+ implements Target
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000030L), Symbol.valueOf("amqp:coordinator:list"),
- };
-
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000030L);
- private final CoordinatorWrapper _wrapper = new CoordinatorWrapper();
-
private Symbol[] _capabilities;
public Symbol[] getCapabilities()
@@ -53,97 +42,13 @@ public class Coordinator
{
_capabilities = capabilities;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _capabilities;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _capabilities != null
- ? 1
- : 0;
-
- }
-
-
- public final class CoordinatorWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Coordinator.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Coordinator.this.size();
- }
- }
-
- private static class CoordinatorConstructor implements DescribedTypeConstructor<Coordinator>
- {
- public Coordinator newInstance(Object described)
- {
- List l = (List) described;
-
- Coordinator o = new Coordinator();
-
-
- switch(1 - l.size())
- {
-
- case 0:
- Object val0 = l.get( 0 );
- if( val0 == null || val0.getClass().isArray() )
- {
- o.setCapabilities( (Symbol[]) val0 );
- }
- else
- {
- o.setCapabilities( (Symbol) val0 );
- }
- }
-
-
- return o;
- }
-
- public Class<Coordinator> getTypeClass()
- {
- return Coordinator.class;
- }
- }
-
- public static void register(Decoder decoder)
+ @Override
+ public String toString()
{
- CoordinatorConstructor constructor = new CoordinatorConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return "Coordinator{" +
+ "capabilities=" + (_capabilities == null ? null : Arrays.asList(_capabilities)) +
+ '}';
}
}
\ No newline at end of file
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declare.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declare.java?rev=1420665&r1=1418272&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declare.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/amqp/transaction/Declare.java Wed Dec 12 13:32:32 2012
@@ -21,27 +21,11 @@
*/
-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.codec.Decoder;
-import org.apache.qpid.proton.codec.DescribedTypeConstructor;
-import org.apache.qpid.proton.type.*;
-
-
-public class Declare
- implements DescribedType
+public final class Declare
{
- private static final Object[] DESCRIPTORS =
- {
- UnsignedLong.valueOf(0x0000000000000031L), Symbol.valueOf("amqp:declare:list"),
- };
- private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000031L);
- private final DeclareWrapper _wrapper = new DeclareWrapper();
-
private GlobalTxId _globalId;
public GlobalTxId getGlobalId()
@@ -53,89 +37,13 @@ public class Declare
{
_globalId = globalId;
}
-
- public Object getDescriptor()
- {
- return DESCRIPTOR;
- }
-
- public Object getDescribed()
- {
- return _wrapper;
- }
-
- public Object get(final int index)
- {
-
- switch(index)
- {
- case 0:
- return _globalId;
- }
-
- throw new IllegalStateException("Unknown index " + index);
-
- }
-
- public int size()
- {
- return _globalId != null
- ? 1
- : 0;
-
- }
-
-
- public final class DeclareWrapper extends AbstractList
- {
-
- @Override
- public Object get(final int index)
- {
- return Declare.this.get(index);
- }
-
- @Override
- public int size()
- {
- return Declare.this.size();
- }
- }
-
- private static class DeclareConstructor implements DescribedTypeConstructor<Declare>
- {
- public Declare newInstance(Object described)
- {
- List l = (List) described;
-
- Declare o = new Declare();
-
-
- switch(1 - l.size())
- {
-
- case 0:
- o.setGlobalId( (GlobalTxId) l.get( 0 ) );
- }
-
-
- return o;
- }
-
- public Class<Declare> getTypeClass()
- {
- return Declare.class;
- }
- }
-
- public static void register(Decoder decoder)
+ @Override
+ public String toString()
{
- DeclareConstructor constructor = new DeclareConstructor();
- for(Object descriptor : DESCRIPTORS)
- {
- decoder.register(descriptor, constructor);
- }
+ return "Declare{" +
+ "globalId=" + _globalId +
+ '}';
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org