Skip to content

[pulsar-client] remove duplicate cnx method #6490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sijie merged 1 commit into from
Mar 6, 2020
Merged

[pulsar-client] remove duplicate cnx method #6490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pulsar-broker/src/test/java/org/apache/pulsar/client/api/ProducerCreationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void testGeneratedNameProducerReconnect(TopicDomain domain) throws Pulsar
//simulate create producer timeout.
Thread.sleep(3000);

producer.getConnectionHandler().connectionClosed(producer.getConnectionHandler().getClientCnx());
producer.getConnectionHandler().connectionClosed(producer.getConnectionHandler().cnx());
Assert.assertFalse(producer.isConnected());
Thread.sleep(3000);
Assert.assertEquals(producer.getConnectionHandler().getEpoch(), 1);
Expand Down
8 changes: 2 additions & 6 deletions pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,15 @@ protected void resetBackoff() {
backoff.reset();
}

protected ClientCnx cnx() {
@VisibleForTesting
public ClientCnx cnx() {
return CLIENT_CNX_UPDATER.get(this);
}

protected boolean isRetriableError(PulsarClientException e) {
return e instanceof PulsarClientException.LookupException;
}

@VisibleForTesting
public ClientCnx getClientCnx() {
return CLIENT_CNX_UPDATER.get(this);
}

protected void setClientCnx(ClientCnx clientCnx) {
CLIENT_CNX_UPDATER.set(this, clientCnx);
}
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,7 +1842,7 @@ void connectionClosed(ClientCnx cnx) {

@VisibleForTesting
public ClientCnx getClientCnx() {
return this.connectionHandler.getClientCnx();
return this.connectionHandler.cnx();
}

void setClientCnx(ClientCnx clientCnx) {
Expand Down
10 changes: 5 additions & 5 deletions pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,8 @@ protected ByteBufPair sendMessage(long producerId, long lowestSequenceId, long h
}

private ChecksumType getChecksumType() {
if (connectionHandler.getClientCnx() == null
|| connectionHandler.getClientCnx().getRemoteEndpointProtocolVersion() >= brokerChecksumSupportedVersion()) {
if (connectionHandler.cnx() == null
|| connectionHandler.cnx().getRemoteEndpointProtocolVersion() >= brokerChecksumSupportedVersion()) {
return ChecksumType.Crc32c;
} else {
return ChecksumType.None;
Expand Down Expand Up @@ -783,11 +783,11 @@ public CompletableFuture<Void> closeAsync() {

@Override
public boolean isConnected() {
return connectionHandler.getClientCnx() != null && (getState() == State.Ready);
return connectionHandler.cnx() != null && (getState() == State.Ready);
}

public boolean isWritable() {
ClientCnx cnx = connectionHandler.getClientCnx();
ClientCnx cnx = connectionHandler.cnx();
return cnx != null && cnx.channel().isWritable();
}

Expand Down Expand Up @@ -1601,7 +1601,7 @@ void connectionClosed(ClientCnx cnx) {
}

ClientCnx getClientCnx() {
return this.connectionHandler.getClientCnx();
return this.connectionHandler.cnx();
}

void setClientCnx(ClientCnx clientCnx) {
Expand Down