You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/09/02 13:17:03 UTC
[pulsar] branch master updated: Remove the uncorrect VisableTesting
annotation in pulsar-client (#11784)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 4147db8 Remove the uncorrect VisableTesting annotation in pulsar-client (#11784)
4147db8 is described below
commit 4147db88bc08eb3b2dab97a45af178fd9f4c7a6b
Author: Shoothzj <sh...@gmail.com>
AuthorDate: Thu Sep 2 21:15:57 2021 +0800
Remove the uncorrect VisableTesting annotation in pulsar-client (#11784)
---
.../src/main/java/org/apache/pulsar/client/impl/Backoff.java | 1 -
.../main/java/org/apache/pulsar/client/impl/BatchMessageAcker.java | 2 --
.../src/main/java/org/apache/pulsar/client/impl/ClientCnx.java | 2 --
.../main/java/org/apache/pulsar/client/impl/ConnectionHandler.java | 5 -----
.../src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java | 1 -
.../src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java | 2 --
.../java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java | 1 -
.../main/java/org/apache/pulsar/client/impl/ProducerBuilderImpl.java | 4 ----
.../main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java | 1 -
9 files changed, 19 deletions(-)
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Backoff.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Backoff.java
index 2a6e525..8f33599 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Backoff.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/Backoff.java
@@ -41,7 +41,6 @@ public class Backoff {
private static final Random random = new Random();
- @VisibleForTesting
Backoff(long initial, TimeUnit unitInitial, long max, TimeUnit unitMax, long mandatoryStop,
TimeUnit unitMandatoryStop, Clock clock) {
this.initial = unitInitial.toMillis(initial);
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAcker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAcker.java
index 8b178f2..5f9e617 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAcker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageAcker.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.client.impl;
-import com.google.common.annotations.VisibleForTesting;
import java.util.BitSet;
class BatchMessageAcker {
@@ -49,7 +48,6 @@ class BatchMessageAcker {
this.batchSize = batchSize;
}
- @VisibleForTesting
BitSet getBitSet() {
return bitSet;
}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
index 6ac7b13..96e369a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
@@ -20,7 +20,6 @@ package org.apache.pulsar.client.impl;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Queues;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
@@ -1147,7 +1146,6 @@ public class ClientCnx extends PulsarHandler {
}
}
- @VisibleForTesting
public void close() {
if (ctx != null) {
ctx.close();
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
index 6b00a8f..8fb7ab4 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
@@ -19,11 +19,9 @@
package org.apache.pulsar.client.impl;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import com.google.common.annotations.VisibleForTesting;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.impl.HandlerState.State;
import org.slf4j.Logger;
@@ -117,7 +115,6 @@ public class ConnectionHandler {
return EPOCH_UPDATER.incrementAndGet(this);
}
- @VisibleForTesting
public void connectionClosed(ClientCnx cnx) {
lastConnectionClosedTimestamp = System.currentTimeMillis();
state.client.getCnxPool().releaseConnection(cnx);
@@ -142,7 +139,6 @@ public class ConnectionHandler {
backoff.reset();
}
- @VisibleForTesting
public ClientCnx cnx() {
return CLIENT_CNX_UPDATER.get(this);
}
@@ -170,7 +166,6 @@ public class ConnectionHandler {
return false;
}
- @VisibleForTesting
public long getEpoch() {
return epoch;
}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java
index eebe71a..9cf2da1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionPool.java
@@ -272,7 +272,6 @@ public class ConnectionPool implements Closeable {
return future;
}
- @VisibleForTesting
CompletableFuture<List<InetAddress>> resolveName(String hostname) {
CompletableFuture<List<InetAddress>> future = new CompletableFuture<>();
dnsResolver.resolveAll(hostname).addListener((Future<List<InetAddress>> resolveFuture) -> {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
index a71362b..98767d1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
@@ -20,7 +20,6 @@ package org.apache.pulsar.client.impl;
import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.pulsar.common.protocol.Commands.hasChecksum;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.Iterables;
import com.scurrilous.circe.checksum.Crc32cIntChecksum;
@@ -2224,7 +2223,6 @@ public class ConsumerImpl<T> extends ConsumerBase<T> implements ConnectionHandle
this.connectionHandler.connectionClosed(cnx);
}
- @VisibleForTesting
public ClientCnx getClientCnx() {
return this.connectionHandler.cnx();
}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
index 6f7aeb5..5a0bf9a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
@@ -895,7 +895,6 @@ public class MultiTopicsConsumerImpl<T> extends ConsumerBase<T> {
}
// subscribe one more given topic, but already know the numberPartitions
- @VisibleForTesting
CompletableFuture<Void> subscribeAsync(String topicName, int numberPartitions) {
TopicName topicNameInstance = getTopicName(topicName);
if (topicNameInstance == null) {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderImpl.java
index 48f9f2e..d3a1bb1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerBuilderImpl.java
@@ -18,8 +18,6 @@
*/
package org.apache.pulsar.client.impl;
-import com.google.common.annotations.VisibleForTesting;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -45,7 +43,6 @@ import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.interceptor.ProducerInterceptor;
import org.apache.pulsar.client.api.interceptor.ProducerInterceptorWrapper;
-import org.apache.pulsar.client.impl.DefaultCryptoKeyReader;
import org.apache.pulsar.client.impl.conf.ConfigurationDataUtils;
import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
import org.apache.pulsar.common.util.FutureUtil;
@@ -62,7 +59,6 @@ public class ProducerBuilderImpl<T> implements ProducerBuilder<T> {
private Schema<T> schema;
private List<ProducerInterceptor> interceptorList;
- @VisibleForTesting
public ProducerBuilderImpl(PulsarClientImpl client, Schema<T> schema) {
this(client, new ProducerConfigurationData(), schema);
}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
index b4ed1e8..2e6b741 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
@@ -222,7 +222,6 @@ public class PulsarClientImpl implements PulsarClient {
return conf;
}
- @VisibleForTesting
public Clock getClientClock() {
return clientClock;
}