This is an automated email from the ASF dual-hosted git repository. tabish pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
The following commit(s) were added to refs/heads/main by this push: new f770d75 PROTON-2398 Fix a couple API typos and add some missing final modifiers f770d75 is described below commit f770d759f6bc57e60f0b68b4e3c06d05646a73c4 Author: Timothy Bish <tabish...@gmail.com> AuthorDate: Fri Jun 18 17:34:54 2021 -0400 PROTON-2398 Fix a couple API typos and add some missing final modifiers --- .../encoders/transport/AttachTypeEncoder.java | 4 +-- .../qpid/protonj2/types/messaging/Properties.java | 26 +++++++++--------- .../qpid/protonj2/types/transport/Attach.java | 32 +++++++++++----------- .../qpid/protonj2/types/transport/Begin.java | 16 +++++------ .../qpid/protonj2/types/transport/Detach.java | 6 ++-- .../qpid/protonj2/types/transport/Disposition.java | 12 ++++---- .../apache/qpid/protonj2/types/transport/Flow.java | 22 +++++++-------- .../apache/qpid/protonj2/types/transport/Open.java | 20 +++++++------- .../qpid/protonj2/types/transport/Transfer.java | 22 +++++++-------- .../qpid/protonj2/codec/CodecTestSupport.java | 4 +-- .../protonj2/codec/legacy/CodecToLegacyType.java | 4 +-- .../qpid/protonj2/types/transport/AttachTest.java | 12 ++++---- 12 files changed, 90 insertions(+), 90 deletions(-) diff --git a/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/AttachTypeEncoder.java b/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/AttachTypeEncoder.java index 0320c46..3aae08c 100644 --- a/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/AttachTypeEncoder.java +++ b/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/AttachTypeEncoder.java @@ -125,14 +125,14 @@ public final class AttachTypeEncoder extends AbstractDescribedListTypeEncoder<At } break; case 11: - if (attach.hasOfferedCapabilites()) { + if (attach.hasOfferedCapabilities()) { state.getEncoder().writeArray(buffer, state, attach.getOfferedCapabilities()); } else { buffer.writeByte(EncodingCodes.NULL); } break; case 12: - if (attach.hasDesiredCapabilites()) { + if (attach.hasDesiredCapabilities()) { state.getEncoder().writeArray(buffer, state, attach.getDesiredCapabilities()); } else { buffer.writeByte(EncodingCodes.NULL); diff --git a/protonj2/src/main/java/org/apache/qpid/protonj2/types/messaging/Properties.java b/protonj2/src/main/java/org/apache/qpid/protonj2/types/messaging/Properties.java index 5ca5f42..b26ab4c 100644 --- a/protonj2/src/main/java/org/apache/qpid/protonj2/types/messaging/Properties.java +++ b/protonj2/src/main/java/org/apache/qpid/protonj2/types/messaging/Properties.java @@ -28,19 +28,19 @@ public final class Properties implements Section<Properties> { public static final UnsignedLong DESCRIPTOR_CODE = UnsignedLong.valueOf(0x0000000000000073L); public static final Symbol DESCRIPTOR_SYMBOL = Symbol.valueOf("amqp:properties:list"); - private static int MESSAGE_ID = 1; - private static int USER_ID = 2; - private static int TO = 4; - private static int SUBJECT = 8; - private static int REPLY_TO = 16; - private static int CORRELATION_ID = 32; - private static int CONTENT_TYPE = 64; - private static int CONTENT_ENCODING = 128; - private static int ABSOLUTE_EXPIRY = 256; - private static int CREATION_TIME = 512; - private static int GROUP_ID = 1024; - private static int GROUP_SEQUENCE = 2048; - private static int REPLY_TO_GROUP_ID = 4096; + private static final int MESSAGE_ID = 1; + private static final int USER_ID = 2; + private static final int TO = 4; + private static final int SUBJECT = 8; + private static final int REPLY_TO = 16; + private static final int CORRELATION_ID = 32; + private static final int CONTENT_TYPE = 64; + private static final int CONTENT_ENCODING = 128; + private static final int ABSOLUTE_EXPIRY = 256; + private static final int CREATION_TIME = 512; + private static final int GROUP_ID = 1024; + private static final int GROUP_SEQUENCE = 2048; + private static final int REPLY_TO_GROUP_ID = 4096; private int modified = 0; diff --git a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Attach.java b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Attach.java index fc50ef0..950d750 100644 --- a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Attach.java +++ b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Attach.java @@ -36,20 +36,20 @@ public final class Attach implements Performative { private static final long UINT_MAX = 0xFFFFFFFFL; - private static int NAME = 1; - private static int HANDLE = 2; - private static int ROLE = 4; - private static int SENDER_SETTLE_MODE = 8; - private static int RECEIVER_SETTLE_MODE = 16; - private static int SOURCE = 32; - private static int TARGET = 64; - private static int UNSETTLED = 128; - private static int INCOMPLETE_UNSETTLED = 256; - private static int INITIAL_DELIVERY_COUNT = 512; - private static int MAX_MESSAGE_SIZE = 1024; - private static int OFFERED_CAPABILITIES = 2048; - private static int DESIRED_CAPABILITIES = 4096; - private static int PROPERTIES = 8192; + private static final int NAME = 1; + private static final int HANDLE = 2; + private static final int ROLE = 4; + private static final int SENDER_SETTLE_MODE = 8; + private static final int RECEIVER_SETTLE_MODE = 16; + private static final int SOURCE = 32; + private static final int TARGET = 64; + private static final int UNSETTLED = 128; + private static final int INCOMPLETE_UNSETTLED = 256; + private static final int INITIAL_DELIVERY_COUNT = 512; + private static final int MAX_MESSAGE_SIZE = 1024; + private static final int OFFERED_CAPABILITIES = 2048; + private static final int DESIRED_CAPABILITIES = 4096; + private static final int PROPERTIES = 8192; private int modified = 0; @@ -172,11 +172,11 @@ public final class Attach implements Performative { return (modified & MAX_MESSAGE_SIZE) == MAX_MESSAGE_SIZE; } - public boolean hasOfferedCapabilites() { + public boolean hasOfferedCapabilities() { return (modified & OFFERED_CAPABILITIES) == OFFERED_CAPABILITIES; } - public boolean hasDesiredCapabilites() { + public boolean hasDesiredCapabilities() { return (modified & DESIRED_CAPABILITIES) == DESIRED_CAPABILITIES; } diff --git a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Begin.java b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Begin.java index 894ac0e..fd39517 100644 --- a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Begin.java +++ b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Begin.java @@ -33,14 +33,14 @@ public final class Begin implements Performative { private static final long UINT_MAX = 0xFFFFFFFFL; - private static int REMOTE_CHANNEL = 1; - private static int NEXT_OUTGOING_ID = 2; - private static int INCOMING_WINDOW = 4; - private static int OUTGOING_WINDOW = 8; - private static int HANDLE_MAX = 16; - private static int OFFERED_CAPABILITIES = 32; - private static int DESIRED_CAPABILITIES = 64; - private static int PROPERTIES = 128; + private static final int REMOTE_CHANNEL = 1; + private static final int NEXT_OUTGOING_ID = 2; + private static final int INCOMING_WINDOW = 4; + private static final int OUTGOING_WINDOW = 8; + private static final int HANDLE_MAX = 16; + private static final int OFFERED_CAPABILITIES = 32; + private static final int DESIRED_CAPABILITIES = 64; + private static final int PROPERTIES = 128; private int modified = 0; diff --git a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Detach.java b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Detach.java index 0a1b756..3de21b3 100644 --- a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Detach.java +++ b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Detach.java @@ -27,9 +27,9 @@ public final class Detach implements Performative { private static final long UINT_MAX = 0xFFFFFFFFL; - private static int HANDLE = 1; - private static int CLOSED = 2; - private static int ERROR = 4; + private static final int HANDLE = 1; + private static final int CLOSED = 2; + private static final int ERROR = 4; private int modified = 0; diff --git a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Disposition.java b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Disposition.java index 83b92c5..cff0e17 100644 --- a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Disposition.java +++ b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Disposition.java @@ -27,12 +27,12 @@ public final class Disposition implements Performative { private static final long UINT_MAX = 0xFFFFFFFFL; - private static int ROLE = 1; - private static int FIRST = 2; - private static int LAST = 4; - private static int SETTLED = 8; - private static int STATE = 16; - private static int BATCHABLE = 32; + private static final int ROLE = 1; + private static final int FIRST = 2; + private static final int LAST = 4; + private static final int SETTLED = 8; + private static final int STATE = 16; + private static final int BATCHABLE = 32; private int modified = 0; diff --git a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Flow.java b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Flow.java index 38e06e3..7a83ec1 100644 --- a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Flow.java +++ b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Flow.java @@ -30,17 +30,17 @@ public final class Flow implements Performative { private static final long UINT_MAX = 0xFFFFFFFFL; - private static int NEXT_INCOMING_ID = 1; - private static int INCOMING_WINDOW = 2; - private static int NEXT_OUTGOING_ID = 4; - private static int OUTGOING_WINDOW = 8; - private static int HANDLE = 16; - private static int DELIVERY_COUNT = 32; - private static int LINK_CREDIT = 64; - private static int AVAILABLE = 128; - private static int DRAIN = 256; - private static int ECHO = 512; - private static int PROPERTIES = 1024; + private static final int NEXT_INCOMING_ID = 1; + private static final int INCOMING_WINDOW = 2; + private static final int NEXT_OUTGOING_ID = 4; + private static final int OUTGOING_WINDOW = 8; + private static final int HANDLE = 16; + private static final int DELIVERY_COUNT = 32; + private static final int LINK_CREDIT = 64; + private static final int AVAILABLE = 128; + private static final int DRAIN = 256; + private static final int ECHO = 512; + private static final int PROPERTIES = 1024; private int modified = 0; diff --git a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Open.java b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Open.java index 94260cf..c4ca0e3 100644 --- a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Open.java +++ b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Open.java @@ -33,16 +33,16 @@ public final class Open implements Performative { private static final long UINT_MAX = 0xFFFFFFFFL; - private static int CONTAINER_ID = 1; - private static int HOSTNAME = 2; - private static int MAX_FRAME_SIZE = 4; - private static int CHANNEL_MAX = 8; - private static int IDLE_TIMEOUT = 16; - private static int OUTGOING_LOCALES = 32; - private static int INCOMING_LOCALES = 64; - private static int OFFERED_CAPABILITIES = 128; - private static int DESIRED_CAPABILITIES = 256; - private static int PROPERTIES = 512; + private static final int CONTAINER_ID = 1; + private static final int HOSTNAME = 2; + private static final int MAX_FRAME_SIZE = 4; + private static final int CHANNEL_MAX = 8; + private static final int IDLE_TIMEOUT = 16; + private static final int OUTGOING_LOCALES = 32; + private static final int INCOMING_LOCALES = 64; + private static final int OFFERED_CAPABILITIES = 128; + private static final int DESIRED_CAPABILITIES = 256; + private static final int PROPERTIES = 512; private int modified = CONTAINER_ID; diff --git a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Transfer.java b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Transfer.java index 516ff20..0be5302 100644 --- a/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Transfer.java +++ b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Transfer.java @@ -29,17 +29,17 @@ public final class Transfer implements Performative { private static final long UINT_MAX = 0xFFFFFFFFL; - private static int HANDLE = 1; - private static int DELIVERY_ID = 2; - private static int DELIVERY_TAG = 4; - private static int MESSAGE_FORMAT = 8; - private static int SETTLED = 16; - private static int MORE = 32; - private static int RCV_SETTLE_MODE = 64; - private static int STATE = 128; - private static int RESUME = 256; - private static int ABORTED = 512; - private static int BATCHABLE = 1024; + private static final int HANDLE = 1; + private static final int DELIVERY_ID = 2; + private static final int DELIVERY_TAG = 4; + private static final int MESSAGE_FORMAT = 8; + private static final int SETTLED = 16; + private static final int MORE = 32; + private static final int RCV_SETTLE_MODE = 64; + private static final int STATE = 128; + private static final int RESUME = 256; + private static final int ABORTED = 512; + private static final int BATCHABLE = 1024; private int modified = 0; diff --git a/protonj2/src/test/java/org/apache/qpid/protonj2/codec/CodecTestSupport.java b/protonj2/src/test/java/org/apache/qpid/protonj2/codec/CodecTestSupport.java index 72b5b60..17fc440 100644 --- a/protonj2/src/test/java/org/apache/qpid/protonj2/codec/CodecTestSupport.java +++ b/protonj2/src/test/java/org/apache/qpid/protonj2/codec/CodecTestSupport.java @@ -229,9 +229,9 @@ public class CodecTestSupport { assertSame(attach1.hasProperties(), attach2.hasProperties(), "Expected Attach with matching has properties values"); assertEquals(attach1.getProperties(), attach2.getProperties(), "Properties Map values not equal"); - assertSame(attach1.hasDesiredCapabilites(), attach2.hasDesiredCapabilites(), "Expected Attach with matching has desired capabilities values"); + assertSame(attach1.hasDesiredCapabilities(), attach2.hasDesiredCapabilities(), "Expected Attach with matching has desired capabilities values"); assertArrayEquals(attach1.getDesiredCapabilities(), attach2.getDesiredCapabilities(), "Desired Capabilities are not equal"); - assertSame(attach1.hasOfferedCapabilites(), attach2.hasOfferedCapabilites(), "Expected Attach with matching has offered capabilities values"); + assertSame(attach1.hasOfferedCapabilities(), attach2.hasOfferedCapabilities(), "Expected Attach with matching has offered capabilities values"); assertArrayEquals(attach1.getOfferedCapabilities(), attach2.getOfferedCapabilities(), "Offered Capabilities are not equal"); } diff --git a/protonj2/src/test/java/org/apache/qpid/protonj2/codec/legacy/CodecToLegacyType.java b/protonj2/src/test/java/org/apache/qpid/protonj2/codec/legacy/CodecToLegacyType.java index 694dec6..20340b3 100644 --- a/protonj2/src/test/java/org/apache/qpid/protonj2/codec/legacy/CodecToLegacyType.java +++ b/protonj2/src/test/java/org/apache/qpid/protonj2/codec/legacy/CodecToLegacyType.java @@ -296,10 +296,10 @@ public abstract class CodecToLegacyType { if (attach.hasIncompleteUnsettled()) { legacyAttach.setIncompleteUnsettled(attach.getIncompleteUnsettled()); } - if (attach.hasOfferedCapabilites()) { + if (attach.hasOfferedCapabilities()) { legacyAttach.setOfferedCapabilities(convertToLegacyType(attach.getOfferedCapabilities())); } - if (attach.hasDesiredCapabilites()) { + if (attach.hasDesiredCapabilities()) { legacyAttach.setDesiredCapabilities(convertToLegacyType(attach.getDesiredCapabilities())); } if (attach.hasProperties()) { diff --git a/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/AttachTest.java b/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/AttachTest.java index e334c9d..108f79c 100644 --- a/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/AttachTest.java +++ b/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/AttachTest.java @@ -54,13 +54,13 @@ public class AttachTest { assertEquals(0, attach.getElementCount()); assertTrue(attach.isEmpty()); - assertFalse(attach.hasDesiredCapabilites()); + assertFalse(attach.hasDesiredCapabilities()); assertFalse(attach.hasHandle()); assertFalse(attach.hasIncompleteUnsettled()); assertFalse(attach.hasInitialDeliveryCount()); assertFalse(attach.hasMaxMessageSize()); assertFalse(attach.hasName()); - assertFalse(attach.hasOfferedCapabilites()); + assertFalse(attach.hasOfferedCapabilities()); assertFalse(attach.hasProperties()); assertFalse(attach.hasReceiverSettleMode()); assertFalse(attach.hasRole()); @@ -249,8 +249,8 @@ public class AttachTest { original.setMaxMessageSize(1024); original.setProperties(properties); - assertTrue(original.hasDesiredCapabilites()); - assertTrue(original.hasOfferedCapabilites()); + assertTrue(original.hasDesiredCapabilities()); + assertTrue(original.hasOfferedCapabilities()); assertTrue(original.hasHandle()); assertTrue(original.hasIncompleteUnsettled()); assertTrue(original.hasUnsettled()); @@ -285,8 +285,8 @@ public class AttachTest { original.setCoordinator(null); assertFalse(original.hasTarget()); assertFalse(original.hasCoordinator()); - assertFalse(original.hasDesiredCapabilites()); - assertFalse(original.hasOfferedCapabilites()); + assertFalse(original.hasDesiredCapabilities()); + assertFalse(original.hasOfferedCapabilities()); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org