Added the interface Performative.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a94b401e Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a94b401e Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a94b401e Branch: refs/heads/rajith-codec Commit: a94b401ef0a6f02c662d996147d3e47be96669c3 Parents: a8ed0f3 Author: Rajith Attapattu <[email protected]> Authored: Fri May 15 09:17:27 2015 -0400 Committer: Rajith Attapattu <[email protected]> Committed: Fri May 15 09:17:27 2015 -0400 ---------------------------------------------------------------------- .../apache/qpid/proton/transport2/Attach.java | 20 ++++++++++--- .../apache/qpid/proton/transport2/Begin.java | 20 ++++++++++--- .../apache/qpid/proton/transport2/Close.java | 20 ++++++++++--- .../qpid/proton/transport2/ConnectionError.java | 31 ++++++++++++++++++++ .../apache/qpid/proton/transport2/Detach.java | 20 ++++++++++--- .../qpid/proton/transport2/Disposition.java | 20 ++++++++++--- .../org/apache/qpid/proton/transport2/End.java | 20 ++++++++++--- .../org/apache/qpid/proton/transport2/Flow.java | 20 ++++++++++--- .../org/apache/qpid/proton/transport2/Open.java | 20 ++++++++++--- .../qpid/proton/transport2/Performative.java | 28 ++++++++++++++++++ .../apache/qpid/proton/transport2/Transfer.java | 20 ++++++++++--- 11 files changed, 203 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java index f0d4390..4edbc5f 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Attach.java @@ -31,11 +31,11 @@ import org.apache.qpid.proton.codec2.DescribedTypeFactory; import org.apache.qpid.proton.codec2.Encodable; import org.apache.qpid.proton.codec2.Encoder; -public final class Attach implements Encodable +public final class Attach implements Encodable, Performative { - public final static long DESCRIPTOR_LONG = 0x0000000000000012L; + public final static long CODE = 0x0000000000000012L; - public final static String DESCRIPTOR_STRING = "amqp:attach:list"; + public final static String DESCRIPTOR = "amqp:attach:list"; public final static Factory FACTORY = new Factory(); @@ -220,7 +220,7 @@ public final class Attach implements Encodable public void encode(Encoder encoder) { encoder.putDescriptor(); - encoder.putUlong(DESCRIPTOR_LONG); + encoder.putUlong(CODE); encoder.putList(); encoder.putString(_name); encoder.putUint(_handle); @@ -337,4 +337,16 @@ public final class Attach implements Encodable ", properties=" + _properties + '}'; } + + @Override + public long getCode() + { + return CODE; + } + + @Override + public String getDescriptor() + { + return DESCRIPTOR; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java index b5547bb..f369533 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Begin.java @@ -31,11 +31,11 @@ import org.apache.qpid.proton.codec2.DescribedTypeFactory; import org.apache.qpid.proton.codec2.Encodable; import org.apache.qpid.proton.codec2.Encoder; -public final class Begin implements Encodable +public final class Begin implements Encodable, Performative { - public final static long DESCRIPTOR_LONG = 0x0000000000000012L; + public final static long CODE = 0x0000000000000012L; - public final static String DESCRIPTOR_STRING = "amqp:begin:list"; + public final static String DESCRIPTOR = "amqp:begin:list"; public final static Factory FACTORY = new Factory(); @@ -139,7 +139,7 @@ public final class Begin implements Encodable public void encode(Encoder encoder) { encoder.putDescriptor(); - encoder.putUlong(DESCRIPTOR_LONG); + encoder.putUlong(CODE); encoder.putList(); encoder.putUshort(_remoteChannel); encoder.putUint(_nextOutgoingId); @@ -215,4 +215,16 @@ public final class Begin implements Encodable ", properties=" + _properties + '}'; } + + @Override + public long getCode() + { + return CODE; + } + + @Override + public String getDescriptor() + { + return DESCRIPTOR; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/Close.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Close.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Close.java index a3318f5..068f7c1 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Close.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Close.java @@ -28,11 +28,11 @@ import org.apache.qpid.proton.codec2.DescribedTypeFactory; import org.apache.qpid.proton.codec2.Encodable; import org.apache.qpid.proton.codec2.Encoder; -public final class Close implements Encodable +public final class Close implements Encodable, Performative { - public final static long DESCRIPTOR_LONG = 0x0000000000000018L; + public final static long CODE = 0x0000000000000018L; - public final static String DESCRIPTOR_STRING = "amqp:close:list"; + public final static String DESCRIPTOR = "amqp:close:list"; public final static Factory FACTORY = new Factory(); @@ -52,7 +52,7 @@ public final class Close implements Encodable public void encode(Encoder encoder) { encoder.putDescriptor(); - encoder.putUlong(DESCRIPTOR_LONG); + encoder.putUlong(CODE); encoder.putList(); if (_error == null) { @@ -87,4 +87,16 @@ public final class Close implements Encodable { return "Close{" + "error=" + _error + '}'; } + + @Override + public long getCode() + { + return CODE; + } + + @Override + public String getDescriptor() + { + return DESCRIPTOR; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/ConnectionError.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/ConnectionError.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/ConnectionError.java new file mode 100644 index 0000000..58b0c52 --- /dev/null +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/ConnectionError.java @@ -0,0 +1,31 @@ +/* + * + * 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.transport2; + +public interface ConnectionError +{ + final static String CONNECTION_FORCED = "amqp:connection:forced"; + + final static String FRAMING_ERROR = "amqp:connection:framing-error"; + + final static String REDIRECT = "amqp:connection:redirect"; + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/Detach.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Detach.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Detach.java index 310e249..c000b5f 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Detach.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Detach.java @@ -28,11 +28,11 @@ import org.apache.qpid.proton.codec2.DescribedTypeFactory; import org.apache.qpid.proton.codec2.Encodable; import org.apache.qpid.proton.codec2.Encoder; -public final class Detach implements Encodable +public final class Detach implements Encodable, Performative { - public final static long DESCRIPTOR_LONG = 0x0000000000000016L; + public final static long CODE = 0x0000000000000016L; - public final static String DESCRIPTOR_STRING = "amqp:detach:list"; + public final static String DESCRIPTOR = "amqp:detach:list"; public final static Factory FACTORY = new Factory(); @@ -76,7 +76,7 @@ public final class Detach implements Encodable public void encode(Encoder encoder) { encoder.putDescriptor(); - encoder.putUlong(DESCRIPTOR_LONG); + encoder.putUlong(CODE); encoder.putList(); encoder.putUint(_handle); encoder.putBoolean(_closed); @@ -119,4 +119,16 @@ public final class Detach implements Encodable { return "Detach{" + "handle=" + _handle + ", closed=" + _closed + ", error=" + _error + '}'; } + + @Override + public long getCode() + { + return CODE; + } + + @Override + public String getDescriptor() + { + return DESCRIPTOR; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/Disposition.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Disposition.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Disposition.java index cc1ae97..39fafef 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Disposition.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Disposition.java @@ -28,11 +28,11 @@ import org.apache.qpid.proton.codec2.DescribedTypeFactory; import org.apache.qpid.proton.codec2.Encodable; import org.apache.qpid.proton.codec2.Encoder; -public final class Disposition implements Encodable +public final class Disposition implements Encodable, Performative { - public final static long DESCRIPTOR_LONG = 0x0000000000000015L; + public final static long CODE = 0x0000000000000015L; - public final static String DESCRIPTOR_STRING = "amqp:disposition:list"; + public final static String DESCRIPTOR = "amqp:disposition:list"; public final static Factory FACTORY = new Factory(); @@ -116,7 +116,7 @@ public final class Disposition implements Encodable public void encode(Encoder encoder) { encoder.putDescriptor(); - encoder.putUlong(DESCRIPTOR_LONG); + encoder.putUlong(CODE); encoder.putList(); encoder.putBoolean(_role.getValue()); encoder.putUint(_first); @@ -178,4 +178,16 @@ public final class Disposition implements Encodable ", batchable=" + _batchable + '}'; } + + @Override + public long getCode() + { + return CODE; + } + + @Override + public String getDescriptor() + { + return DESCRIPTOR; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/End.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/End.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/End.java index d994f24..c5bcf3d 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/End.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/End.java @@ -28,11 +28,11 @@ import org.apache.qpid.proton.codec2.DescribedTypeFactory; import org.apache.qpid.proton.codec2.Encodable; import org.apache.qpid.proton.codec2.Encoder; -public final class End implements Encodable +public final class End implements Encodable, Performative { - public final static long DESCRIPTOR_LONG = 0x0000000000000017L; + public final static long CODE = 0x0000000000000017L; - public final static String DESCRIPTOR_STRING = "amqp:end:list"; + public final static String DESCRIPTOR = "amqp:end:list"; public final static Factory FACTORY = new Factory(); @@ -52,7 +52,7 @@ public final class End implements Encodable public void encode(Encoder encoder) { encoder.putDescriptor(); - encoder.putUlong(DESCRIPTOR_LONG); + encoder.putUlong(CODE); encoder.putList(); if (_error == null) { @@ -87,4 +87,16 @@ public final class End implements Encodable { return "End{" + "error=" + _error + '}'; } + + @Override + public long getCode() + { + return CODE; + } + + @Override + public String getDescriptor() + { + return DESCRIPTOR; + } } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/Flow.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Flow.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Flow.java index 8ff6034..b3b4de5 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Flow.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Flow.java @@ -30,11 +30,11 @@ import org.apache.qpid.proton.codec2.DescribedTypeFactory; import org.apache.qpid.proton.codec2.Encodable; import org.apache.qpid.proton.codec2.Encoder; -public final class Flow implements Encodable +public final class Flow implements Encodable, Performative { - public final static long DESCRIPTOR_LONG = 0x0000000000000013L; + public final static long CODE = 0x0000000000000013L; - public final static String DESCRIPTOR_STRING = "amqp:flow:list"; + public final static String DESCRIPTOR = "amqp:flow:list"; public final static Factory FACTORY = new Factory(); @@ -174,7 +174,7 @@ public final class Flow implements Encodable public void encode(Encoder encoder) { encoder.putDescriptor(); - encoder.putUlong(DESCRIPTOR_LONG); + encoder.putUlong(CODE); encoder.putList(); encoder.putUint(_nextIncomingId); encoder.putUint(_incomingWindow); @@ -247,4 +247,16 @@ public final class Flow implements Encodable ", properties=" + _properties + '}'; } + + @Override + public long getCode() + { + return CODE; + } + + @Override + public String getDescriptor() + { + return DESCRIPTOR; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java index dfbdba7..babc4aa 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Open.java @@ -31,11 +31,11 @@ import org.apache.qpid.proton.codec2.DescribedTypeFactory; import org.apache.qpid.proton.codec2.Encodable; import org.apache.qpid.proton.codec2.Encoder; -public final class Open implements Encodable +public final class Open implements Encodable, Performative { - public final static long DESCRIPTOR_LONG = 0x0000000000000010L; + public final static long CODE = 0x0000000000000010L; - public final static String DESCRIPTOR_STRING = "amqp:open:list"; + public final static String DESCRIPTOR = "amqp:open:list"; public final static Factory FACTORY = new Factory(); @@ -168,7 +168,7 @@ public final class Open implements Encodable public void encode(Encoder encoder) { encoder.putDescriptor(); - encoder.putUlong(DESCRIPTOR_LONG); + encoder.putUlong(CODE); encoder.putList(); encoder.putString(_containerId); encoder.putString(_hostname); @@ -268,4 +268,16 @@ public final class Open implements Encodable ", properties=" + _properties + '}'; } + + @Override + public long getCode() + { + return CODE; + } + + @Override + public String getDescriptor() + { + return DESCRIPTOR; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/Performative.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Performative.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Performative.java new file mode 100644 index 0000000..096ae9c --- /dev/null +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Performative.java @@ -0,0 +1,28 @@ +/* + * + * 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.transport2; + +public interface Performative +{ + long getCode(); + + String getDescriptor(); +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a94b401e/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java index c19e729..aad782e 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java @@ -28,11 +28,11 @@ import org.apache.qpid.proton.codec2.DescribedTypeFactory; import org.apache.qpid.proton.codec2.Encodable; import org.apache.qpid.proton.codec2.Encoder; -public final class Transfer implements Encodable +public final class Transfer implements Encodable, Performative { - public final static long DESCRIPTOR_LONG = 0x0000000000000014L; + public final static long CODE = 0x0000000000000014L; - public final static String DESCRIPTOR_STRING = "amqp:transfer:list"; + public final static String DESCRIPTOR = "amqp:transfer:list"; public final static Factory FACTORY = new Factory(); @@ -172,7 +172,7 @@ public final class Transfer implements Encodable public void encode(Encoder encoder) { encoder.putDescriptor(); - encoder.putUlong(DESCRIPTOR_LONG); + encoder.putUlong(CODE); encoder.putList(); encoder.putUint(_handle); encoder.putUint(_deliveryId); @@ -250,4 +250,16 @@ public final class Transfer implements Encodable ", batchable=" + _batchable + '}'; } + + @Override + public long getCode() + { + return CODE; + } + + @Override + public String getDescriptor() + { + return DESCRIPTOR; + } } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
