rolled back a mistake I made accidentally.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/19bc8cb0 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/19bc8cb0 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/19bc8cb0 Branch: refs/heads/rajith-codec Commit: 19bc8cb0978b289892edd1590433f77464a002b9 Parents: 2fdeead Author: Rajith Attapattu <[email protected]> Authored: Tue May 12 12:04:16 2015 -0400 Committer: Rajith Attapattu <[email protected]> Committed: Tue May 12 12:04:16 2015 -0400 ---------------------------------------------------------------------- .../apache/qpid/proton/codec2/CodecHelper.java | 28 ++++++++++++++++++++ .../apache/qpid/proton/message2/AmqpValue.java | 4 +-- .../proton/message2/ApplicationProperties.java | 4 +-- .../org/apache/qpid/proton/message2/Data.java | 4 +-- .../proton/message2/DeliveryAnnotations.java | 2 -- .../org/apache/qpid/proton/message2/Footer.java | 2 -- .../proton/message2/MessageAnnotations.java | 2 -- 7 files changed, 31 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/19bc8cb0/proton-j/src/main/java/org/apache/qpid/proton/codec2/CodecHelper.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/codec2/CodecHelper.java b/proton-j/src/main/java/org/apache/qpid/proton/codec2/CodecHelper.java index 9be9b68..b5e7064 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/codec2/CodecHelper.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/codec2/CodecHelper.java @@ -280,6 +280,34 @@ public class CodecHelper encodeObject(encoder, descType.getDescriptor()); encodeObject(encoder, descType.getValue()); } + else if (o instanceof Byte) + { + encoder.putByte((Byte) o); + } + else if (o instanceof Short) + { + encoder.putShort((Short) o); + } + else if (o instanceof Integer) + { + encoder.putInt((Integer) o); + } + else if (o instanceof Long) + { + encoder.putLong((Long) o); + } + else if (o instanceof Float) + { + encoder.putFloat((Float) o); + } + else if (o instanceof Double) + { + encoder.putDouble((Double) o); + } + else if (o instanceof Character) + { + encoder.putChar((Character) o); + } else { throw new IllegalArgumentException("Do not know how to write Objects of class " + o.getClass().getName()); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/19bc8cb0/proton-j/src/main/java/org/apache/qpid/proton/message2/AmqpValue.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message2/AmqpValue.java b/proton-j/src/main/java/org/apache/qpid/proton/message2/AmqpValue.java index 43451d4..b6cbc1d 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message2/AmqpValue.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message2/AmqpValue.java @@ -54,16 +54,14 @@ public final class AmqpValue implements Section, Encodable { encoder.putDescriptor(); encoder.putUlong(DESCRIPTOR_LONG); - encoder.putList(); CodecHelper.encodeObject(encoder, _value); - encoder.end(); } public static final class Factory implements DescribedTypeFactory { public Object create(Object in) throws DecodeException { - return new AmqpValue(((List<Object>)in).get(0)); + return new AmqpValue(in); } } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/19bc8cb0/proton-j/src/main/java/org/apache/qpid/proton/message2/ApplicationProperties.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message2/ApplicationProperties.java b/proton-j/src/main/java/org/apache/qpid/proton/message2/ApplicationProperties.java index e4351af..a8a9518 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message2/ApplicationProperties.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message2/ApplicationProperties.java @@ -54,9 +54,7 @@ public final class ApplicationProperties implements Encodable { encoder.putDescriptor(); encoder.putUlong(DESCRIPTOR_LONG); - encoder.putList(); CodecHelper.encodeMap(encoder, _value); - encoder.end(); } public static final class Factory implements DescribedTypeFactory @@ -71,6 +69,6 @@ public final class ApplicationProperties implements Encodable @Override public String toString() { - return "ApplicationProperties{" + _value + '}'; + return "ApplicationProperties " + _value; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/19bc8cb0/proton-j/src/main/java/org/apache/qpid/proton/message2/Data.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message2/Data.java b/proton-j/src/main/java/org/apache/qpid/proton/message2/Data.java index 9aa8d3a..29500a2 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message2/Data.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message2/Data.java @@ -53,16 +53,14 @@ public final class Data implements Section, Encodable { encoder.putDescriptor(); encoder.putUlong(DESCRIPTOR_LONG); - encoder.putList(); encoder.putBinary(_value, 0, _value.length); - encoder.end(); } public static final class Factory implements DescribedTypeFactory { public Object create(Object in) throws DecodeException { - return new Data((byte[]) ((List)in).get(0)); + return new Data((byte[])in); } } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/19bc8cb0/proton-j/src/main/java/org/apache/qpid/proton/message2/DeliveryAnnotations.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message2/DeliveryAnnotations.java b/proton-j/src/main/java/org/apache/qpid/proton/message2/DeliveryAnnotations.java index 009a72b..7885693 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message2/DeliveryAnnotations.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message2/DeliveryAnnotations.java @@ -54,9 +54,7 @@ public final class DeliveryAnnotations implements Encodable { encoder.putDescriptor(); encoder.putUlong(DESCRIPTOR_LONG); - encoder.putList(); CodecHelper.encodeMapWithKeyAsSymbol(encoder, _value); - encoder.end(); } public static final class Factory implements DescribedTypeFactory http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/19bc8cb0/proton-j/src/main/java/org/apache/qpid/proton/message2/Footer.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message2/Footer.java b/proton-j/src/main/java/org/apache/qpid/proton/message2/Footer.java index 89a31a1..1aaf1f8 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message2/Footer.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message2/Footer.java @@ -54,9 +54,7 @@ public final class Footer implements Encodable { encoder.putDescriptor(); encoder.putUlong(DESCRIPTOR_LONG); - encoder.putList(); CodecHelper.encodeMap(encoder, _value); - encoder.end(); } public static final class Factory implements DescribedTypeFactory http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/19bc8cb0/proton-j/src/main/java/org/apache/qpid/proton/message2/MessageAnnotations.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message2/MessageAnnotations.java b/proton-j/src/main/java/org/apache/qpid/proton/message2/MessageAnnotations.java index 055ca27..218525b 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message2/MessageAnnotations.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message2/MessageAnnotations.java @@ -54,9 +54,7 @@ public final class MessageAnnotations implements Encodable { encoder.putDescriptor(); encoder.putUlong(DESCRIPTOR_LONG); - encoder.putList(); CodecHelper.encodeMapWithKeyAsSymbol(encoder, _value); - encoder.end(); } public static final class Factory implements DescribedTypeFactory --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
