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 81cdfde PROTON-2398 Fix some API naming erros and some typos
81cdfde is described below
commit 81cdfde6279137185260b0f2a269c661635b9a37
Author: Timothy Bish <[email protected]>
AuthorDate: Fri Aug 20 17:45:44 2021 -0400
PROTON-2398 Fix some API naming erros and some typos
---
.../apache/qpid/protonj2/engine/impl/ProtonConnection.java | 2 +-
.../org/apache/qpid/protonj2/engine/impl/ProtonEngine.java | 6 +++---
.../org/apache/qpid/protonj2/engine/impl/ProtonLink.java | 4 ++--
.../qpid/protonj2/engine/impl/ProtonLinkCreditState.java | 14 +++++++-------
.../apache/qpid/protonj2/engine/impl/ProtonReceiver.java | 4 ++--
.../org/apache/qpid/protonj2/engine/impl/ProtonSender.java | 4 ++--
.../apache/qpid/protonj2/engine/impl/ProtonSession.java | 2 +-
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonConnection.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonConnection.java
index 1e5d11b..e581718 100644
---
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonConnection.java
+++
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonConnection.java
@@ -566,7 +566,7 @@ public class ProtonConnection extends
ProtonEndpoint<Connection> implements Conn
if (session == null) {
engine.engineFailed(new ProtocolViolationException("Received
uncorrelated channel on Disposition from remote: " + channel));
} else {
- session.remoteDispsotion(disposition, channel);
+ session.remoteDisposition(disposition, channel);
}
}
diff --git
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonEngine.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonEngine.java
index 6b3e3df..d209f79 100644
---
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonEngine.java
+++
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonEngine.java
@@ -147,7 +147,7 @@ public class ProtonEngine implements Engine {
writable = false;
if (nextIdleTimeoutCheck != null) {
- LOG.trace("Cancelling scheduled Idle Timeout Check");
+ LOG.trace("Canceling scheduled Idle Timeout Check");
nextIdleTimeoutCheck.cancel(false);
nextIdleTimeoutCheck = null;
}
@@ -245,7 +245,7 @@ public class ProtonEngine implements Engine {
writable = false;
if (nextIdleTimeoutCheck != null) {
- LOG.trace("Cancelling scheduled Idle Timeout Check");
+ LOG.trace("Canceling scheduled Idle Timeout Check");
nextIdleTimeoutCheck.cancel(false);
nextIdleTimeoutCheck = null;
}
@@ -440,7 +440,7 @@ public class ProtonEngine implements Engine {
private long computeDeadline(long now, long timeout) {
long deadline = now + timeout;
- // We use 0 to signal not-initialised and/or no-timeout, so in the
+ // We use 0 to signal not-initialized and/or no-timeout, so in the
// unlikely event thats to be the actual deadline, return 1 instead
return deadline != 0 ? deadline : 1;
}
diff --git
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonLink.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonLink.java
index 96c4ddf..06fb070 100644
---
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonLink.java
+++
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonLink.java
@@ -542,7 +542,7 @@ public abstract class ProtonLink<L extends Link<L>> extends
ProtonEndpoint<L> im
// Nothing currently updated on this state change.
}
- protected void transitionToRemotelyCosed() {
+ protected void transitionToRemotelyClosed() {
// Nothing currently updated on this state change.
}
@@ -669,7 +669,7 @@ public abstract class ProtonLink<L extends Link<L>> extends
ProtonEndpoint<L> im
if (detach.getClosed()) {
remoteState = LinkState.CLOSED;
operability = LinkOperabilityState.LINK_REMOTELY_CLOSED;
- transitionToRemotelyCosed();
+ transitionToRemotelyClosed();
fireRemoteClose();
} else {
remoteState = LinkState.DETACHED;
diff --git
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonLinkCreditState.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonLinkCreditState.java
index e60b14a..1412258 100644
---
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonLinkCreditState.java
+++
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonLinkCreditState.java
@@ -30,7 +30,7 @@ public class ProtonLinkCreditState implements LinkCreditState
{
private boolean drain;
private boolean echo;
- private boolean deliveryCountInitalised;
+ private boolean deliveryCountInitialized;
@SuppressWarnings("unused")
private long remoteDeliveryCount;
@@ -40,7 +40,7 @@ public class ProtonLinkCreditState implements LinkCreditState
{
public ProtonLinkCreditState() {}
public ProtonLinkCreditState(int deliveryCount) {
- initialiseDeliveryCount(deliveryCount);
+ initializeDeliveryCount(deliveryCount);
}
@Override
@@ -101,17 +101,17 @@ public class ProtonLinkCreditState implements
LinkCreditState {
return deliveryCount--;
}
- boolean isDeliveryCountInitalised() {
- return deliveryCountInitalised;
+ boolean isDeliveryCountInitialized() {
+ return deliveryCountInitialized;
}
- void initialiseDeliveryCount(int deliveryCount) {
+ void initializeDeliveryCount(int deliveryCount) {
this.deliveryCount = deliveryCount;
- deliveryCountInitalised = true;
+ deliveryCountInitialized = true;
}
public void updateCredit(int effectiveCredit) {
- // TODO: change credit to a long, or ensure inc/decrements above work
fully if it has wrapped.
+ // TODO: change credit to a long, or ensure increments/decrements
above work fully if it has wrapped.
this.credit = effectiveCredit;
}
diff --git
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonReceiver.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonReceiver.java
index 4cb0d7a..8284cb5 100644
---
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonReceiver.java
+++
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonReceiver.java
@@ -321,7 +321,7 @@ public class ProtonReceiver extends ProtonLink<Receiver>
implements Receiver {
throw new ProtocolViolationException("Sending peer attach had no
initial delivery count");
}
- getCreditState().initialiseDeliveryCount((int)
attach.getInitialDeliveryCount());
+ getCreditState().initializeDeliveryCount((int)
attach.getInitialDeliveryCount());
return this;
}
@@ -436,7 +436,7 @@ public class ProtonReceiver extends ProtonLink<Receiver>
implements Receiver {
protected ProtonReceiver decorateOutgoingFlow(Flow flow) {
flow.setLinkCredit(getCredit());
flow.setHandle(getHandle());
- if (getCreditState().isDeliveryCountInitalised()) {
+ if (getCreditState().isDeliveryCountInitialized()) {
flow.setDeliveryCount(getCreditState().getDeliveryCount());
}
flow.setDrain(isDraining());
diff --git
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonSender.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonSender.java
index e40c7bf..a5f0fa7 100644
---
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonSender.java
+++
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonSender.java
@@ -211,7 +211,7 @@ public class ProtonSender extends ProtonLink<Sender>
implements Sender {
@Override
protected final ProtonSender handleRemoteDisposition(Disposition
disposition, ProtonIncomingDelivery delivery) {
- throw new IllegalStateException("Sender link should never handle
dispsotiions for incoming deliveries");
+ throw new IllegalStateException("Sender link should never handle
disposition for incoming deliveries");
}
@Override
@@ -410,7 +410,7 @@ public class ProtonSender extends ProtonLink<Sender>
implements Sender {
}
@Override
- protected void transitionToRemotelyCosed() {
+ protected void transitionToRemotelyClosed() {
sendable = false;
}
diff --git
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonSession.java
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonSession.java
index 329fcb1..e8e7c91 100644
---
a/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonSession.java
+++
b/protonj2/src/main/java/org/apache/qpid/protonj2/engine/impl/ProtonSession.java
@@ -584,7 +584,7 @@ public class ProtonSession extends ProtonEndpoint<Session>
implements Session {
}
}
- void remoteDispsotion(Disposition disposition, int channel) {
+ void remoteDisposition(Disposition disposition, int channel) {
if (disposition.getRole() == Role.RECEIVER) {
outgoingWindow.handleDisposition(disposition);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
