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 7713215 PROTON-2398 Fix a couple spelling errors in type API state
checks
7713215 is described below
commit 7713215b9a56a126face589d6af2571658ee5191
Author: Timothy Bish <tabish...@gmail.com>
AuthorDate: Fri Jul 9 16:28:37 2021 -0400
PROTON-2398 Fix a couple spelling errors in type API state checks
---
.../codec/encoders/transport/BeginTypeEncoder.java | 4 ++--
.../codec/encoders/transport/OpenTypeEncoder.java | 4 ++--
.../org/apache/qpid/protonj2/types/transport/Begin.java | 4 ++--
.../org/apache/qpid/protonj2/types/transport/Open.java | 8 ++++----
.../org/apache/qpid/protonj2/codec/CodecTestSupport.java | 4 ++--
.../qpid/protonj2/codec/legacy/CodecToLegacyType.java | 4 ++--
.../qpid/protonj2/codec/transport/OpenTypeCodecTest.java | 16 ++++++++--------
.../engine/impl/ProtonFrameDecodingHandlerTest.java | 12 ++++++------
.../apache/qpid/protonj2/types/transport/BeginTest.java | 16 ++++++++--------
.../apache/qpid/protonj2/types/transport/OpenTest.java | 4 ++--
10 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/BeginTypeEncoder.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/BeginTypeEncoder.java
index 452b3f1..d98ae33 100644
---
a/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/BeginTypeEncoder.java
+++
b/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/BeginTypeEncoder.java
@@ -83,14 +83,14 @@ public final class BeginTypeEncoder extends
AbstractDescribedListTypeEncoder<Beg
}
break;
case 5:
- if (begin.hasOfferedCapabilites()) {
+ if (begin.hasOfferedCapabilities()) {
state.getEncoder().writeArray(buffer, state,
begin.getOfferedCapabilities());
} else {
buffer.writeByte(EncodingCodes.NULL);
}
break;
case 6:
- if (begin.hasDesiredCapabilites()) {
+ if (begin.hasDesiredCapabilities()) {
state.getEncoder().writeArray(buffer, state,
begin.getDesiredCapabilities());
} else {
buffer.writeByte(EncodingCodes.NULL);
diff --git
a/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/OpenTypeEncoder.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/OpenTypeEncoder.java
index 1d88366..5b2915c 100644
---
a/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/OpenTypeEncoder.java
+++
b/protonj2/src/main/java/org/apache/qpid/protonj2/codec/encoders/transport/OpenTypeEncoder.java
@@ -97,14 +97,14 @@ public final class OpenTypeEncoder extends
AbstractDescribedListTypeEncoder<Open
}
break;
case 7:
- if (open.hasOfferedCapabilites()) {
+ if (open.hasOfferedCapabilities()) {
state.getEncoder().writeArray(buffer, state,
open.getOfferedCapabilities());
} else {
state.getEncoder().writeNull(buffer, state);
}
break;
case 8:
- if (open.hasDesiredCapabilites()) {
+ if (open.hasDesiredCapabilities()) {
state.getEncoder().writeArray(buffer, state,
open.getDesiredCapabilities());
} else {
state.getEncoder().writeNull(buffer, state);
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 fd39517..ed80613 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
@@ -116,11 +116,11 @@ public final class Begin implements Performative {
return (modified & HANDLE_MAX) == HANDLE_MAX;
}
- 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/Open.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/types/transport/Open.java
index c4ca0e3..651d486 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
@@ -85,10 +85,10 @@ public final class Open implements Performative {
if (hasIncomingLocales()) {
copy.setIncomingLocales(Arrays.copyOf(incomingLocales,
incomingLocales.length));
}
- if (hasOfferedCapabilites()) {
+ if (hasOfferedCapabilities()) {
copy.setOfferedCapabilities(Arrays.copyOf(offeredCapabilities,
offeredCapabilities.length));
}
- if (hasDesiredCapabilites()) {
+ if (hasDesiredCapabilities()) {
copy.setOfferedCapabilities(Arrays.copyOf(desiredCapabilities,
desiredCapabilities.length));
}
if (hasProperties()) {
@@ -136,11 +136,11 @@ public final class Open implements Performative {
return (modified & INCOMING_LOCALES) == INCOMING_LOCALES;
}
- 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/test/java/org/apache/qpid/protonj2/codec/CodecTestSupport.java
b/protonj2/src/test/java/org/apache/qpid/protonj2/codec/CodecTestSupport.java
index 17fc440..abd129d 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
@@ -169,9 +169,9 @@ public class CodecTestSupport {
assertSame(begin1.hasProperties(), begin2.hasProperties(), "Expected
Attach with matching has properties values");
assertEquals(begin1.getProperties(), begin2.getProperties(),
"Properties Map values not equal");
- assertSame(begin1.hasDesiredCapabilites(),
begin2.hasDesiredCapabilites(), "Expected Attach with matching has desired
capabilities values");
+ assertSame(begin1.hasDesiredCapabilities(),
begin2.hasDesiredCapabilities(), "Expected Attach with matching has desired
capabilities values");
assertArrayEquals(begin1.getDesiredCapabilities(),
begin2.getDesiredCapabilities(), "Desired Capabilities are not equal");
- assertSame(begin2.hasOfferedCapabilites(),
begin2.hasOfferedCapabilites(), "Expected Attach with matching has offered
capabilities values");
+ assertSame(begin2.hasOfferedCapabilities(),
begin2.hasOfferedCapabilities(), "Expected Attach with matching has offered
capabilities values");
assertArrayEquals(begin1.getOfferedCapabilities(),
begin2.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 20340b3..7395432 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
@@ -236,10 +236,10 @@ public abstract class CodecToLegacyType {
if (begin.hasRemoteChannel()) {
legacyBegin.setRemoteChannel(org.apache.qpid.proton.amqp.UnsignedShort.valueOf((short)
begin.getRemoteChannel()));
}
- if (begin.hasOfferedCapabilites()) {
+ if (begin.hasOfferedCapabilities()) {
legacyBegin.setOfferedCapabilities(convertToLegacyType(begin.getOfferedCapabilities()));
}
- if (begin.hasDesiredCapabilites()) {
+ if (begin.hasDesiredCapabilities()) {
legacyBegin.setDesiredCapabilities(convertToLegacyType(begin.getDesiredCapabilities()));
}
if (begin.hasProperties()) {
diff --git
a/protonj2/src/test/java/org/apache/qpid/protonj2/codec/transport/OpenTypeCodecTest.java
b/protonj2/src/test/java/org/apache/qpid/protonj2/codec/transport/OpenTypeCodecTest.java
index 3c1037c..68e7cad 100644
---
a/protonj2/src/test/java/org/apache/qpid/protonj2/codec/transport/OpenTypeCodecTest.java
+++
b/protonj2/src/test/java/org/apache/qpid/protonj2/codec/transport/OpenTypeCodecTest.java
@@ -493,7 +493,7 @@ public class OpenTypeCodecTest extends CodecTestSupport {
assertTrue(open.hasOutgoingLocales());
assertArrayEquals(new Symbol[] { Symbol.valueOf("test") },
open.getOutgoingLocales());
open.setOutgoingLocales((Symbol[]) null);
- assertFalse(open.hasDesiredCapabilites());
+ assertFalse(open.hasDesiredCapabilities());
assertNull(open.getDesiredCapabilities());
}
@@ -507,7 +507,7 @@ public class OpenTypeCodecTest extends CodecTestSupport {
assertTrue(open.hasIncomingLocales());
assertArrayEquals(new Symbol[] { Symbol.valueOf("test") },
open.getIncomingLocales());
open.setIncomingLocales((Symbol[]) null);
- assertFalse(open.hasDesiredCapabilites());
+ assertFalse(open.hasDesiredCapabilities());
assertNull(open.getDesiredCapabilities());
}
@@ -515,13 +515,13 @@ public class OpenTypeCodecTest extends CodecTestSupport {
public void testOfferedCapabilities() {
Open open = new Open();
- assertFalse(open.hasOfferedCapabilites());
+ assertFalse(open.hasOfferedCapabilities());
assertNull(open.getOfferedCapabilities());
open.setOfferedCapabilities(Symbol.valueOf("test"));
- assertTrue(open.hasOfferedCapabilites());
+ assertTrue(open.hasOfferedCapabilities());
assertArrayEquals(new Symbol[] { Symbol.valueOf("test") },
open.getOfferedCapabilities());
open.setOfferedCapabilities((Symbol[]) null);
- assertFalse(open.hasDesiredCapabilites());
+ assertFalse(open.hasDesiredCapabilities());
assertNull(open.getDesiredCapabilities());
}
@@ -529,13 +529,13 @@ public class OpenTypeCodecTest extends CodecTestSupport {
public void testDesiredCapabilities() {
Open open = new Open();
- assertFalse(open.hasDesiredCapabilites());
+ assertFalse(open.hasDesiredCapabilities());
assertNull(open.getDesiredCapabilities());
open.setDesiredCapabilities(Symbol.valueOf("test"));
- assertTrue(open.hasDesiredCapabilites());
+ assertTrue(open.hasDesiredCapabilities());
assertArrayEquals(new Symbol[] { Symbol.valueOf("test") },
open.getDesiredCapabilities());
open.setDesiredCapabilities((Symbol[]) null);
- assertFalse(open.hasDesiredCapabilites());
+ assertFalse(open.hasDesiredCapabilities());
assertNull(open.getDesiredCapabilities());
}
diff --git
a/protonj2/src/test/java/org/apache/qpid/protonj2/engine/impl/ProtonFrameDecodingHandlerTest.java
b/protonj2/src/test/java/org/apache/qpid/protonj2/engine/impl/ProtonFrameDecodingHandlerTest.java
index a41052d..6c6d720 100644
---
a/protonj2/src/test/java/org/apache/qpid/protonj2/engine/impl/ProtonFrameDecodingHandlerTest.java
+++
b/protonj2/src/test/java/org/apache/qpid/protonj2/engine/impl/ProtonFrameDecodingHandlerTest.java
@@ -166,8 +166,8 @@ public class ProtonFrameDecodingHandlerTest {
assertFalse(decoded.hasIdleTimeout());
assertFalse(decoded.hasOutgoingLocales());
assertFalse(decoded.hasIncomingLocales());
- assertFalse(decoded.hasOfferedCapabilites());
- assertFalse(decoded.hasDesiredCapabilites());
+ assertFalse(decoded.hasOfferedCapabilities());
+ assertFalse(decoded.hasDesiredCapabilities());
assertFalse(decoded.hasProperties());
}
@@ -208,8 +208,8 @@ public class ProtonFrameDecodingHandlerTest {
assertEquals(30000, decoded.getIdleTimeout());
assertFalse(decoded.hasOutgoingLocales());
assertFalse(decoded.hasIncomingLocales());
- assertFalse(decoded.hasOfferedCapabilites());
- assertFalse(decoded.hasDesiredCapabilites());
+ assertFalse(decoded.hasOfferedCapabilities());
+ assertFalse(decoded.hasDesiredCapabilities());
assertFalse(decoded.hasProperties());
}
@@ -250,8 +250,8 @@ public class ProtonFrameDecodingHandlerTest {
assertEquals(30000, decoded.getIdleTimeout());
assertFalse(decoded.hasOutgoingLocales());
assertFalse(decoded.hasIncomingLocales());
- assertFalse(decoded.hasOfferedCapabilites());
- assertFalse(decoded.hasDesiredCapabilites());
+ assertFalse(decoded.hasOfferedCapabilities());
+ assertFalse(decoded.hasDesiredCapabilities());
assertFalse(decoded.hasProperties());
}
diff --git
a/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/BeginTest.java
b/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/BeginTest.java
index 4ffd38a..708ae95 100644
---
a/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/BeginTest.java
+++
b/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/BeginTest.java
@@ -48,8 +48,8 @@ public class BeginTest {
assertFalse(begin.hasHandleMax());
assertFalse(begin.hasNextOutgoingId());
- assertFalse(begin.hasDesiredCapabilites());
- assertFalse(begin.hasOfferedCapabilites());
+ assertFalse(begin.hasDesiredCapabilities());
+ assertFalse(begin.hasOfferedCapabilities());
assertFalse(begin.hasOutgoingWindow());
assertFalse(begin.hasIncomingWindow());
assertFalse(begin.hasProperties());
@@ -66,8 +66,8 @@ public class BeginTest {
assertTrue(begin.hasHandleMax());
assertTrue(begin.hasNextOutgoingId());
- assertTrue(begin.hasDesiredCapabilites());
- assertTrue(begin.hasOfferedCapabilites());
+ assertTrue(begin.hasDesiredCapabilities());
+ assertTrue(begin.hasOfferedCapabilities());
assertTrue(begin.hasOutgoingWindow());
assertTrue(begin.hasIncomingWindow());
assertTrue(begin.hasProperties());
@@ -225,8 +225,8 @@ public class BeginTest {
final Begin copied = begin.copy();
- assertTrue(begin.hasDesiredCapabilites());
- assertTrue(copied.hasDesiredCapabilites());
+ assertTrue(begin.hasDesiredCapabilities());
+ assertTrue(copied.hasDesiredCapabilities());
assertArrayEquals(copied.getDesiredCapabilities(),
begin.getDesiredCapabilities());
assertArrayEquals(copied.getDesiredCapabilities(),
desiredCapabilities);
@@ -243,8 +243,8 @@ public class BeginTest {
final Begin copied = begin.copy();
- assertTrue(begin.hasOfferedCapabilites());
- assertTrue(copied.hasOfferedCapabilites());
+ assertTrue(begin.hasOfferedCapabilities());
+ assertTrue(copied.hasOfferedCapabilities());
assertArrayEquals(copied.getOfferedCapabilities(),
begin.getOfferedCapabilities());
assertArrayEquals(copied.getOfferedCapabilities(),
offeredCapabilities);
diff --git
a/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/OpenTest.java
b/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/OpenTest.java
index a3dbaf8..88e9780 100644
---
a/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/OpenTest.java
+++
b/protonj2/src/test/java/org/apache/qpid/protonj2/types/transport/OpenTest.java
@@ -88,12 +88,12 @@ public class OpenTest {
assertFalse(open.isEmpty());
assertFalse(open.hasChannelMax());
assertTrue(open.hasContainerId());
- assertFalse(open.hasDesiredCapabilites());
+ assertFalse(open.hasDesiredCapabilities());
assertFalse(open.hasHostname());
assertFalse(open.hasIdleTimeout());
assertFalse(open.hasIncomingLocales());
assertFalse(open.hasMaxFrameSize());
- assertFalse(open.hasOfferedCapabilites());
+ assertFalse(open.hasOfferedCapabilities());
assertFalse(open.hasOutgoingLocales());
assertFalse(open.hasProperties());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
