You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2022/09/28 08:12:52 UTC
[pulsar] branch master updated: [cleanup][broker][Modernizer] fix violations in pulsar-broker (#17691)
This is an automated email from the ASF dual-hosted git repository.
lhotari 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 8aef1bfcea5 [cleanup][broker][Modernizer] fix violations in pulsar-broker (#17691)
8aef1bfcea5 is described below
commit 8aef1bfcea539470cff470e58f8f27d0f74c0b43
Author: youzipi <bl...@qq.com>
AuthorDate: Wed Sep 28 16:12:43 2022 +0800
[cleanup][broker][Modernizer] fix violations in pulsar-broker (#17691)
Co-authored-by: Marvin Cai <ca...@gmail.com>
---
.../apache/bookkeeper/mledger/ManagedCursor.java | 2 +-
.../apache/bookkeeper/mledger/ReadOnlyCursor.java | 2 +-
.../bookkeeper/mledger/impl/ManagedCursorImpl.java | 2 +-
.../org/apache/bookkeeper/mledger/impl/OpScan.java | 4 +-
.../mledger/impl/ManagedCursorContainerTest.java | 2 +-
pulsar-broker/pom.xml | 4 -
.../apache/pulsar/broker/admin/AdminResource.java | 3 +-
.../pulsar/broker/admin/impl/NamespacesBase.java | 25 ++--
.../broker/admin/impl/PersistentTopicsBase.java | 52 ++++----
.../broker/admin/impl/SchemasResourceBase.java | 13 +-
.../pulsar/broker/admin/impl/TenantsBase.java | 3 +-
.../pulsar/broker/admin/impl/TransactionsBase.java | 5 +-
.../apache/pulsar/broker/admin/v1/Namespaces.java | 4 +-
.../broker/admin/v1/NonPersistentTopics.java | 8 +-
.../apache/pulsar/broker/admin/v2/Namespaces.java | 3 +-
.../broker/admin/v2/NonPersistentTopics.java | 10 +-
.../broker/loadbalance/impl/LoadManagerShared.java | 4 +-
.../broker/namespace/NamespaceEphemeralData.java | 8 +-
.../pulsar/broker/namespace/NamespaceService.java | 26 ++--
.../pulsar/broker/namespace/OwnershipCache.java | 4 +-
.../pulsar/broker/service/AbstractTopic.java | 8 +-
.../pulsar/broker/service/BacklogQuotaManager.java | 4 +-
.../pulsar/broker/service/BrokerService.java | 25 ++--
.../org/apache/pulsar/broker/service/Consumer.java | 3 +-
.../pulsar/broker/service/EntryFilterSupport.java | 20 +--
.../org/apache/pulsar/broker/service/Producer.java | 3 +-
.../apache/pulsar/broker/service/PulsarStats.java | 12 +-
.../SystemTopicBasedTopicPoliciesService.java | 4 +-
.../org/apache/pulsar/broker/service/Topic.java | 3 +-
.../service/nonpersistent/NonPersistentTopic.java | 15 ++-
.../PersistentDispatcherSingleActiveConsumer.java | 4 +-
.../service/persistent/PersistentSubscription.java | 140 +++++++++++----------
.../broker/service/persistent/PersistentTopic.java | 27 ++--
.../service/schema/BookkeeperSchemaStorage.java | 14 ++-
.../service/schema/SchemaRegistryService.java | 4 +-
.../broker/stats/AllocatorStatsGenerator.java | 4 +-
.../broker/stats/BookieClientStatsGenerator.java | 7 +-
.../broker/stats/BrokerOperabilityMetrics.java | 4 +-
.../pulsar/broker/stats/MBeanStatsGenerator.java | 4 +-
.../pulsar/broker/stats/MetricsGenerator.java | 4 +-
.../apache/pulsar/broker/stats/NamespaceStats.java | 4 +-
.../pulsar/broker/stats/ReplicationMetrics.java | 4 +-
.../broker/stats/metrics/AbstractMetrics.java | 13 +-
.../broker/stats/metrics/ManagedCursorMetrics.java | 8 +-
.../stats/metrics/ManagedLedgerCacheMetrics.java | 4 +-
.../broker/stats/metrics/ManagedLedgerMetrics.java | 10 +-
.../broker/systopic/SystemTopicClientBase.java | 5 +-
.../apache/pulsar/broker/admin/AdminApi2Test.java | 33 ++---
.../apache/pulsar/broker/admin/AdminApiTest.java | 84 ++++++-------
.../org/apache/pulsar/broker/admin/AdminTest.java | 7 +-
.../admin/AnalyzeBacklogSubscriptionTest.java | 23 ++--
.../broker/admin/CreateSubscriptionTest.java | 16 ++-
.../broker/admin/IncrementPartitionsTest.java | 4 +-
.../broker/admin/MaxUnackedMessagesTest.java | 3 +-
.../apache/pulsar/broker/admin/NamespacesTest.java | 56 +++++----
.../pulsar/broker/admin/NamespacesV2Test.java | 4 +-
.../pulsar/broker/admin/PersistentTopicsTest.java | 13 +-
.../pulsar/broker/admin/TopicPoliciesTest.java | 13 +-
.../pulsar/broker/admin/v1/V1_AdminApi2Test.java | 28 ++---
.../pulsar/broker/admin/v1/V1_AdminApiTest.java | 66 +++++-----
.../apache/pulsar/broker/auth/AuthLogsTest.java | 18 ++-
.../broker/auth/AuthenticationServiceTest.java | 6 +-
.../pulsar/broker/auth/AuthorizationTest.java | 4 +-
.../broker/auth/MockAuthenticationProvider.java | 3 -
.../loadbalance/impl/OverloadShedderTest.java | 12 +-
.../loadbalance/impl/ThresholdShedderTest.java | 10 +-
.../broker/namespace/NamespaceServiceTest.java | 30 ++---
.../broker/namespace/OwnershipCacheTest.java | 8 +-
.../broker/service/AbstractBaseDispatcherTest.java | 4 +-
.../broker/service/BacklogQuotaManagerTest.java | 40 +++---
.../pulsar/broker/service/BatchMessageTest.java | 36 +++---
.../BatchMessageWithBatchIndexLevelTest.java | 17 ++-
.../broker/service/BrokerBookieIsolationTest.java | 11 +-
.../pulsar/broker/service/BrokerServiceTest.java | 5 +-
.../service/BrokerServiceThrottlingTest.java | 4 +-
.../broker/service/DistributedIdGeneratorTest.java | 4 +-
...angeExclusiveStickyKeyConsumerSelectorTest.java | 8 +-
.../pulsar/broker/service/MessageTTLTest.java | 5 +-
.../pulsar/broker/service/PeerReplicatorTest.java | 17 ++-
.../broker/service/PersistentFailoverE2ETest.java | 19 ++-
.../broker/service/PersistentQueueE2ETest.java | 19 ++-
.../service/PersistentTopicConcurrentTest.java | 4 +-
.../pulsar/broker/service/PersistentTopicTest.java | 10 +-
.../pulsar/broker/service/RackAwareTest.java | 7 +-
.../pulsar/broker/service/ReplicatorTest.java | 13 +-
.../pulsar/broker/service/ReplicatorTlsTest.java | 5 +-
.../pulsar/broker/service/ServerCnxTest.java | 54 ++++----
.../broker/service/SubscriptionSeekTest.java | 5 +-
.../SystemTopicBasedTopicPoliciesServiceTest.java | 5 +-
.../MessageRedeliveryControllerTest.java | 20 ++-
.../broker/service/plugin/FilterEntryTest.java | 15 ++-
.../KeyValueSchemaCompatibilityCheckTest.java | 73 ++++++-----
.../StreamingEntryReaderTests.java | 44 ++++---
.../pulsar/broker/stats/ConsumerStatsTest.java | 3 +-
.../pulsar/broker/stats/SubscriptionStatsTest.java | 16 ++-
.../TransactionCoordinatorClientTest.java | 4 +-
.../pulsar/broker/web/ExceptionHandlerTest.java | 8 +-
.../pulsar/broker/web/PulsarWebResourceTest.java | 5 +-
.../pulsar/broker/web/RestExceptionTest.java | 1 -
.../pulsar/sql/presto/PulsarSplitManager.java | 29 ++---
.../pulsar/sql/presto/TestPulsarConnector.java | 59 +++++----
101 files changed, 740 insertions(+), 811 deletions(-)
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java
index 17dbac09a22..cf022d3552e 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java
@@ -18,13 +18,13 @@
*/
package org.apache.bookkeeper.mledger;
-import com.google.common.base.Predicate;
import com.google.common.collect.Range;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
+import java.util.function.Predicate;
import org.apache.bookkeeper.common.annotation.InterfaceAudience;
import org.apache.bookkeeper.common.annotation.InterfaceStability;
import org.apache.bookkeeper.mledger.AsyncCallbacks.ClearBacklogCallback;
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ReadOnlyCursor.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ReadOnlyCursor.java
index 28454d647b0..fe086f00980 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ReadOnlyCursor.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ReadOnlyCursor.java
@@ -18,9 +18,9 @@
*/
package org.apache.bookkeeper.mledger;
-import com.google.common.base.Predicate;
import com.google.common.collect.Range;
import java.util.List;
+import java.util.function.Predicate;
import org.apache.bookkeeper.common.annotation.InterfaceAudience;
import org.apache.bookkeeper.common.annotation.InterfaceStability;
import org.apache.bookkeeper.mledger.AsyncCallbacks.ReadEntriesCallback;
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
index 6d595e76dc1..fe1798a0d7e 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
@@ -28,7 +28,6 @@ import static org.apache.bookkeeper.mledger.util.Errors.isNoSuchLedgerExistsExce
import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.google.common.collect.Range;
@@ -60,6 +59,7 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Function;
+import java.util.function.Predicate;
import org.apache.bookkeeper.client.AsyncCallback.CloseCallback;
import org.apache.bookkeeper.client.AsyncCallback.OpenCallback;
import org.apache.bookkeeper.client.BKException;
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpScan.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpScan.java
index e65e418a5ec..9e56711b386 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpScan.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpScan.java
@@ -18,11 +18,11 @@
*/
package org.apache.bookkeeper.mledger.impl;
-import com.google.common.base.Predicate;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Predicate;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.mledger.AsyncCallbacks.ReadEntriesCallback;
import org.apache.bookkeeper.mledger.AsyncCallbacks.ScanCallback;
@@ -81,7 +81,7 @@ class OpScan implements ReadEntriesCallback {
callback.scanComplete(lastSeenPosition, ScanOutcome.ABORTED, OpScan.this.ctx);
return;
}
- if (!condition.apply(entry)) {
+ if (!condition.test(entry)) {
log.warn("[{}] Scan abort due to user code", OpScan.this.cursor);
callback.scanComplete(lastSeenPosition, ScanOutcome.USER_INTERRUPTED, OpScan.this.ctx);
return;
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java
index 312e09f846e..dfb65d59c78 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java
@@ -25,7 +25,6 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.common.collect.Range;
import com.google.common.collect.Sets;
@@ -34,6 +33,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.function.Predicate;
import java.util.concurrent.CompletableFuture;
import org.apache.bookkeeper.mledger.AsyncCallbacks;
import org.apache.bookkeeper.mledger.AsyncCallbacks.ClearBacklogCallback;
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index df04da60bc6..ca36f9ca371 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -437,10 +437,6 @@
<failOnViolations>true</failOnViolations>
<javaVersion>17</javaVersion>
<ignorePackages>
- <ignorePackage>org.apache.pulsar.broker.admin</ignorePackage>
- <ignorePackage>org.apache.pulsar.broker.namespace</ignorePackage>
- <ignorePackage>org.apache.pulsar.broker.service</ignorePackage>
- <ignorePackage>org.apache.pulsar.broker.stats</ignorePackage>
<ignorePackage>org.apache.pulsar.client</ignorePackage>
</ignorePackages>
<exclusionPatterns>
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
index 47c69ecc698..bab7ed05424 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
@@ -23,6 +23,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
@@ -802,7 +803,7 @@ public abstract class AdminResource extends PulsarWebResource {
@CanIgnoreReturnValue
public static <T> T checkNotNull(T reference) {
- return com.google.common.base.Preconditions.checkNotNull(reference);
+ return Objects.requireNonNull(reference);
}
protected void checkNotNull(Object o, String errorMessage) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
index 93ddbf794c0..01532449687 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -22,7 +22,6 @@ package org.apache.pulsar.broker.admin.impl;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.pulsar.common.policies.data.PoliciesUtil.defaultBundle;
import static org.apache.pulsar.common.policies.data.PoliciesUtil.getBundles;
-import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.lang.reflect.Field;
import java.net.MalformedURLException;
@@ -176,7 +175,7 @@ public abstract class NamespacesBase extends AdminResource {
}
protected CompletableFuture<List<String>> internalGetNonPersistentTopics(Policies policies) {
- final List<CompletableFuture<List<String>>> futures = Lists.newArrayList();
+ final List<CompletableFuture<List<String>>> futures = new ArrayList<>();
final List<String> boundaries = policies.bundles.getBoundaries();
for (int i = 0; i < boundaries.size() - 1; i++) {
final String bundle = String.format("%s_%s", boundaries.get(i), boundaries.get(i + 1));
@@ -189,7 +188,7 @@ public abstract class NamespacesBase extends AdminResource {
}
return FutureUtil.waitForAll(futures)
.thenApply(__ -> {
- final List<String> topics = Lists.newArrayList();
+ final List<String> topics = new ArrayList<>();
for (int i = 0; i < futures.size(); i++) {
List<String> topicList = futures.get(i).join();
if (topicList != null) {
@@ -341,7 +340,7 @@ public abstract class NamespacesBase extends AdminResource {
if (replicationClusters.size() == 1
&& !policies.replication_clusters.contains(config().getClusterName())) {
// the only replication cluster is other cluster, redirect
- String replCluster = Lists.newArrayList(policies.replication_clusters).get(0);
+ String replCluster = new ArrayList<>(policies.replication_clusters).get(0);
return clusterResources().getClusterAsync(replCluster)
.thenCompose(replClusterDataOpt -> {
ClusterData replClusterData = replClusterDataOpt
@@ -423,7 +422,7 @@ public abstract class NamespacesBase extends AdminResource {
if (policies.replication_clusters.size() == 1
&& !policies.replication_clusters.contains(config().getClusterName())) {
// the only replication cluster is other cluster, redirect
- String replCluster = Lists.newArrayList(policies.replication_clusters).get(0);
+ String replCluster = new ArrayList<>(policies.replication_clusters).get(0);
future = clusterResources().getClusterAsync(replCluster)
.thenCompose(clusterData -> {
if (clusterData.isEmpty()) {
@@ -768,7 +767,7 @@ public abstract class NamespacesBase extends AdminResource {
Policies policies = getNamespacePolicies(namespaceName);
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
List<String> boundaries = policies.bundles.getBoundaries();
for (int i = 0; i < boundaries.size() - 1; i++) {
String bundle = String.format("%s_%s", boundaries.get(i), boundaries.get(i + 1));
@@ -814,7 +813,7 @@ public abstract class NamespacesBase extends AdminResource {
})
.thenCompose(__ -> getNamespacePoliciesAsync(namespaceName))
.thenCompose(policies -> {
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
List<String> boundaries = policies.bundles.getBoundaries();
for (int i = 0; i < boundaries.size() - 1; i++) {
String bundle = String.format("%s_%s", boundaries.get(i), boundaries.get(i + 1));
@@ -1342,7 +1341,7 @@ public abstract class NamespacesBase extends AdminResource {
protected void internalClearNamespaceBacklog(AsyncResponse asyncResponse, boolean authoritative) {
validateNamespaceOperation(namespaceName, NamespaceOperation.CLEAR_BACKLOG);
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
try {
NamespaceBundles bundles = pulsar().getNamespaceService().getNamespaceBundleFactory()
.getBundles(namespaceName);
@@ -1407,7 +1406,7 @@ public abstract class NamespacesBase extends AdminResource {
validateNamespaceOperation(namespaceName, NamespaceOperation.CLEAR_BACKLOG);
checkNotNull(subscription, "Subscription should not be null");
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
try {
NamespaceBundles bundles = pulsar().getNamespaceService().getNamespaceBundleFactory()
.getBundles(namespaceName);
@@ -1474,7 +1473,7 @@ public abstract class NamespacesBase extends AdminResource {
validateNamespaceOperation(namespaceName, NamespaceOperation.UNSUBSCRIBE);
checkNotNull(subscription, "Subscription should not be null");
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
try {
NamespaceBundles bundles = pulsar().getNamespaceService().getNamespaceBundleFactory()
.getBundles(namespaceName);
@@ -1721,7 +1720,7 @@ public abstract class NamespacesBase extends AdminResource {
List<Topic> topicList = pulsar().getBrokerService().getAllTopicsFromNamespaceBundle(nsName.toString(),
nsName.toString() + "/" + bundleRange);
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
if (subscription != null) {
if (subscription.startsWith(pulsar().getConfiguration().getReplicatorPrefix())) {
subscription = PersistentReplicator.getRemoteCluster(subscription);
@@ -1753,7 +1752,7 @@ public abstract class NamespacesBase extends AdminResource {
try {
List<Topic> topicList = pulsar().getBrokerService().getAllTopicsFromNamespaceBundle(nsName.toString(),
nsName.toString() + "/" + bundleRange);
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
if (subscription.startsWith(pulsar().getConfiguration().getReplicatorPrefix())) {
throw new RestException(Status.PRECONDITION_FAILED, "Cannot unsubscribe a replication cursor");
} else {
@@ -1794,7 +1793,7 @@ public abstract class NamespacesBase extends AdminResource {
throw new RestException(Status.BAD_REQUEST, "Input bundles do not cover the whole hash range. first:"
+ partitions.first() + ", last:" + partitions.last());
}
- List<String> bundles = Lists.newArrayList();
+ List<String> bundles = new ArrayList<>();
bundles.addAll(partitions);
return BundlesData.builder()
.boundaries(bundles)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index 04a4ee7a23e..86b242c9497 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -22,8 +22,6 @@ import static org.apache.pulsar.common.naming.SystemTopicNames.isTransactionCoor
import static org.apache.pulsar.common.naming.SystemTopicNames.isTransactionInternalName;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.github.zafarkhaja.semver.Version;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
@@ -251,7 +249,7 @@ public class PersistentTopicsBase extends AdminResource {
throw new RestException(Status.NOT_FOUND, "Namespace does not exist");
}
- Map<String, Set<AuthAction>> permissions = Maps.newHashMap();
+ Map<String, Set<AuthAction>> permissions = new HashMap<>();
String topicUri = topicName.toString();
AuthPolicies auth = policies.get().auth_policies;
// First add namespace level permissions
@@ -871,8 +869,7 @@ public class PersistentTopicsBase extends AdminResource {
getPartitionedTopicMetadataAsync(topicName, authoritative, false)
.thenAccept(meta -> {
if (meta.partitions > 0) {
- final List<CompletableFuture<Void>> futures =
- Lists.newArrayListWithCapacity(meta.partitions);
+ final List<CompletableFuture<Void>> futures = new ArrayList<>(meta.partitions);
for (int i = 0; i < meta.partitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
try {
@@ -1145,7 +1142,7 @@ public class PersistentTopicsBase extends AdminResource {
final Set<String> subscriptions =
Collections.newSetFromMap(
new ConcurrentHashMap<>(partitionMetadata.partitions));
- final List<CompletableFuture<Object>> subscriptionFutures = Lists.newArrayList();
+ final List<CompletableFuture<Object>> subscriptionFutures = new ArrayList<>();
if (topicName.getDomain() == TopicDomain.persistent) {
final Map<Integer, CompletableFuture<Boolean>> existsFutures =
new ConcurrentHashMap<>(partitionMetadata.partitions);
@@ -1153,7 +1150,7 @@ public class PersistentTopicsBase extends AdminResource {
existsFutures.put(i,
topicResources().persistentTopicExists(topicName.getPartition(i)));
}
- FutureUtil.waitForAll(Lists.newArrayList(existsFutures.values()))
+ FutureUtil.waitForAll(new ArrayList<>(existsFutures.values()))
.thenApply(unused2 ->
existsFutures.entrySet().stream().filter(e -> e.getValue().join())
.map(item -> topicName.getPartition(item.getKey()).toString())
@@ -1243,7 +1240,7 @@ public class PersistentTopicsBase extends AdminResource {
private void internalGetSubscriptionsForNonPartitionedTopic(AsyncResponse asyncResponse) {
getTopicReferenceAsync(topicName)
- .thenAccept(topic -> asyncResponse.resume(Lists.newArrayList(topic.getSubscriptions().keys())))
+ .thenAccept(topic -> asyncResponse.resume(new ArrayList<>(topic.getSubscriptions().keys())))
.exceptionally(ex -> {
// If the exception is not redirect exception we need to log it.
if (!isRedirectException(ex)) {
@@ -1309,7 +1306,7 @@ public class PersistentTopicsBase extends AdminResource {
.thenAccept(partitionMetadata -> {
if (partitionMetadata.partitions > 0) {
final List<CompletableFuture<String>> futures =
- Lists.newArrayListWithCapacity(partitionMetadata.partitions);
+ new ArrayList<>(partitionMetadata.partitions);
PartitionedManagedLedgerInfo partitionedManagedLedgerInfo = new PartitionedManagedLedgerInfo();
for (int i = 0; i < partitionMetadata.partitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
@@ -1509,7 +1506,7 @@ public class PersistentTopicsBase extends AdminResource {
PartitionedTopicInternalStats stats = new PartitionedTopicInternalStats(partitionMetadata);
- List<CompletableFuture<PersistentTopicInternalStats>> topicStatsFutureList = Lists.newArrayList();
+ List<CompletableFuture<PersistentTopicInternalStats>> topicStatsFutureList = new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
try {
topicStatsFutureList.add(pulsar().getAdminClient().topics()
@@ -1571,7 +1568,7 @@ public class PersistentTopicsBase extends AdminResource {
getPartitionedTopicMetadataAsync(topicName,
authoritative, false).thenAcceptAsync(partitionMetadata -> {
if (partitionMetadata.partitions > 0) {
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
@@ -1792,7 +1789,7 @@ public class PersistentTopicsBase extends AdminResource {
getPartitionedTopicMetadataAsync(topicName,
authoritative, false).thenAccept(partitionMetadata -> {
if (partitionMetadata.partitions > 0) {
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
@@ -1895,7 +1892,7 @@ public class PersistentTopicsBase extends AdminResource {
return getPartitionedTopicMetadataAsync(topicName,
authoritative, false).thenCompose(partitionMetadata -> {
if (partitionMetadata.partitions > 0) {
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
@@ -2072,8 +2069,7 @@ public class PersistentTopicsBase extends AdminResource {
partitionMetadata, expireTimeInSeconds, authoritative);
} else {
if (partitionMetadata.partitions > 0) {
- final List<CompletableFuture<Void>> futures =
- Lists.newArrayListWithCapacity(partitionMetadata.partitions);
+ final List<CompletableFuture<Void>> futures = new ArrayList<>(partitionMetadata.partitions);
// expire messages for each partition topic
for (int i = 0; i < partitionMetadata.partitions; i++) {
@@ -2145,9 +2141,9 @@ public class PersistentTopicsBase extends AdminResource {
}
PersistentTopic topic = (PersistentTopic) t;
final List<CompletableFuture<Void>> futures =
- Lists.newArrayListWithCapacity((int) topic.getReplicators().size());
+ new ArrayList<>((int) topic.getReplicators().size());
List<String> subNames =
- Lists.newArrayListWithCapacity((int) topic.getReplicators().size()
+ new ArrayList<>((int) topic.getReplicators().size()
+ (int) topic.getSubscriptions().size());
subNames.addAll(topic.getReplicators().keys());
subNames.addAll(topic.getSubscriptions().keys());
@@ -2472,7 +2468,7 @@ public class PersistentTopicsBase extends AdminResource {
getPartitionedTopicMetadataAsync(topicName,
authoritative, false).thenAcceptAsync(partitionMetadata -> {
if (partitionMetadata.partitions > 0) {
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
@@ -2590,7 +2586,7 @@ public class PersistentTopicsBase extends AdminResource {
getPartitionedTopicMetadataAsync(topicName,
authoritative, false).thenAcceptAsync(partitionMetadata -> {
if (partitionMetadata.partitions > 0) {
- final List<CompletableFuture<Map<String, String>>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Map<String, String>>> futures = new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
@@ -3242,10 +3238,10 @@ public class PersistentTopicsBase extends AdminResource {
Map<BacklogQuota.BacklogQuotaType, BacklogQuota> quotaMap = op
.map(TopicPolicies::getBackLogQuotaMap)
.map(map -> {
- HashMap<BacklogQuota.BacklogQuotaType, BacklogQuota> hashMap = Maps.newHashMap();
+ HashMap<BacklogQuota.BacklogQuotaType, BacklogQuota> hashMap = new HashMap<>();
map.forEach((key, value) -> hashMap.put(BacklogQuota.BacklogQuotaType.valueOf(key), value));
return hashMap;
- }).orElse(Maps.newHashMap());
+ }).orElse(new HashMap<>());
if (applied && quotaMap.isEmpty()) {
quotaMap = getNamespacePolicies(namespaceName).backlog_quota_map;
if (quotaMap.isEmpty()) {
@@ -3804,7 +3800,7 @@ public class PersistentTopicsBase extends AdminResource {
if (partitionMetadata.partitions > 0) {
Map<Integer, MessageId> messageIds = new ConcurrentHashMap<>(partitionMetadata.partitions);
final List<CompletableFuture<MessageId>> futures =
- Lists.newArrayListWithCapacity(partitionMetadata.partitions);
+ new ArrayList<>(partitionMetadata.partitions);
for (int i = 0; i < partitionMetadata.partitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
@@ -3882,7 +3878,7 @@ public class PersistentTopicsBase extends AdminResource {
} else {
if (partitionMetadata.partitions > 0) {
return CompletableFuture.completedFuture(null).thenAccept(unused -> {
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
// expire messages for each partition topic
for (int i = 0; i < partitionMetadata.partitions; i++) {
@@ -4148,7 +4144,7 @@ public class PersistentTopicsBase extends AdminResource {
.thenAccept(partitionMetadata -> {
final int numPartitions = partitionMetadata.partitions;
if (numPartitions > 0) {
- final List<CompletableFuture<Void>> futures = Lists.newArrayListWithCapacity(numPartitions);
+ final List<CompletableFuture<Void>> futures = new ArrayList<>(numPartitions);
for (int i = 0; i < numPartitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
@@ -4958,7 +4954,7 @@ public class PersistentTopicsBase extends AdminResource {
protected CompletableFuture<Void> internalSetSubscriptionTypesEnabled(
Set<SubscriptionType> subscriptionTypesEnabled, boolean isGlobal) {
- List<SubType> subTypes = Lists.newArrayList();
+ List<SubType> subTypes = new ArrayList<>();
subscriptionTypesEnabled.forEach(subscriptionType -> subTypes.add(SubType.valueOf(subscriptionType.name())));
return getTopicPoliciesAsyncWithRetry(topicName, isGlobal)
.thenCompose(op -> {
@@ -4975,7 +4971,7 @@ public class PersistentTopicsBase extends AdminResource {
if (!op.isPresent()) {
return CompletableFuture.completedFuture(null);
}
- op.get().setSubscriptionTypesEnabled(Lists.newArrayList());
+ op.get().setSubscriptionTypesEnabled(new ArrayList<>());
op.get().setIsGlobal(isGlobal);
return pulsar().getTopicPoliciesService().updateTopicPoliciesAsync(topicName, op.get());
});
@@ -5114,7 +5110,7 @@ public class PersistentTopicsBase extends AdminResource {
thenCompose(__ -> getPartitionedTopicMetadataAsync(topicName, authoritative, false))
.thenAccept(partitionMetadata -> {
if (partitionMetadata.partitions > 0) {
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
TopicName topicNamePartition = topicName.getPartition(i);
@@ -5252,7 +5248,7 @@ public class PersistentTopicsBase extends AdminResource {
.thenAccept(partitionMetadata -> {
if (partitionMetadata.partitions > 0) {
List<CompletableFuture<Void>> futures = new ArrayList<>(partitionMetadata.partitions);
- Map<String, Boolean> status = Maps.newHashMap();
+ Map<String, Boolean> status = new HashMap<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
TopicName partition = topicName.getPartition(i);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SchemasResourceBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SchemasResourceBase.java
index a115b26407d..0254ff395ba 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SchemasResourceBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SchemasResourceBase.java
@@ -18,13 +18,12 @@
*/
package org.apache.pulsar.broker.admin.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Objects.isNull;
import static org.apache.commons.lang.StringUtils.defaultIfEmpty;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.time.Clock;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -123,12 +122,12 @@ public class SchemasResourceBase extends AdminResource {
try {
data = DefaultImplementation.getDefaultImplementation()
.convertKeyValueDataStringToSchemaInfoSchema(payload.getSchema()
- .getBytes(Charsets.UTF_8));
+ .getBytes(StandardCharsets.UTF_8));
} catch (IOException conversionError) {
throw new RestException(conversionError);
}
} else {
- data = payload.getSchema().getBytes(Charsets.UTF_8);
+ data = payload.getSchema().getBytes(StandardCharsets.UTF_8);
}
return pulsar().getSchemaRegistryService()
.putSchemaIfAbsent(getSchemaId(),
@@ -148,7 +147,7 @@ public class SchemasResourceBase extends AdminResource {
.thenCompose(strategy -> {
String schemaId = getSchemaId();
return pulsar().getSchemaRegistryService().isCompatible(schemaId,
- SchemaData.builder().data(payload.getSchema().getBytes(Charsets.UTF_8))
+ SchemaData.builder().data(payload.getSchema().getBytes(StandardCharsets.UTF_8))
.isDeleted(false)
.timestamp(clock.millis()).type(SchemaType.valueOf(payload.getType()))
.user(defaultIfEmpty(clientAppId(), ""))
@@ -164,7 +163,7 @@ public class SchemasResourceBase extends AdminResource {
String schemaId = getSchemaId();
return pulsar().getSchemaRegistryService()
.findSchemaVersion(schemaId,
- SchemaData.builder().data(payload.getSchema().getBytes(Charsets.UTF_8))
+ SchemaData.builder().data(payload.getSchema().getBytes(StandardCharsets.UTF_8))
.isDeleted(false).timestamp(clock.millis())
.type(SchemaType.valueOf(payload.getType()))
.user(defaultIfEmpty(clientAppId(), ""))
@@ -185,7 +184,7 @@ public class SchemasResourceBase extends AdminResource {
DefaultImplementation.getDefaultImplementation()
.decodeKeyValueSchemaInfo(schemaAndMetadata.schema.toSchemaInfo()));
} else {
- schemaData = new String(schemaAndMetadata.schema.getData(), UTF_8);
+ schemaData = new String(schemaAndMetadata.schema.getData(), StandardCharsets.UTF_8);
}
return GetSchemaResponse.builder().version(getLongSchemaVersion(schemaAndMetadata.version))
.type(schemaAndMetadata.schema.getType()).timestamp(schemaAndMetadata.schema.getTimestamp())
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java
index c2b8bb7220b..fdf0433b340 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java
@@ -20,7 +20,6 @@
package org.apache.pulsar.broker.admin.impl;
import static org.apache.pulsar.common.naming.Constants.GLOBAL_CLUSTER;
-import com.google.common.collect.Lists;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
@@ -249,7 +248,7 @@ public class TenantsBase extends PulsarWebResource {
}
return tenantResources().getListOfNamespacesAsync(tenant)
.thenApply(namespaces -> {
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
try {
PulsarAdmin adminClient = pulsar().getAdminClient();
for (String namespace : namespaces) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TransactionsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TransactionsBase.java
index b2137d74338..dbd70feb1c0 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TransactionsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TransactionsBase.java
@@ -21,7 +21,6 @@ package org.apache.pulsar.broker.admin.impl;
import static javax.ws.rs.core.Response.Status.METHOD_NOT_ALLOWED;
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
-import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -92,7 +91,7 @@ public abstract class TransactionsBase extends AdminResource {
return;
}
List<CompletableFuture<TransactionCoordinatorStats>> transactionMetadataStoreInfoFutures =
- Lists.newArrayList();
+ new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
try {
transactionMetadataStoreInfoFutures
@@ -309,7 +308,7 @@ public abstract class TransactionsBase extends AdminResource {
return;
}
List<CompletableFuture<Map<String, TransactionMetadata>>> completableFutures =
- Lists.newArrayList();
+ new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
try {
completableFutures
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java
index 9fd2020d48a..3fd09ddd594 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java
@@ -19,12 +19,12 @@
package org.apache.pulsar.broker.admin.v1;
import static org.apache.pulsar.common.policies.data.PoliciesUtil.getBundles;
-import com.google.common.collect.Lists;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
@@ -107,7 +107,7 @@ public class Namespaces extends NamespacesBase {
public List<String> getNamespacesForCluster(@PathParam("property") String tenant,
@PathParam("cluster") String cluster) {
validateTenantOperation(tenant, TenantOperation.LIST_NAMESPACES);
- List<String> namespaces = Lists.newArrayList();
+ List<String> namespaces = new ArrayList<>();
if (!clusters().contains(cluster)) {
log.warn("[{}] Failed to get namespace list for tenant: {}/{} - Cluster does not exist", clientAppId(),
tenant, cluster);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
index 34e9eadd716..fef5eda009b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
@@ -19,11 +19,11 @@
package org.apache.pulsar.broker.admin.v1;
-import com.google.common.collect.Lists;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -200,7 +200,7 @@ public class NonPersistentTopics extends PersistentTopics {
return;
}
- final List<CompletableFuture<List<String>>> futures = Lists.newArrayList();
+ final List<CompletableFuture<List<String>>> futures = new ArrayList<>();
final List<String> boundaries = policies.bundles.getBoundaries();
for (int i = 0; i < boundaries.size() - 1; i++) {
final String bundle = String.format("%s_%s", boundaries.get(i), boundaries.get(i + 1));
@@ -222,7 +222,7 @@ public class NonPersistentTopics extends PersistentTopics {
if (ex != null) {
resumeAsyncResponseExceptionally(asyncResponse, ex);
} else {
- final List<String> topics = Lists.newArrayList();
+ final List<String> topics = new ArrayList<>();
for (int i = 0; i < futures.size(); i++) {
List<String> topicList = futures.get(i).join();
if (topicList != null) {
@@ -267,7 +267,7 @@ public class NonPersistentTopics extends PersistentTopics {
}
NamespaceBundle nsBundle = validateNamespaceBundleOwnership(fqnn, policies.bundles, bundleRange,
true, true);
- final List<String> topicList = Lists.newArrayList();
+ final List<String> topicList = new ArrayList<>();
pulsar().getBrokerService().forEachTopic(topic -> {
TopicName topicName = TopicName.get(topic.getName());
if (nsBundle.includes(topicName)) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java
index 0ebfabb7891..dace261ceb6 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java
@@ -19,7 +19,6 @@
package org.apache.pulsar.broker.admin.v2;
import static org.apache.pulsar.common.policies.data.PoliciesUtil.getBundles;
-import com.google.common.collect.Sets;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -2319,7 +2318,7 @@ public class Namespaces extends NamespacesBase {
public void removeSubscriptionTypesEnabled(@PathParam("tenant") String tenant,
@PathParam("namespace") String namespace) {
validateNamespaceName(tenant, namespace);
- internalSetSubscriptionTypesEnabled(Sets.newHashSet());
+ internalSetSubscriptionTypesEnabled(new HashSet<>());
}
@GET
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
index 82da5f91263..5b0deccd037 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
@@ -19,12 +19,12 @@
package org.apache.pulsar.broker.admin.v2;
-import com.google.common.collect.Lists;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -233,7 +233,7 @@ public class NonPersistentTopics extends PersistentTopics {
}
NonPersistentPartitionedTopicStatsImpl stats =
new NonPersistentPartitionedTopicStatsImpl(partitionMetadata);
- List<CompletableFuture<TopicStats>> topicStatsFutureList = Lists.newArrayList();
+ List<CompletableFuture<TopicStats>> topicStatsFutureList = new ArrayList<>();
for (int i = 0; i < partitionMetadata.partitions; i++) {
try {
topicStatsFutureList
@@ -369,7 +369,7 @@ public class NonPersistentTopics extends PersistentTopics {
return;
}
- final List<CompletableFuture<List<String>>> futures = Lists.newArrayList();
+ final List<CompletableFuture<List<String>>> futures = new ArrayList<>();
final List<String> boundaries = policies.bundles.getBoundaries();
for (int i = 0; i < boundaries.size() - 1; i++) {
final String bundle = String.format("%s_%s", boundaries.get(i), boundaries.get(i + 1));
@@ -390,7 +390,7 @@ public class NonPersistentTopics extends PersistentTopics {
if (ex != null) {
resumeAsyncResponseExceptionally(asyncResponse, ex);
} else {
- final List<String> topics = Lists.newArrayList();
+ final List<String> topics = new ArrayList<>();
for (int i = 0; i < futures.size(); i++) {
List<String> topicList = futures.get(i).join();
if (topicList != null) {
@@ -458,7 +458,7 @@ public class NonPersistentTopics extends PersistentTopics {
asyncResponse.resume(Collections.emptyList());
return;
}
- final List<String> topicList = Lists.newArrayList();
+ final List<String> topicList = new ArrayList<>();
String bundleKey = namespaceName.toString() + "/" + nsBundle.getBundleRange();
ConcurrentOpenHashMap<String, Topic> topicMap = bundleTopics.get(bundleKey);
if (topicMap != null) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java
index aa801f2187d..a298558f345 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java
@@ -20,10 +20,10 @@ package org.apache.pulsar.broker.loadbalance.impl;
import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.pulsar.common.stats.JvmMetrics.getJvmDirectMemoryUsed;
-import com.beust.jcommander.internal.Lists;
import io.netty.util.concurrent.FastThreadLocal;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -433,7 +433,7 @@ public class LoadManagerShared {
}
final String antiAffinityGroup = policies.get().namespaceAntiAffinityGroup;
final Map<String, Integer> brokerToAntiAffinityNamespaceCount = new ConcurrentHashMap<>();
- final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
brokerToNamespaceToBundleRange.forEach((broker, nsToBundleRange) -> {
nsToBundleRange.forEach((ns, bundleRange) -> {
if (bundleRange.isEmpty()) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralData.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralData.java
index 2f1262f5bf2..e86007b6446 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralData.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceEphemeralData.java
@@ -18,8 +18,8 @@
*/
package org.apache.pulsar.broker.namespace;
-import com.google.common.collect.Maps;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import javax.validation.constraints.NotNull;
import lombok.Data;
@@ -49,16 +49,16 @@ public class NamespaceEphemeralData {
this.httpUrlTls = httpUrlTls;
this.disabled = disabled;
if (advertisedListeners == null) {
- this.advertisedListeners = Collections.EMPTY_MAP;
+ this.advertisedListeners = Collections.emptyMap();
} else {
- this.advertisedListeners = Maps.newHashMap(advertisedListeners);
+ this.advertisedListeners = new HashMap<>(advertisedListeners);
}
}
@NotNull
public Map<String, AdvertisedListener> getAdvertisedListeners() {
if (this.advertisedListeners == null) {
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
}
return Collections.unmodifiableMap(this.advertisedListeners);
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
index 33d7057c4bd..5c1cb283d69 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
@@ -19,21 +19,21 @@
package org.apache.pulsar.broker.namespace;
import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.String.format;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.pulsar.common.naming.NamespaceName.SYSTEM_NAMESPACE;
-import com.google.common.collect.Lists;
import com.google.common.hash.Hashing;
import io.prometheus.client.Counter;
import java.net.URI;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
@@ -549,7 +549,7 @@ public class NamespaceService implements AutoCloseable {
}
try {
- checkNotNull(candidateBroker);
+ Objects.requireNonNull(candidateBroker);
if (candidateBroker.equals(pulsar.getSafeWebServiceAddress())) {
// Load manager decided that the local broker should try to become the owner
@@ -865,8 +865,8 @@ public class NamespaceService implements AutoCloseable {
return;
}
- checkNotNull(splittedBundles.getLeft());
- checkNotNull(splittedBundles.getRight());
+ Objects.requireNonNull(splittedBundles.getLeft());
+ Objects.requireNonNull(splittedBundles.getRight());
checkArgument(splittedBundles.getRight().size() == splitBoundaries.size() + 1,
"bundle has to be split in " + (splitBoundaries.size() + 1) + " bundles");
NamespaceName nsname = bundle.getNamespaceObject();
@@ -878,7 +878,7 @@ public class NamespaceService implements AutoCloseable {
try {
// take ownership of newly split bundles
for (NamespaceBundle sBundle : splittedBundles.getRight()) {
- checkNotNull(ownershipCache.tryAcquiringOwnership(sBundle));
+ Objects.requireNonNull(ownershipCache.tryAcquiringOwnership(sBundle));
}
updateNamespaceBundles(nsname, splittedBundles.getLeft())
.thenRun(() -> {
@@ -968,8 +968,8 @@ public class NamespaceService implements AutoCloseable {
* @throws Exception
*/
private CompletableFuture<Void> updateNamespaceBundles(NamespaceName nsname, NamespaceBundles nsBundles) {
- checkNotNull(nsname);
- checkNotNull(nsBundles);
+ Objects.requireNonNull(nsname);
+ Objects.requireNonNull(nsBundles);
LocalPolicies localPolicies = nsBundles.toLocalPolicies();
@@ -1088,7 +1088,7 @@ public class NamespaceService implements AutoCloseable {
}
public void addNamespaceBundleOwnershipListener(NamespaceBundleOwnershipListener... listeners) {
- checkNotNull(listeners);
+ Objects.requireNonNull(listeners);
for (NamespaceBundleOwnershipListener listener : listeners) {
if (listener != null) {
bundleOwnershipListeners.add(listener);
@@ -1208,9 +1208,9 @@ public class NamespaceService implements AutoCloseable {
.listPartitionedTopicsAsync(namespaceName, topicDomain)
.thenCompose(topics -> {
CompletableFuture<List<String>> result = new CompletableFuture<>();
- List<String> resultPartitions = Collections.synchronizedList(Lists.newArrayList());
+ List<String> resultPartitions = Collections.synchronizedList(new ArrayList<>());
if (CollectionUtils.isNotEmpty(topics)) {
- List<CompletableFuture<List<String>>> futures = Lists.newArrayList();
+ List<CompletableFuture<List<String>>> futures = new ArrayList<>();
for (String topic : topics) {
CompletableFuture<List<String>> future = getPartitionsForTopic(TopicName.get(topic));
futures.add(future);
@@ -1232,7 +1232,7 @@ public class NamespaceService implements AutoCloseable {
private CompletableFuture<List<String>> getPartitionsForTopic(TopicName topicName) {
return pulsar.getBrokerService().fetchPartitionedTopicMetadataAsync(topicName).thenCompose(meta -> {
- List<String> result = Lists.newArrayList();
+ List<String> result = new ArrayList<>();
for (int i = 0; i < meta.partitions; i++) {
result.add(topicName.getPartition(i).toString());
}
@@ -1255,7 +1255,7 @@ public class NamespaceService implements AutoCloseable {
} else {
// Non-persistent topics don't have managed ledgers so we have to retrieve them from local
// cache.
- List<String> topics = Lists.newArrayList();
+ List<String> topics = new ArrayList<>();
synchronized (pulsar.getBrokerService().getMultiLayerTopicMap()) {
if (pulsar.getBrokerService().getMultiLayerTopicMap()
.containsKey(namespaceName.toString())) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnershipCache.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnershipCache.java
index 4f60512a796..e0cdd129a8f 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnershipCache.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnershipCache.java
@@ -21,8 +21,8 @@ package org.apache.pulsar.broker.namespace;
import com.github.benmanes.caffeine.cache.AsyncCacheLoader;
import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
import com.github.benmanes.caffeine.cache.Caffeine;
-import com.google.common.collect.Lists;
import com.google.common.util.concurrent.MoreExecutors;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -223,7 +223,7 @@ public class OwnershipCache {
* <code>NamespaceBundles</code> to remove from ownership cache
*/
public CompletableFuture<Void> removeOwnership(NamespaceBundles bundles) {
- List<CompletableFuture<Void>> allFutures = Lists.newArrayList();
+ List<CompletableFuture<Void>> allFutures = new ArrayList<>();
for (NamespaceBundle bundle : bundles.getBundles()) {
if (getOwnedBundle(bundle) == null) {
// continue
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
index a3df1498698..428c54ecc19 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
@@ -21,8 +21,6 @@ package org.apache.pulsar.broker.service;
import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.bookkeeper.mledger.impl.ManagedLedgerMBeanImpl.ENTRY_LATENCY_BUCKETS_USEC;
import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -147,7 +145,7 @@ public abstract class AbstractTopic implements Topic, TopicPolicyListener<TopicP
protected final LongAdder msgOutFromRemovedSubscriptions = new LongAdder();
protected final LongAdder bytesOutFromRemovedSubscriptions = new LongAdder();
- protected ImmutableMap<String, EntryFilterWithClassLoader> entryFilters;
+ protected Map<String, EntryFilterWithClassLoader> entryFilters;
public AbstractTopic(String topic, BrokerService brokerService) {
this.topic = topic;
@@ -187,7 +185,7 @@ public abstract class AbstractTopic implements Topic, TopicPolicyListener<TopicP
return this.topicPolicies.getEntryFilters().get();
}
- public ImmutableMap<String, EntryFilterWithClassLoader> getEntryFilters() {
+ public Map<String, EntryFilterWithClassLoader> getEntryFilters() {
return this.entryFilters;
}
@@ -251,7 +249,7 @@ public abstract class AbstractTopic implements Topic, TopicPolicyListener<TopicP
topicPolicies.getRetentionPolicies().updateNamespaceValue(namespacePolicies.retention_policies);
topicPolicies.getCompactionThreshold().updateNamespaceValue(namespacePolicies.compaction_threshold);
topicPolicies.getReplicationClusters().updateNamespaceValue(
- Lists.newArrayList(CollectionUtils.emptyIfNull(namespacePolicies.replication_clusters)));
+ new ArrayList<>(CollectionUtils.emptyIfNull(namespacePolicies.replication_clusters)));
topicPolicies.getMaxUnackedMessagesOnConsumer()
.updateNamespaceValue(namespacePolicies.max_unacked_messages_per_consumer);
topicPolicies.getMaxUnackedMessagesOnSubscription()
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
index 805d00adca6..b11538a9217 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
@@ -18,7 +18,7 @@
*/
package org.apache.pulsar.broker.service;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
@@ -245,7 +245,7 @@ public class BacklogQuotaManager {
* The topic on which all producers should be disconnected
*/
private void disconnectProducers(PersistentTopic persistentTopic) {
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
Map<String, Producer> producers = persistentTopic.getProducers();
producers.values().forEach(producer -> {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index a3cef4bd027..8491615448a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -19,15 +19,11 @@
package org.apache.pulsar.broker.service;
import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun;
import static org.apache.commons.collections4.CollectionUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.pulsar.common.naming.SystemTopicNames.isTransactionInternalName;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.ByteBuf;
@@ -52,6 +48,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CancellationException;
@@ -277,7 +274,7 @@ public class BrokerService implements Closeable {
private boolean preciseTopicPublishRateLimitingEnable;
private final LongAdder pausedConnections = new LongAdder();
private BrokerInterceptor interceptor;
- private ImmutableMap<String, EntryFilterWithClassLoader> entryFilters;
+ private Map<String, EntryFilterWithClassLoader> entryFilters;
private TopicFactory topicFactory;
private Set<BrokerEntryMetadataInterceptor> brokerEntryMetadataInterceptors;
@@ -1604,20 +1601,20 @@ public class BrokerService implements Closeable {
managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyClassName(
IsolatedBookieEnsemblePlacementPolicy.class);
if (localPolicies.isPresent() && localPolicies.get().bookieAffinityGroup != null) {
- Map<String, Object> properties = Maps.newHashMap();
+ Map<String, Object> properties = new HashMap<>();
properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS,
localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupPrimary());
properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS,
localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupSecondary());
managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
} else if (isSystemTopic(topicName)) {
- Map<String, Object> properties = Maps.newHashMap();
+ Map<String, Object> properties = new HashMap<>();
properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS, "*");
properties.put(IsolatedBookieEnsemblePlacementPolicy
.SECONDARY_ISOLATION_BOOKIE_GROUPS, "*");
managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
} else {
- Map<String, Object> properties = Maps.newHashMap();
+ Map<String, Object> properties = new HashMap<>();
properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS, "");
properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS, "");
managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
@@ -1626,7 +1623,7 @@ public class BrokerService implements Closeable {
if (localPolicies.isPresent() && localPolicies.get().bookieAffinityGroup != null) {
managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyClassName(
IsolatedBookieEnsemblePlacementPolicy.class);
- Map<String, Object> properties = Maps.newHashMap();
+ Map<String, Object> properties = new HashMap<>();
properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS,
localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupPrimary());
properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS,
@@ -1744,7 +1741,7 @@ public class BrokerService implements Closeable {
}
public void refreshTopicToStatsMaps(NamespaceBundle oldBundle) {
- checkNotNull(oldBundle);
+ Objects.requireNonNull(oldBundle);
try {
// retrieve all topics under existing old bundle
List<Topic> topics = getAllTopicsFromNamespaceBundle(oldBundle.getNamespaceObject().toString(),
@@ -1974,7 +1971,7 @@ public class BrokerService implements Closeable {
*/
private CompletableFuture<Integer> unloadServiceUnit(NamespaceBundle serviceUnit,
boolean closeWithoutWaitingClientDisconnect) {
- List<CompletableFuture<Void>> closeFutures = Lists.newArrayList();
+ List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
topics.forEach((name, topicFuture) -> {
TopicName topicName = TopicName.get(name);
if (serviceUnit.includes(topicName)) {
@@ -2677,7 +2674,7 @@ public class BrokerService implements Closeable {
// create dynamic-config if not exist.
if (!configCache.isPresent()) {
pulsar().getPulsarResources().getDynamicConfigResources()
- .setDynamicConfigurationWithCreate(n -> Maps.newHashMap());
+ .setDynamicConfigurationWithCreate(n -> new HashMap<>());
}
} catch (Exception e) {
log.warn("Failed to read dynamic broker configuration", e);
@@ -2698,7 +2695,7 @@ public class BrokerService implements Closeable {
// create dynamic-config if not exist.
if (!configCache.isPresent()) {
pulsar().getPulsarResources().getDynamicConfigResources()
- .setDynamicConfigurationWithCreate(n -> Maps.newHashMap());
+ .setDynamicConfigurationWithCreate(n -> new HashMap<>());
}
} catch (Exception e) {
log.warn("Failed to read dynamic broker configuration", e);
@@ -2736,7 +2733,7 @@ public class BrokerService implements Closeable {
}
public Map<String, String> getRuntimeConfiguration() {
- Map<String, String> configMap = Maps.newHashMap();
+ Map<String, String> configMap = new HashMap<>();
ConcurrentOpenHashMap<String, Object> runtimeConfigurationMap = getRuntimeConfigurationMap();
runtimeConfigurationMap.forEach((key, value) -> {
configMap.put(key, String.valueOf(value));
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
index 7eae83ba250..cc47976e82a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
@@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.pulsar.common.protocol.Commands.DEFAULT_CONSUMER_EPOCH;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects;
-import com.google.common.collect.Lists;
import com.google.common.util.concurrent.AtomicDouble;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.Promise;
@@ -994,7 +993,7 @@ public class Consumer {
public void redeliverUnacknowledgedMessages(List<MessageIdData> messageIds) {
int totalRedeliveryMessages = 0;
- List<PositionImpl> pendingPositions = Lists.newArrayList();
+ List<PositionImpl> pendingPositions = new ArrayList<>();
for (MessageIdData msg : messageIds) {
PositionImpl position = PositionImpl.get(msg.getLedgerId(), msg.getEntryId());
LongPair longPair = pendingAcks.get(position.getLedgerId(), position.getEntryId());
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java
index 7a4700a90a6..8704e21ae75 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java
@@ -18,8 +18,9 @@
*/
package org.apache.pulsar.broker.service;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
@@ -34,7 +35,7 @@ public class EntryFilterSupport {
* Entry filters in Broker.
* Not set to final, for the convenience of testing mock.
*/
- protected ImmutableList<EntryFilterWithClassLoader> entryFilters;
+ protected List<EntryFilterWithClassLoader> entryFilters;
protected final FilterContext filterContext;
protected final Subscription subscription;
@@ -45,19 +46,20 @@ public class EntryFilterSupport {
.getBrokerService().getEntryFilters())
&& !subscription.getTopic().getBrokerService().pulsar()
.getConfiguration().isAllowOverrideEntryFilters()) {
- this.entryFilters = subscription.getTopic().getBrokerService().getEntryFilters().values().asList();
+ this.entryFilters = subscription.getTopic().getBrokerService().getEntryFilters().values().stream()
+ .toList();
} else {
- ImmutableMap<String, EntryFilterWithClassLoader> entryFiltersMap =
+ Map<String, EntryFilterWithClassLoader> entryFiltersMap =
subscription.getTopic().getEntryFilters();
if (entryFiltersMap != null) {
- this.entryFilters = subscription.getTopic().getEntryFilters().values().asList();
+ this.entryFilters = subscription.getTopic().getEntryFilters().values().stream().toList();
} else {
- this.entryFilters = ImmutableList.of();
+ this.entryFilters = Collections.emptyList();
}
}
this.filterContext = new FilterContext();
} else {
- this.entryFilters = ImmutableList.of();
+ this.entryFilters = Collections.emptyList();
this.filterContext = FilterContext.FILTER_CONTEXT_DISABLED;
}
}
@@ -82,7 +84,7 @@ public class EntryFilterSupport {
private static EntryFilter.FilterResult getFilterResult(FilterContext filterContext, Entry entry,
- ImmutableList<EntryFilterWithClassLoader> entryFilters) {
+ List<EntryFilterWithClassLoader> entryFilters) {
for (EntryFilter entryFilter : entryFilters) {
EntryFilter.FilterResult filterResult =
entryFilter.filterEntry(entry, filterContext);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java
index b5d87a46cfc..62182f6e84f 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.broker.service;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.scurrilous.circe.checksum.Crc32cIntChecksum.computeChecksum;
import static org.apache.pulsar.broker.service.AbstractReplicator.REPL_PRODUCER_NAME_DELIMITER;
import static org.apache.pulsar.common.protocol.Commands.hasChecksum;
@@ -106,7 +105,7 @@ public class Producer {
this.topic = topic;
this.cnx = cnx;
this.producerId = producerId;
- this.producerName = checkNotNull(producerName);
+ this.producerName = Objects.requireNonNull(producerName);
this.userProvidedProducerName = userProvidedProducerName;
this.epoch = epoch;
this.closeFuture = new CompletableFuture<>();
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarStats.java
index ff74cf839ae..0babf2fe012 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarStats.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarStats.java
@@ -18,14 +18,14 @@
*/
package org.apache.pulsar.broker.service;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.util.ReferenceCountUtil;
import java.io.Closeable;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Consumer;
import org.apache.pulsar.broker.PulsarService;
@@ -65,12 +65,12 @@ public class PulsarStats implements Closeable {
this.nsStats = new NamespaceStats(pulsar.getConfig().getStatsUpdateFrequencyInSecs());
this.clusterReplicationMetrics = new ClusterReplicationMetrics(pulsar.getConfiguration().getClusterName(),
pulsar.getConfiguration().isReplicationMetricsEnabled());
- this.bundleStats = Maps.newConcurrentMap();
- this.tempMetricsCollection = Lists.newArrayList();
- this.metricsCollection = Lists.newArrayList();
+ this.bundleStats = new ConcurrentHashMap<>();
+ this.tempMetricsCollection = new ArrayList<>();
+ this.metricsCollection = new ArrayList<>();
this.brokerOperabilityMetrics = new BrokerOperabilityMetrics(pulsar.getConfiguration().getClusterName(),
pulsar.getAdvertisedAddress());
- this.tempNonPersistentTopics = Lists.newArrayList();
+ this.tempNonPersistentTopics = new ArrayList<>();
this.exposePublisherStats = pulsar.getConfiguration().isExposePublisherStats();
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
index b3a5e8c2b8b..9c3c8488971 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
@@ -19,7 +19,6 @@
package org.apache.pulsar.broker.service;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.util.HashSet;
import java.util.List;
@@ -27,6 +26,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Nonnull;
@@ -559,7 +559,7 @@ public class SystemTopicBasedTopicPoliciesService implements TopicPoliciesServic
public void registerListener(TopicName topicName, TopicPolicyListener<TopicPolicies> listener) {
listeners.compute(topicName, (k, topicListeners) -> {
if (topicListeners == null) {
- topicListeners = Lists.newCopyOnWriteArrayList();
+ topicListeners = new CopyOnWriteArrayList<>();
}
topicListeners.add(listener);
return topicListeners;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
index 72e5d6a9228..c0f931bd6a5 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.broker.service;
-import com.google.common.collect.ImmutableMap;
import io.netty.buffer.ByteBuf;
import java.util.Map;
import java.util.Optional;
@@ -250,7 +249,7 @@ public interface Topic {
EntryFilters getEntryFiltersPolicy();
- ImmutableMap<String, EntryFilterWithClassLoader> getEntryFilters();
+ Map<String, EntryFilterWithClassLoader> getEntryFilters();
BacklogQuota getBacklogQuota(BacklogQuotaType backlogQuotaType);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
index a3da80080ff..05e42c1b64d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
@@ -23,8 +23,6 @@ import static org.apache.bookkeeper.mledger.impl.cache.RangeEntryCacheManagerImp
import static org.apache.pulsar.common.policies.data.BacklogQuota.BacklogQuotaType;
import static org.apache.pulsar.common.protocol.Commands.DEFAULT_CONSUMER_EPOCH;
import com.carrotsearch.hppc.ObjectObjectHashMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import io.netty.buffer.ByteBuf;
import io.netty.util.concurrent.FastThreadLocal;
import java.util.ArrayList;
@@ -34,6 +32,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.TreeMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -394,7 +393,7 @@ public class NonPersistentTopic extends AbstractTopic implements Topic, TopicPol
CompletableFuture<Void> closeClientFuture = new CompletableFuture<>();
if (closeIfClientsConnected) {
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
replicators.forEach((cluster, replicator) -> futures.add(replicator.disconnect()));
producers.values().forEach(producer -> futures.add(producer.disconnect()));
subscriptions.forEach((s, sub) -> futures.add(sub.disconnect()));
@@ -415,7 +414,7 @@ public class NonPersistentTopic extends AbstractTopic implements Topic, TopicPol
if (currentUsageCount() == 0) {
isFenced = true;
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
if (failIfHasSubscriptions) {
if (!subscriptions.isEmpty()) {
@@ -485,7 +484,7 @@ public class NonPersistentTopic extends AbstractTopic implements Topic, TopicPol
lock.writeLock().unlock();
}
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
replicators.forEach((cluster, replicator) -> futures.add(replicator.disconnect()));
producers.values().forEach(producer -> futures.add(producer.disconnect()));
@@ -531,7 +530,7 @@ public class NonPersistentTopic extends AbstractTopic implements Topic, TopicPol
}
public CompletableFuture<Void> stopReplProducers() {
- List<CompletableFuture<Void>> closeFutures = Lists.newArrayList();
+ List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
replicators.forEach((region, replicator) -> closeFutures.add(replicator.disconnect()));
return FutureUtil.waitForAll(closeFutures);
}
@@ -551,7 +550,7 @@ public class NonPersistentTopic extends AbstractTopic implements Topic, TopicPol
String localCluster = brokerService.pulsar().getConfiguration().getClusterName();
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
// Check for missing replicators
for (String cluster : configuredClusters) {
@@ -911,7 +910,7 @@ public class NonPersistentTopic extends AbstractTopic implements Topic, TopicPol
PersistentTopicInternalStats stats = new PersistentTopicInternalStats();
stats.entriesAddedCounter = ENTRIES_ADDED_COUNTER_UPDATER.get(this);
- stats.cursors = Maps.newTreeMap();
+ stats.cursors = new TreeMap<>();
subscriptions.forEach((name, subs) -> stats.cursors.put(name, new CursorStats()));
replicators.forEach((name, subs) -> stats.cursors.put(name, new CursorStats()));
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java
index 47830e669af..accab20d2da 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java
@@ -18,12 +18,12 @@
*/
package org.apache.pulsar.broker.service.persistent;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.pulsar.broker.service.persistent.PersistentTopic.MESSAGE_RATE_BACKOFF_MS;
import static org.apache.pulsar.common.protocol.Commands.DEFAULT_CONSUMER_EPOCH;
import io.netty.util.Recycler;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ScheduledFuture;
@@ -520,7 +520,7 @@ public class PersistentDispatcherSingleActiveConsumer extends AbstractDispatcher
}
}
- checkNotNull(c);
+ Objects.requireNonNull(c);
// Reduce read batch size to avoid flooding bookies with retries
readBatchSize = serviceConfig.getDispatcherMinReadBatchSize();
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
index e5d6251d177..4afc5b6bdf9 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
@@ -21,7 +21,6 @@ package org.apache.pulsar.broker.service.persistent;
import static org.apache.pulsar.common.naming.SystemTopicNames.isEventSystemTopic;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Predicate;
import io.netty.buffer.ByteBuf;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -34,6 +33,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.apache.bookkeeper.mledger.AsyncCallbacks;
import org.apache.bookkeeper.mledger.AsyncCallbacks.ClearBacklogCallback;
@@ -139,7 +139,7 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
}
public PersistentSubscription(PersistentTopic topic, String subscriptionName, ManagedCursor cursor,
- boolean replicated) {
+ boolean replicated) {
this(topic, subscriptionName, cursor, replicated, Collections.emptyMap());
}
@@ -165,7 +165,7 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
public void updateLastMarkDeleteAdvancedTimestamp() {
this.lastMarkDeleteAdvancedTimestamp =
- Math.max(this.lastMarkDeleteAdvancedTimestamp, System.currentTimeMillis());
+ Math.max(this.lastMarkDeleteAdvancedTimestamp, System.currentTimeMillis());
}
@Override
@@ -229,9 +229,9 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
previousDispatcher = dispatcher;
dispatcher = useStreamingDispatcher
? new PersistentStreamingDispatcherSingleActiveConsumer(
- cursor, SubType.Exclusive, 0, topic, this)
+ cursor, SubType.Exclusive, 0, topic, this)
: new PersistentDispatcherSingleActiveConsumer(
- cursor, SubType.Exclusive, 0, topic, this);
+ cursor, SubType.Exclusive, 0, topic, this);
}
break;
case Shared:
@@ -239,7 +239,7 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
previousDispatcher = dispatcher;
dispatcher = useStreamingDispatcher
? new PersistentStreamingDispatcherMultipleConsumers(
- topic, cursor, this)
+ topic, cursor, this)
: new PersistentDispatcherMultipleConsumers(topic, cursor, this);
}
break;
@@ -256,7 +256,7 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
previousDispatcher = dispatcher;
dispatcher = useStreamingDispatcher
? new PersistentStreamingDispatcherSingleActiveConsumer(
- cursor, SubType.Failover, partitionIndex, topic, this) :
+ cursor, SubType.Failover, partitionIndex, topic, this) :
new PersistentDispatcherSingleActiveConsumer(cursor, SubType.Failover,
partitionIndex, topic, this);
}
@@ -265,7 +265,7 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
KeySharedMeta ksm = consumer.getKeySharedMeta();
if (dispatcher == null || dispatcher.getType() != SubType.Key_Shared
|| !((PersistentStickyKeyDispatcherMultipleConsumers) dispatcher)
- .hasSameKeySharedPolicy(ksm)) {
+ .hasSameKeySharedPolicy(ksm)) {
previousDispatcher = dispatcher;
dispatcher = new PersistentStickyKeyDispatcherMultipleConsumers(topic, cursor, this,
topic.getBrokerService().getPulsar().getConfiguration(), ksm);
@@ -337,7 +337,7 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
// when topic closes: it iterates through concurrent-subscription map to close each subscription. so,
// topic.remove again try to access same map which creates deadlock. so, execute it in different thread.
- topic.getBrokerService().pulsar().getExecutor().execute(() ->{
+ topic.getBrokerService().pulsar().getExecutor().execute(() -> {
topic.removeSubscription(subName);
// Also need remove the cursor here, otherwise the data deletion will not work well.
// Because data deletion depends on the mark delete position of all cursors.
@@ -412,7 +412,7 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
this.updateLastMarkDeleteAdvancedTimestamp();
// Mark delete position advance
- ReplicatedSubscriptionSnapshotCache snapshotCache = this.replicatedSubscriptionSnapshotCache;
+ ReplicatedSubscriptionSnapshotCache snapshotCache = this.replicatedSubscriptionSnapshotCache;
if (snapshotCache != null) {
ReplicatedSubscriptionsSnapshot snapshot = snapshotCache
.advancedMarkDeletePosition((PositionImpl) cursor.getMarkDeletedPosition());
@@ -510,14 +510,14 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
}
switch (type) {
- case Exclusive:
- return "Exclusive";
- case Failover:
- return "Failover";
- case Shared:
- return "Shared";
- case Key_Shared:
- return "Key_Shared";
+ case Exclusive:
+ return "Exclusive";
+ case Failover:
+ return "Failover";
+ case Shared:
+ return "Shared";
+ case Key_Shared:
+ return "Key_Shared";
}
return "Null";
@@ -555,54 +555,58 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
int batchSize = configuration.getDispatcherMaxReadBatchSize();
AtomicReference<Position> firstPosition = new AtomicReference<>();
AtomicReference<Position> lastPosition = new AtomicReference<>();
- return cursor.scan(position, new Predicate<Entry>() {
- @Override
- public boolean apply(Entry entry) {
- if (log.isDebugEnabled()) {
- log.debug("found {}", entry);
- }
- Position entryPosition = entry.getPosition();
- firstPosition.compareAndSet(null, entryPosition);
- lastPosition.set(entryPosition);
- ByteBuf metadataAndPayload = entry.getDataBuffer();
- MessageMetadata messageMetadata = Commands.peekMessageMetadata(metadataAndPayload, "", -1);
- int numMessages = 1;
- if (messageMetadata.hasNumMessagesInBatch()) {
- numMessages = messageMetadata.getNumMessagesInBatch();
- }
- EntryFilter.FilterResult filterResult = entryFilterSupport
- .runFiltersForEntry(entry, messageMetadata, null);
-
- if (filterResult == null) {
- filterResult = EntryFilter.FilterResult.ACCEPT;
- }
- switch (filterResult) {
- case REJECT:
- rejected.incrementAndGet();
- rejectedMessages.addAndGet(numMessages);
- break;
- case RESCHEDULE:
- rescheduled.incrementAndGet();
- rescheduledMessages.addAndGet(numMessages);
- break;
- default:
- accepted.incrementAndGet();
- acceptedMessages.addAndGet(numMessages);
- break;
- }
- long num = entries.incrementAndGet();
- messages.addAndGet(numMessages);
-
- if (num % 1000 == 0) {
- long end = System.currentTimeMillis();
- log.info(
- "[{}][{}] scan running since {} ms - scanned {} entries",
- topicName, subName, end - start, num);
- }
+ final Predicate<Entry> condition = entry -> {
+ if (log.isDebugEnabled()) {
+ log.debug("found {}", entry);
+ }
+ Position entryPosition = entry.getPosition();
+ firstPosition.compareAndSet(null, entryPosition);
+ lastPosition.set(entryPosition);
+ ByteBuf metadataAndPayload = entry.getDataBuffer();
+ MessageMetadata messageMetadata = Commands.peekMessageMetadata(metadataAndPayload, "", -1);
+ int numMessages = 1;
+ if (messageMetadata.hasNumMessagesInBatch()) {
+ numMessages = messageMetadata.getNumMessagesInBatch();
+ }
+ EntryFilter.FilterResult filterResult = entryFilterSupport
+ .runFiltersForEntry(entry, messageMetadata, null);
- return true;
+ if (filterResult == null) {
+ filterResult = EntryFilter.FilterResult.ACCEPT;
}
- }, batchSize, maxEntries, timeOutMs).thenApply((ScanOutcome outcome) -> {
+ switch (filterResult) {
+ case REJECT:
+ rejected.incrementAndGet();
+ rejectedMessages.addAndGet(numMessages);
+ break;
+ case RESCHEDULE:
+ rescheduled.incrementAndGet();
+ rescheduledMessages.addAndGet(numMessages);
+ break;
+ default:
+ accepted.incrementAndGet();
+ acceptedMessages.addAndGet(numMessages);
+ break;
+ }
+ long num = entries.incrementAndGet();
+ messages.addAndGet(numMessages);
+
+ if (num % 1000 == 0) {
+ long end = System.currentTimeMillis();
+ log.info(
+ "[{}][{}] scan running since {} ms - scanned {} entries",
+ topicName, subName, end - start, num);
+ }
+
+ return true;
+ };
+ return cursor.scan(
+ position,
+ condition,
+ batchSize,
+ maxEntries,
+ timeOutMs
+ ).thenApply((ScanOutcome outcome) -> {
long end = System.currentTimeMillis();
AnalyzeBacklogResult result = new AnalyzeBacklogResult();
result.setFirstPosition(firstPosition.get());
@@ -928,6 +932,7 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
/**
* Forcefully close all consumers and deletes the subscription.
+ *
* @return
*/
@Override
@@ -938,9 +943,10 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
/**
* Delete the subscription by closing and deleting its managed cursor. Handle unsubscribe call from admin layer.
*
- * @param closeIfConsumersConnected
- * Flag indicate whether explicitly close connected consumers before trying to delete subscription. If
- * any consumer is connected to it and if this flag is disable then this operation fails.
+ * @param closeIfConsumersConnected Flag indicate whether explicitly close connected consumers before trying to
+ * delete subscription. If
+ * any consumer is connected to it and if this flag is disable then this operation
+ * fails.
* @return CompletableFuture indicating the completion of delete operation
*/
private CompletableFuture<Void> delete(boolean closeIfConsumersConnected) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
index 49f2ac2f548..33d97970569 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.broker.service.persistent;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.pulsar.broker.service.persistent.SubscribeRateLimiter.isSubscribeRateEnabled;
import static org.apache.pulsar.common.naming.SystemTopicNames.isEventSystemTopic;
@@ -26,8 +25,6 @@ import static org.apache.pulsar.common.protocol.Commands.DEFAULT_CONSUMER_EPOCH;
import static org.apache.pulsar.compaction.Compactor.COMPACTION_SUBSCRIPTION;
import com.carrotsearch.hppc.ObjectObjectHashMap;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import io.netty.buffer.ByteBuf;
import io.netty.util.concurrent.FastThreadLocal;
@@ -35,8 +32,10 @@ import java.time.Clock;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CancellationException;
@@ -401,7 +400,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
private PersistentSubscription createPersistentSubscription(String subscriptionName, ManagedCursor cursor,
boolean replicated, Map<String, String> subscriptionProperties) {
- checkNotNull(compactedTopic);
+ Objects.requireNonNull(compactedTopic);
if (isCompactionSubscription(subscriptionName)) {
return new CompactorSubscription(this, compactedTopic, subscriptionName, cursor);
} else {
@@ -553,7 +552,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
// close all producers
CompletableFuture<Void> disconnectProducersFuture;
if (producers.size() > 0) {
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
producers.forEach((__, producer) -> futures.add(producer.disconnect()));
disconnectProducersFuture = FutureUtil.waitForAll(futures);
} else {
@@ -669,14 +668,14 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
}
public CompletableFuture<Void> stopReplProducers() {
- List<CompletableFuture<Void>> closeFutures = Lists.newArrayList();
+ List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
replicators.forEach((region, replicator) -> closeFutures.add(replicator.disconnect()));
shadowReplicators.forEach((__, replicator) -> closeFutures.add(replicator.disconnect()));
return FutureUtil.waitForAll(closeFutures);
}
private synchronized CompletableFuture<Void> closeReplProducersIfNoBacklog() {
- List<CompletableFuture<Void>> closeFutures = Lists.newArrayList();
+ List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
replicators.forEach((region, replicator) -> closeFutures.add(replicator.disconnect(true)));
shadowReplicators.forEach((__, replicator) -> closeFutures.add(replicator.disconnect(true)));
return FutureUtil.waitForAll(closeFutures);
@@ -1162,7 +1161,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
fenceTopicToCloseOrDelete(); // Avoid clients reconnections while deleting
CompletableFuture<Void> closeClientFuture = new CompletableFuture<>();
if (closeIfClientsConnected) {
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
replicators.forEach((cluster, replicator) -> futures.add(replicator.disconnect()));
shadowReplicators.forEach((__, replicator) -> futures.add(replicator.disconnect()));
producers.values().forEach(producer -> futures.add(producer.disconnect()));
@@ -1286,7 +1285,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
lock.writeLock().unlock();
}
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
futures.add(transactionBuffer.closeAsync());
replicators.forEach((cluster, replicator) -> futures.add(replicator.disconnect()));
@@ -1423,7 +1422,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
return deleteForcefully();
}
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
// Check for missing replicators
for (String cluster : configuredClusters) {
@@ -1461,7 +1460,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
if (log.isDebugEnabled()) {
log.debug("[{}] Checking shadow replication status, shadowTopics={}", topic, configuredShadowTopics);
}
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
// Check for missing replicators
for (String shadowTopic : configuredShadowTopics) {
@@ -2142,7 +2141,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
stats.lastConfirmedEntry = ml.getLastConfirmedEntry().toString();
stats.state = ml.getState().toString();
- stats.ledgers = Lists.newArrayList();
+ stats.ledgers = new ArrayList<>();
Set<CompletableFuture<?>> futures = Sets.newConcurrentHashSet();
CompletableFuture<Set<String>> availableBookiesFuture =
brokerService.pulsar().getPulsarResources().getBookieResources().listAvailableBookiesAsync();
@@ -2197,7 +2196,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
stats.compactedLedger = info;
- stats.cursors = Maps.newTreeMap();
+ stats.cursors = new HashMap<>();
ml.getCursors().forEach(c -> {
ManagedCursorImpl cursor = (ManagedCursorImpl) c;
CursorStats cs = new CursorStats();
@@ -2805,7 +2804,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
*/
public CompletableFuture<Void> clearBacklog() {
log.info("[{}] Clearing backlog on all cursors in the topic.", topic);
- List<CompletableFuture<Void>> futures = Lists.newArrayList();
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
List<String> cursors = getSubscriptions().keys();
cursors.addAll(getReplicators().keys());
cursors.addAll(getShadowReplicators().keys());
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java
index b62335d9ab4..9a78de6e30b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.broker.service.schema;
-import static com.google.common.collect.Iterables.concat;
import static com.google.common.collect.Lists.newArrayList;
import static com.google.protobuf.ByteString.copyFrom;
import static java.util.Objects.isNull;
@@ -463,12 +462,15 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
.setHash(copyFrom(hash))
.build();
+ final ArrayList<SchemaStorageFormat.IndexEntry> indexList = new ArrayList<>();
+ indexList.addAll(locator.getIndexList());
+ indexList.add(info);
return updateSchemaLocator(getSchemaPath(schemaId),
- SchemaStorageFormat.SchemaLocator.newBuilder()
- .setInfo(info)
- .addAllIndex(
- concat(locator.getIndexList(), newArrayList(info))
- ).build(), locatorEntry.version
+ SchemaStorageFormat.SchemaLocator.newBuilder()
+ .setInfo(info)
+ .addAllIndex(indexList)
+ .build()
+ , locatorEntry.version
).thenApply(ignore -> nextVersion);
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java
index e78477a9aa0..abf74cdc450 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryService.java
@@ -18,7 +18,7 @@
*/
package org.apache.pulsar.broker.service.schema;
-import com.google.common.collect.Maps;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
@@ -34,7 +34,7 @@ public interface SchemaRegistryService extends SchemaRegistry {
long NO_SCHEMA_VERSION = -1L;
static Map<SchemaType, SchemaCompatibilityCheck> getCheckers(Set<String> checkerClasses) throws Exception {
- Map<SchemaType, SchemaCompatibilityCheck> checkers = Maps.newHashMap();
+ Map<SchemaType, SchemaCompatibilityCheck> checkers = new HashMap<>();
for (String className : checkerClasses) {
SchemaCompatibilityCheck schemaCompatibilityCheck = Reflections.createInstance(className,
SchemaCompatibilityCheck.class, Thread.currentThread().getContextClassLoader());
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java
index 5dd4c0b0402..9e71fb7d46b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java
@@ -18,12 +18,12 @@
*/
package org.apache.pulsar.broker.stats;
-import com.google.common.collect.Lists;
import io.netty.buffer.PoolArenaMetric;
import io.netty.buffer.PoolChunkListMetric;
import io.netty.buffer.PoolChunkMetric;
import io.netty.buffer.PoolSubpageMetric;
import io.netty.buffer.PooledByteBufAllocator;
+import java.util.ArrayList;
import java.util.stream.Collectors;
import org.apache.bookkeeper.mledger.impl.cache.RangeEntryCacheImpl;
import org.apache.pulsar.common.stats.AllocatorStats;
@@ -99,7 +99,7 @@ public class AllocatorStatsGenerator {
PoolChunkListStats stats = new PoolChunkListStats();
stats.minUsage = m.minUsage();
stats.maxUsage = m.maxUsage();
- stats.chunks = Lists.newArrayList();
+ stats.chunks = new ArrayList<>();
m.forEach(chunk -> stats.chunks.add(newPoolChunkStats(chunk)));
return stats;
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BookieClientStatsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BookieClientStatsGenerator.java
index d34c430f19c..c92693c0df4 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BookieClientStatsGenerator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BookieClientStatsGenerator.java
@@ -18,8 +18,9 @@
*/
package org.apache.pulsar.broker.stats;
-import com.google.common.collect.Maps;
+import java.util.HashMap;
import java.util.Map;
+import java.util.TreeMap;
import org.apache.bookkeeper.mledger.proto.PendingBookieOpsStats;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
@@ -35,7 +36,7 @@ public class BookieClientStatsGenerator {
public BookieClientStatsGenerator(PulsarService pulsar) {
this.pulsar = pulsar;
- this.nsBookieClientStatsMap = Maps.newTreeMap();
+ this.nsBookieClientStatsMap = new TreeMap<>();
}
public static Map<String, Map<String, PendingBookieOpsStats>> generate(PulsarService pulsar) throws Exception {
@@ -60,7 +61,7 @@ public class BookieClientStatsGenerator {
private void put(TopicName topicName, PendingBookieOpsStats bookieOpsStats) {
String namespace = topicName.getNamespace();
if (!nsBookieClientStatsMap.containsKey(namespace)) {
- Map<String, PendingBookieOpsStats> destBookieClientStatsMap = Maps.newTreeMap();
+ Map<String, PendingBookieOpsStats> destBookieClientStatsMap = new HashMap<>();
destBookieClientStatsMap.put(topicName.toString(), bookieOpsStats);
nsBookieClientStatsMap.put(namespace, destBookieClientStatsMap);
} else {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java
index 4fd9e35dd7b..ac131121d0b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java
@@ -18,8 +18,8 @@
*/
package org.apache.pulsar.broker.stats;
-import com.google.common.collect.Maps;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -82,7 +82,7 @@ public class BrokerOperabilityMetrics {
}
Map<String, String> getDimensionMap(String metricsName) {
- Map<String, String> dimensionMap = Maps.newHashMap();
+ Map<String, String> dimensionMap = new HashMap<>();
dimensionMap.put("broker", brokerName);
dimensionMap.put("cluster", localCluster);
dimensionMap.put("metric", metricsName);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MBeanStatsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MBeanStatsGenerator.java
index 6b5d63bee1b..905db1c1e64 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MBeanStatsGenerator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MBeanStatsGenerator.java
@@ -18,10 +18,10 @@
*/
package org.apache.pulsar.broker.stats;
-import com.google.common.collect.Maps;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -108,7 +108,7 @@ public class MBeanStatsGenerator {
* @return
*/
private Metrics createMetricsByDimension(ObjectName objectName) {
- Map<String, String> dimensionMap = Maps.newHashMap();
+ Map<String, String> dimensionMap = new HashMap<>();
dimensionMap.put("MBean", objectName.toString());
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MetricsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MetricsGenerator.java
index 5239cfb9acc..d8c518e9a5d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MetricsGenerator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/MetricsGenerator.java
@@ -18,9 +18,9 @@
*/
package org.apache.pulsar.broker.stats;
-import com.google.common.collect.Maps;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.pulsar.broker.PulsarService;
@@ -61,7 +61,7 @@ public class MetricsGenerator {
// map by dimension map -> metrics
// since dimension map is unique
- Map<Map<String, String>, Metrics> mergedMetrics = Maps.newHashMap();
+ Map<Map<String, String>, Metrics> mergedMetrics = new HashMap<>();
for (Metrics metrics : metricsCollection) {
Map<String, String> dimensionKey = metrics.getDimensions();
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/NamespaceStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/NamespaceStats.java
index 09db78d1edd..d8047f1e13e 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/NamespaceStats.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/NamespaceStats.java
@@ -19,8 +19,8 @@
package org.apache.pulsar.broker.stats;
import static org.apache.bookkeeper.mledger.impl.ManagedLedgerMBeanImpl.ENTRY_LATENCY_BUCKETS_USEC;
-import com.google.common.collect.Maps;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.Map;
import org.apache.pulsar.common.stats.Metrics;
@@ -85,7 +85,7 @@ public class NamespaceStats {
public Metrics add(String namespace) {
- Map<String, String> dimensionMap = Maps.newHashMap();
+ Map<String, String> dimensionMap = new HashMap<>();
dimensionMap.put("namespace", namespace);
Metrics dMetrics = Metrics.create(dimensionMap);
dMetrics.put("brk_in_rate", msgRateIn);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ReplicationMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ReplicationMetrics.java
index 28f36190428..0046218d7c2 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ReplicationMetrics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/ReplicationMetrics.java
@@ -18,9 +18,9 @@
*/
package org.apache.pulsar.broker.stats;
-import com.google.common.collect.Maps;
import io.netty.util.Recycler;
import io.netty.util.Recycler.Handle;
+import java.util.HashMap;
import java.util.Map;
import org.apache.pulsar.common.stats.Metrics;
@@ -70,7 +70,7 @@ public class ReplicationMetrics {
public Metrics add(String namespace, String local, String remote) {
- Map<String, String> dimensionMap = Maps.newHashMap();
+ Map<String, String> dimensionMap = new HashMap<>();
dimensionMap.put("namespace", namespace);
dimensionMap.put("from_cluster", local);
dimensionMap.put("to_cluster", remote);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/AbstractMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/AbstractMetrics.java
index 610d22c54d8..e7e19c8ce3b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/AbstractMetrics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/AbstractMetrics.java
@@ -18,8 +18,7 @@
*/
package org.apache.pulsar.broker.stats.metrics;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -188,7 +187,7 @@ abstract class AbstractMetrics {
* @return
*/
protected Metrics createMetricsByDimension(String namespace) {
- Map<String, String> dimensionMap = Maps.newHashMap();
+ Map<String, String> dimensionMap = new HashMap<>();
dimensionMap.put("namespace", namespace);
@@ -204,7 +203,7 @@ abstract class AbstractMetrics {
* @return
*/
protected Metrics createMetricsByDimension(String namespace, String fromClusterName, String toClusterName) {
- Map<String, String> dimensionMap = Maps.newHashMap();
+ Map<String, String> dimensionMap = new HashMap<>();
dimensionMap.put("namespace", namespace);
dimensionMap.put("from_cluster", fromClusterName);
@@ -214,7 +213,7 @@ abstract class AbstractMetrics {
}
protected void populateAggregationMap(Map<String, List<Double>> map, String mkey, double value) {
- map.computeIfAbsent(mkey, __ -> Lists.newArrayList()).add(value);
+ map.computeIfAbsent(mkey, __ -> new ArrayList<>()).add(value);
}
protected void populateAggregationMapWithSum(Map<String, Double> map, String mkey, double value) {
@@ -238,11 +237,11 @@ abstract class AbstractMetrics {
*/
protected void populateDimensionMap(Map<Metrics, List<ManagedLedgerImpl>> ledgersByDimensionMap, Metrics metrics,
ManagedLedgerImpl ledger) {
- ledgersByDimensionMap.computeIfAbsent(metrics, __ -> Lists.newArrayList()).add(ledger);
+ ledgersByDimensionMap.computeIfAbsent(metrics, __ -> new ArrayList<>()).add(ledger);
}
protected void populateDimensionMap(Map<Metrics, List<TopicStats>> topicsStatsByDimensionMap,
Metrics metrics, TopicStats destStats) {
- topicsStatsByDimensionMap.computeIfAbsent(metrics, __ -> Lists.newArrayList()).add(destStats);
+ topicsStatsByDimensionMap.computeIfAbsent(metrics, __ -> new ArrayList<>()).add(destStats);
}
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java
index 17fbc270e0d..1f3b58a2590 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java
@@ -18,8 +18,8 @@
*/
package org.apache.pulsar.broker.stats.metrics;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -38,8 +38,8 @@ public class ManagedCursorMetrics extends AbstractMetrics {
public ManagedCursorMetrics(PulsarService pulsar) {
super(pulsar);
- this.metricsCollection = Lists.newArrayList();
- this.dimensionMap = Maps.newHashMap();
+ this.metricsCollection = new ArrayList<>();
+ this.dimensionMap = new HashMap<>();
}
@Override
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java
index 1f4181f887f..7bbef5379cb 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerCacheMetrics.java
@@ -18,11 +18,11 @@
*/
package org.apache.pulsar.broker.stats.metrics;
-import com.google.common.collect.Lists;
import io.netty.buffer.PoolArenaMetric;
import io.netty.buffer.PoolChunkListMetric;
import io.netty.buffer.PoolChunkMetric;
import io.netty.buffer.PooledByteBufAllocator;
+import java.util.ArrayList;
import java.util.List;
import org.apache.bookkeeper.mledger.ManagedLedgerFactoryMXBean;
import org.apache.bookkeeper.mledger.impl.cache.RangeEntryCacheImpl;
@@ -34,7 +34,7 @@ public class ManagedLedgerCacheMetrics extends AbstractMetrics {
private List<Metrics> metrics;
public ManagedLedgerCacheMetrics(PulsarService pulsar) {
super(pulsar);
- this.metrics = Lists.newArrayList();
+ this.metrics = new ArrayList<>();
}
@Override
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerMetrics.java
index 8a9dd4a3da6..a8edbf3dd3e 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerMetrics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedLedgerMetrics.java
@@ -18,8 +18,8 @@
*/
package org.apache.pulsar.broker.stats.metrics;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -50,9 +50,9 @@ public class ManagedLedgerMetrics extends AbstractMetrics {
public ManagedLedgerMetrics(PulsarService pulsar) {
super(pulsar);
- this.metricsCollection = Lists.newArrayList();
- this.ledgersByDimensionMap = Maps.newHashMap();
- this.tempAggregatedMetricsMap = Maps.newHashMap();
+ this.metricsCollection = new ArrayList<>();
+ this.ledgersByDimensionMap = new HashMap<>();
+ this.tempAggregatedMetricsMap = new HashMap<>();
this.statsPeriodSeconds = ((ManagedLedgerFactoryImpl) pulsar.getManagedLedgerFactory())
.getConfig().getStatsPeriodSeconds();
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClientBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClientBase.java
index cb45077341d..98465d40f57 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClientBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClientBase.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.broker.systopic;
-import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -86,9 +85,9 @@ public abstract class SystemTopicClientBase<T> implements SystemTopicClient<T> {
@Override
public CompletableFuture<Void> closeAsync() {
List<CompletableFuture<Void>> futures = new ArrayList<>();
- List<Writer<T>> tempWriters = Lists.newArrayList(writers);
+ List<Writer<T>> tempWriters = new ArrayList<>(writers);
tempWriters.forEach(writer -> futures.add(writer.closeAsync()));
- List<Reader<T>> tempReaders = Lists.newArrayList(readers);
+ List<Reader<T>> tempReaders = new ArrayList<>(readers);
tempReaders.forEach(reader -> futures.add(reader.closeAsync()));
writers.clear();
readers.clear();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
index 888106ead31..b71ad79c487 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
@@ -39,6 +39,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -363,7 +364,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
publishMessagesOnTopic(nonPersistentTopicName, 10, 0);
NonPersistentTopicStats topicStats = (NonPersistentTopicStats) admin.topics().getStats(nonPersistentTopicName);
- assertEquals(topicStats.getSubscriptions().keySet(), new TreeSet<>(Lists.newArrayList("my-sub")));
+ assertEquals(topicStats.getSubscriptions().keySet(), Set.of("my-sub"));
assertEquals(topicStats.getSubscriptions().get("my-sub").getConsumers().size(), 1);
assertEquals(topicStats.getSubscriptions().get("my-sub").getMsgDropRate(), 0);
assertEquals(topicStats.getPublishers().size(), 0);
@@ -372,7 +373,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
pulsar.getAdvertisedAddress() + ":" + pulsar.getConfiguration().getWebServicePort().get());
PersistentTopicInternalStats internalStats = admin.topics().getInternalStats(nonPersistentTopicName, false);
- assertEquals(internalStats.cursors.keySet(), new TreeSet<>(Lists.newArrayList("my-sub")));
+ assertEquals(internalStats.cursors.keySet(), Set.of("my-sub"));
consumer.close();
topicStats = (NonPersistentTopicStats) admin.topics().getStats(nonPersistentTopicName);
@@ -545,7 +546,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
Consumer<byte[]> consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName("my-sub")
.subscriptionType(SubscriptionType.Shared).subscribe();
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, totalProducedMessages, 0);
@@ -684,21 +685,21 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
admin.clusters().createCluster("us-east2",
ClusterData.builder().serviceUrl("http://broker.messaging.east2.example.com:8080").build());
- admin.clusters().updatePeerClusterNames("us-west1", Sets.newLinkedHashSet(Lists.newArrayList("us-west2")));
- assertEquals(admin.clusters().getCluster("us-west1").getPeerClusterNames(), Lists.newArrayList("us-west2"));
+ admin.clusters().updatePeerClusterNames("us-west1", new LinkedHashSet<>(List.of("us-west2")));
+ assertEquals(admin.clusters().getCluster("us-west1").getPeerClusterNames(), Set.of("us-west2"));
assertNull(admin.clusters().getCluster("us-west2").getPeerClusterNames());
// update cluster with duplicate peer-clusters in the list
- admin.clusters().updatePeerClusterNames("us-west1", Sets.newLinkedHashSet(
- Lists.newArrayList("us-west2", "us-east1", "us-west2", "us-east1", "us-west2", "us-east1")));
+ admin.clusters().updatePeerClusterNames("us-west1",
+ new LinkedHashSet<>(List.of("us-west2", "us-east1", "us-west2", "us-east1", "us-west2", "us-east1")));
assertEquals(admin.clusters().getCluster("us-west1").getPeerClusterNames(),
- Lists.newArrayList("us-west2", "us-east1"));
+ List.of("us-west2", "us-east1"));
admin.clusters().updatePeerClusterNames("us-west1", null);
assertNull(admin.clusters().getCluster("us-west1").getPeerClusterNames());
// Check name validation
try {
admin.clusters().updatePeerClusterNames("us-west1",
- Sets.newLinkedHashSet(Lists.newArrayList("invalid-cluster")));
+ new LinkedHashSet<>(List.of("invalid-cluster")));
fail("should have failed");
} catch (PulsarAdminException e) {
assertTrue(e instanceof PreconditionFailedException);
@@ -706,7 +707,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
// Cluster itself can't be part of peer-list
try {
- admin.clusters().updatePeerClusterNames("us-west1", Sets.newLinkedHashSet(Lists.newArrayList("us-west1")));
+ admin.clusters().updatePeerClusterNames("us-west1", new LinkedHashSet<>(List.of("us-west1")));
fail("should have failed");
} catch (PulsarAdminException e) {
assertTrue(e instanceof PreconditionFailedException);
@@ -737,7 +738,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
List<String> allClusters = admin.clusters().getClusters();
Collections.sort(allClusters);
assertEquals(allClusters,
- Lists.newArrayList("test", "us-east1", "us-east2", "us-west1", "us-west2", "us-west3", "us-west4"));
+ List.of("test", "us-east1", "us-east2", "us-west1", "us-west2", "us-west3", "us-west4"));
final String property = "peer-prop";
Set<String> allowedClusters = Set.of("us-west1", "us-west2", "us-west3", "us-west4", "us-east1",
@@ -749,9 +750,9 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace(namespace);
admin.clusters().updatePeerClusterNames("us-west1",
- Sets.newLinkedHashSet(Lists.newArrayList("us-west2", "us-west3")));
+ new LinkedHashSet<>(List.of("us-west2", "us-west3")));
assertEquals(admin.clusters().getCluster("us-west1").getPeerClusterNames(),
- Lists.newArrayList("us-west2", "us-west3"));
+ List.of("us-west2", "us-west3"));
// (1) no conflicting peer
Set<String> clusterIds = Set.of("us-east1", "us-east2");
@@ -1241,7 +1242,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
.serviceUrl("http://localhost:6650").build());
// Global cluster, if there, should be omitted from the results
- assertEquals(admin.clusters().getClusters(), Lists.newArrayList(cluster));
+ assertEquals(admin.clusters().getClusters(), List.of(cluster));
}
/**
* verifies cluster has been set before create topic
@@ -1462,7 +1463,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
// create namespace
String namespace = tenant + "/test-ns-1";
admin.namespaces().createNamespace(namespace, Set.of("test"));
- assertEquals(admin.namespaces().getNamespaces(tenant), Lists.newArrayList(namespace));
+ assertEquals(admin.namespaces().getNamespaces(tenant), List.of(namespace));
// create topic
String topic = namespace + "/test-topic-1";
@@ -1554,7 +1555,7 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
// create namespace
String namespace = tenant + "/test-ns";
admin.namespaces().createNamespace(namespace, Set.of("test"));
- assertEquals(admin.namespaces().getNamespaces(tenant), Lists.newArrayList(namespace));
+ assertEquals(admin.namespaces().getNamespaces(tenant), List.of(namespace));
// create topic
String topic = namespace + "/test-topic";
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
index 2246e184384..c75bb280faa 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
@@ -244,14 +244,14 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
ClusterData.builder().serviceUrl("http://broker.messaging.use.example.com:8080").build());
// "test" cluster is part of config-default cluster and it's znode gets created when PulsarService creates
// failure-domain znode of this default cluster
- assertEquals(admin.clusters().getClusters(), Lists.newArrayList("test", "usw"));
+ assertEquals(admin.clusters().getClusters(), List.of("test", "usw"));
assertEquals(admin.clusters().getCluster("test"),
ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build());
admin.clusters().updateCluster("usw",
ClusterData.builder().serviceUrl("http://new-broker.messaging.usw.example.com:8080").build());
- assertEquals(admin.clusters().getClusters(), Lists.newArrayList("test", "usw"));
+ assertEquals(admin.clusters().getClusters(), List.of("test", "usw"));
assertEquals(admin.clusters().getCluster("usw"),
ClusterData.builder().serviceUrl("http://new-broker.messaging.usw.example.com:8080").build());
@@ -260,7 +260,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
.serviceUrl("http://new-broker.messaging.usw.example.com:8080")
.serviceUrlTls("https://new-broker.messaging.usw.example.com:4443")
.build());
- assertEquals(admin.clusters().getClusters(), Lists.newArrayList("test", "usw"));
+ assertEquals(admin.clusters().getClusters(), List.of("test", "usw"));
assertEquals(admin.clusters().getCluster("usw"),
ClusterData.builder()
.serviceUrl("http://new-broker.messaging.usw.example.com:8080")
@@ -269,7 +269,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
admin.clusters().deleteCluster("usw");
Awaitility.await()
- .untilAsserted(() -> assertEquals(admin.clusters().getClusters(), Lists.newArrayList("test")));
+ .untilAsserted(() -> assertEquals(admin.clusters().getClusters(), List.of("test")));
deleteNamespaceGraceFully("prop-xyz/ns1", false);
admin.clusters().deleteCluster("test");
@@ -439,7 +439,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
NamespaceIsolationData.Builder nsRegexPolicy = NamespaceIsolationData.builder()
.namespaces(Collections.singletonList("other/use/other.*"))
- .primary(Lists.newArrayList("prod1-broker[45-46].messaging.use.example.com"))
+ .primary(List.of("prod1-broker[45-46].messaging.use.example.com"))
.autoFailoverPolicy(AutoFailoverPolicyData.builder()
.policyType(AutoFailoverPolicyType.min_available)
.parameters(parameters)
@@ -451,7 +451,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
//Ok
}
- nsRegexPolicy.primary(Lists.newArrayList("prod1-broker[45-46].messaging.use.example.com",
+ nsRegexPolicy.primary(List.of("prod1-broker[45-46].messaging.use.example.com",
"prod1-broker[4-5].messaging.use.example.com"))
.secondary(Collections.singletonList("prod1-broker[45-46].messaging.use.example.com"));
try {
@@ -714,7 +714,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
TenantInfoImpl tenantInfo = new TenantInfoImpl(Set.of("role1", "role2"), allowedClusters);
admin.tenants().updateTenant("prop-xyz", tenantInfo);
- assertEquals(admin.tenants().getTenants(), Lists.newArrayList("prop-xyz"));
+ assertEquals(admin.tenants().getTenants(), List.of("prop-xyz"));
assertEquals(admin.tenants().getTenantInfo("prop-xyz"), tenantInfo);
@@ -769,8 +769,8 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
// Ok
}
- assertEquals(admin.namespaces().getNamespaces("prop-xyz"), Lists.newArrayList("prop-xyz/ns1", "prop-xyz/ns2"));
- assertEquals(admin.namespaces().getNamespaces("prop-xyz"), Lists.newArrayList("prop-xyz/ns1", "prop-xyz/ns2"));
+ assertEquals(admin.namespaces().getNamespaces("prop-xyz"), List.of("prop-xyz/ns1", "prop-xyz/ns2"));
+ assertEquals(admin.namespaces().getNamespaces("prop-xyz"), List.of("prop-xyz/ns1", "prop-xyz/ns2"));
try {
admin.namespaces().createNamespace("prop-xyz/ns4", Set.of("usc"));
@@ -835,7 +835,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
assertTrue(i < 10);
deleteNamespaceGraceFully("prop-xyz/ns1", false);
- assertEquals(admin.namespaces().getNamespaces("prop-xyz"), Lists.newArrayList("prop-xyz/ns2"));
+ assertEquals(admin.namespaces().getNamespaces("prop-xyz"), List.of("prop-xyz/ns2"));
try {
admin.namespaces().unload("prop-xyz/ns1");
@@ -862,7 +862,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
// Force to create a topic
publishMessagesOnPersistentTopic("persistent://prop-xyz/ns1/" + topicName, 0);
assertEquals(admin.topics().getList("prop-xyz/ns1"),
- Lists.newArrayList("persistent://prop-xyz/ns1/" + topicName));
+ List.of("persistent://prop-xyz/ns1/" + topicName));
// create consumer and subscription
@Cleanup
@@ -873,12 +873,12 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
Consumer<byte[]> consumer = client.newConsumer().topic(persistentTopicName).subscriptionName(subName)
.subscriptionType(SubscriptionType.Exclusive).subscribe();
- assertEquals(admin.topics().getSubscriptions(persistentTopicName), Lists.newArrayList(subName));
+ assertEquals(admin.topics().getSubscriptions(persistentTopicName), List.of(subName));
publishMessagesOnPersistentTopic("persistent://prop-xyz/ns1/" + topicName, 10);
TopicStats topicStats = admin.topics().getStats(persistentTopicName);
- assertEquals(topicStats.getSubscriptions().keySet(), new TreeSet<>(Lists.newArrayList(subName)));
+ assertEquals(topicStats.getSubscriptions().keySet(), Set.of(subName));
assertEquals(topicStats.getSubscriptions().get(subName).getConsumers().size(), 1);
assertEquals(topicStats.getSubscriptions().get(subName).getMsgBacklog(), 10);
assertEquals(topicStats.getPublishers().size(), 0);
@@ -886,7 +886,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
pulsar.getAdvertisedAddress() + ":" + pulsar.getConfiguration().getWebServicePort().get());
PersistentTopicInternalStats internalStats = admin.topics().getInternalStats(persistentTopicName, false);
- assertEquals(internalStats.cursors.keySet(), new TreeSet<>(Lists.newArrayList(Codec.encode(subName))));
+ assertEquals(internalStats.cursors.keySet(), Set.of(Codec.encode(subName)));
List<Message<byte[]>> messages = admin.topics().peekMessages(persistentTopicName, subName, 3);
assertEquals(messages.size(), 3);
@@ -968,7 +968,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
admin.topics().createPartitionedTopic(partitionedTopicName, 4);
assertEquals(admin.topics().getPartitionedTopicList(namespace),
- Lists.newArrayList(partitionedTopicName));
+ List.of(partitionedTopicName));
assertEquals(admin.topics().getPartitionedTopicMetadata(partitionedTopicName).partitions, 4);
@@ -1005,7 +1005,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
Consumer<byte[]> consumer = client.newConsumer().topic(partitionedTopicName).subscriptionName("my-sub")
.subscriptionType(SubscriptionType.Exclusive).subscribe();
- assertEquals(admin.topics().getSubscriptions(partitionedTopicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(partitionedTopicName), List.of("my-sub"));
try {
if (isPersistent) {
@@ -1034,7 +1034,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
// TODO: for non-persistent topics, deleteSubscription might throw NotFoundException
admin.topics().deleteSubscription(partitionedTopicName, "my-sub-1");
// TODO: for non-persistent topics, getSubscriptions will return a empty set
- assertEquals(admin.topics().getSubscriptions(partitionedTopicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(partitionedTopicName), List.of("my-sub"));
}
Producer<byte[]> producer = client.newProducer(Schema.BYTES)
@@ -1056,7 +1056,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
topicStats = admin.topics().getPartitionedStats(partitionedTopicName,false);
if (isPersistent) {
// TODO: for non-persistent topics, the subscription doesn't exist
- assertEquals(topicStats.getSubscriptions().keySet(), new TreeSet<>(Lists.newArrayList("my-sub")));
+ assertEquals(topicStats.getSubscriptions().keySet(), Set.of("my-sub"));
assertEquals(topicStats.getSubscriptions().get("my-sub").getConsumers().size(), 1);
assertEquals(topicStats.getSubscriptions().get("my-sub").getMsgBacklog(), 10);
}
@@ -1160,7 +1160,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
assertEquals(admin.topics().getPartitionedTopicList("prop-xyz/ns1"), new ArrayList<>());
final String partitionedTopicName = "persistent://prop-xyz/ns1/" + partitionedTopic;
admin.topics().createPartitionedTopic(partitionedTopicName, 2);
- assertEquals(admin.topics().getPartitionedTopicList("prop-xyz/ns1"), Lists.newArrayList(partitionedTopicName));
+ assertEquals(admin.topics().getPartitionedTopicList("prop-xyz/ns1"), List.of(partitionedTopicName));
assertEquals(admin.topics().getPartitionedTopicMetadata(partitionedTopicName).partitions, 2);
String partitionTopic0 = partitionedTopicName + "-partition-0";
@@ -1223,7 +1223,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
assertEquals(admin.topics().getPartitionedTopicList("prop-xyz/ns1"), new ArrayList<>());
final String partitionedTopicName = "persistent://prop-xyz/ns1/" + partitionedTopic;
admin.topics().createPartitionedTopic(partitionedTopicName, 2);
- assertEquals(admin.topics().getPartitionedTopicList("prop-xyz/ns1"), Lists.newArrayList(partitionedTopicName));
+ assertEquals(admin.topics().getPartitionedTopicList("prop-xyz/ns1"), List.of(partitionedTopicName));
assertEquals(admin.topics().getPartitionedTopicMetadata(partitionedTopicName).partitions, 2);
// create consumer and subscription
@@ -1238,10 +1238,10 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
Thread.sleep(1000);
PersistentTopicInternalStats internalStats0 = admin.topics().getInternalStats(partitionTopic0, false);
- assertEquals(internalStats0.cursors.keySet(), new TreeSet<>(Lists.newArrayList(Codec.encode(subName))));
+ assertEquals(internalStats0.cursors.keySet(), Set.of(Codec.encode(subName)));
PersistentTopicInternalStats internalStats1 = admin.topics().getInternalStats(partitionTopic1, false);
- assertEquals(internalStats1.cursors.keySet(), new TreeSet<>(Lists.newArrayList(Codec.encode(subName))));
+ assertEquals(internalStats1.cursors.keySet(), Set.of(Codec.encode(subName)));
// expected internal stats
PartitionedTopicMetadata partitionedTopicMetadata = new PartitionedTopicMetadata(2);
@@ -1294,7 +1294,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
String namespace = tenant + "/my-ns";
admin.namespaces().createNamespace("my-tenant/my-ns", Set.of("test"));
- assertEquals(admin.namespaces().getNamespaces(tenant), Lists.newArrayList("my-tenant/my-ns"));
+ assertEquals(admin.namespaces().getNamespaces(tenant), List.of("my-tenant/my-ns"));
// create topic
String topic = namespace + "/my-topic";
@@ -1350,7 +1350,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
String namespace = tenant + "/my-ns";
admin.namespaces().createNamespace("my-tenant/my-ns", Set.of("test"));
- assertEquals(admin.namespaces().getNamespaces(tenant), Lists.newArrayList("my-tenant/my-ns"));
+ assertEquals(admin.namespaces().getNamespaces(tenant), List.of("my-tenant/my-ns"));
// create topic
String topic = namespace + "/my-topic";
@@ -1399,7 +1399,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
String namespace = tenant + "/my-ns";
admin.namespaces().createNamespace("my-tenant/my-ns", Set.of("test"));
- assertEquals(admin.namespaces().getNamespaces(tenant), Lists.newArrayList("my-tenant/my-ns"));
+ assertEquals(admin.namespaces().getNamespaces(tenant), List.of("my-tenant/my-ns"));
// create topic
String topic = namespace + "/my-topic";
@@ -1436,7 +1436,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
.create();
producer.send("message".getBytes());
publishMessagesOnPersistentTopic(topicName, 0);
- assertEquals(admin.topics().getList(namespace), Lists.newArrayList(topicName));
+ assertEquals(admin.topics().getList(namespace), List.of(topicName));
try {
admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true, null);
@@ -1458,7 +1458,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
public void testNamespaceSplitBundleWithTopicCountEquallyDivideAlgorithm() throws Exception {
// Force to create a topic
final String namespace = "prop-xyz/ns1";
- List<String> topicNames = Lists.newArrayList(
+ List<String> topicNames = List.of(
(new StringBuilder("persistent://")).append(namespace).append("/topicCountEquallyDivideAlgorithum-1").toString(),
(new StringBuilder("persistent://")).append(namespace).append("/topicCountEquallyDivideAlgorithum-2").toString());
@@ -1931,12 +1931,12 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
// create a topic and produce some messages
publishMessagesOnPersistentTopic(persistentTopicName, 5);
assertEquals(admin.topics().getList("prop-xyz/ns1"),
- Lists.newArrayList(persistentTopicName));
+ List.of(persistentTopicName));
// create the subscription by PulsarAdmin
admin.topics().createSubscription(persistentTopicName, subName, MessageId.earliest);
- assertEquals(admin.topics().getSubscriptions(persistentTopicName), Lists.newArrayList(subName));
+ assertEquals(admin.topics().getSubscriptions(persistentTopicName), List.of(subName));
// create consumer and subscription
@Cleanup
@@ -1956,7 +1956,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
}
// failed to delete the subscription
- assertEquals(admin.topics().getSubscriptions(persistentTopicName), Lists.newArrayList(subName));
+ assertEquals(admin.topics().getSubscriptions(persistentTopicName), List.of(subName));
// try to delete the subscription with a connected consumer forcefully
admin.topics().deleteSubscription(persistentTopicName, subName, true);
@@ -2076,9 +2076,9 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
admin.namespaces().unsubscribeNamespace("prop-xyz/ns1-bundles", "my-sub");
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/ns1-bundles/ds2"),
- Lists.newArrayList("my-sub-1", "my-sub-2"));
+ List.of("my-sub-1", "my-sub-2"));
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/ns1-bundles/ds1"),
- Lists.newArrayList("my-sub-1"));
+ List.of("my-sub-1"));
consumer2.close();
consumer5.close();
@@ -2086,7 +2086,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
admin.namespaces().unsubscribeNamespace("prop-xyz/ns1-bundles", "my-sub-1");
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/ns1-bundles/ds2"),
- Lists.newArrayList("my-sub-2"));
+ List.of("my-sub-2"));
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/ns1-bundles/ds1"),
new ArrayList<>());
}
@@ -2218,9 +2218,9 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
@Test
public void testBackwardCompatibility() throws Exception {
- assertEquals(admin.tenants().getTenants(), Lists.newArrayList("prop-xyz"));
+ assertEquals(admin.tenants().getTenants(), List.of("prop-xyz"));
assertEquals(admin.tenants().getTenantInfo("prop-xyz").getAdminRoles(),
- Lists.newArrayList("role1", "role2"));
+ List.of("role1", "role2"));
assertEquals(admin.tenants().getTenantInfo("prop-xyz").getAllowedClusters(), Set.of("test"));
// Try to deserialize property JSON with IncompatibleTenantAdmin format
@@ -2266,7 +2266,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
.subscriptionType(SubscriptionType.Exclusive)
.acknowledgmentGroupTime(0, TimeUnit.SECONDS).subscribe();
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, 5, 0, false);
@@ -2319,7 +2319,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
.subscriptionType(SubscriptionType.Exclusive)
.acknowledgmentGroupTime(0, TimeUnit.SECONDS).subscribe();
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, 5, 0, false);
@@ -2475,7 +2475,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
List<String> topics = admin.topics().getList("prop-xyz/ns1");
assertEquals(topics.size(), 4);
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, 5, 0, false);
Thread.sleep(1);
@@ -2517,7 +2517,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
String topicName = "persistent://prop-xyz/ns1/invalidcursorreset";
// Force to create a topic
publishMessagesOnPersistentTopic(topicName, 0);
- assertEquals(admin.topics().getList("prop-xyz/ns1"), Lists.newArrayList(topicName));
+ assertEquals(admin.topics().getList("prop-xyz/ns1"), List.of(topicName));
// create consumer and subscription
@Cleanup
@@ -2528,7 +2528,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
Consumer<byte[]> consumer = client.newConsumer().topic(topicName).subscriptionName("my-sub")
.subscriptionType(SubscriptionType.Exclusive).subscribe();
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, 10);
@@ -2601,7 +2601,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
// Force to create a topic
publishMessagesOnPersistentTopic("persistent://prop-xyz/ns1/ds2", 0);
assertEquals(admin.topics().getList("prop-xyz/ns1"),
- Lists.newArrayList("persistent://prop-xyz/ns1/ds2"));
+ List.of("persistent://prop-xyz/ns1/ds2"));
// create consumer and subscription
@Cleanup
@@ -2685,7 +2685,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
// Force to create a topic
publishMessagesOnPersistentTopic("persistent://prop-xyz/ns1/ds2-partition-2", 0);
assertEquals(admin.topics().getList("prop-xyz/ns1"),
- Lists.newArrayList("persistent://prop-xyz/ns1/ds2-partition-2"));
+ List.of("persistent://prop-xyz/ns1/ds2-partition-2"));
// create consumer and subscription
@Cleanup
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
index d035d7c4290..c1bfde505bf 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
@@ -44,7 +44,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeSet;
import java.util.concurrent.CompletableFuture;
import javax.ws.rs.container.AsyncResponse;
import javax.ws.rs.core.Response;
@@ -141,7 +140,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
namespaces.setServletContext(new MockServletContext());
namespaces.setPulsar(pulsar);
doReturn("test").when(namespaces).clientAppId();
- doReturn(new TreeSet<>(Lists.newArrayList("use", "usw", "usc", "global"))).when(namespaces).clusters();
+ doReturn(Set.of("use", "usw", "usc", "global")).when(namespaces).clusters();
doNothing().when(namespaces).validateAdminAccessForTenant("my-tenant");
doNothing().when(namespaces).validateAdminAccessForTenant("other-tenant");
doNothing().when(namespaces).validateAdminAccessForTenant("new-property");
@@ -159,7 +158,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
persistentTopics.setPulsar(pulsar);
doReturn("test").when(persistentTopics).clientAppId();
doReturn("persistent").when(persistentTopics).domain();
- doReturn(new TreeSet<>(Lists.newArrayList("use", "usw", "usc"))).when(persistentTopics).clusters();
+ doReturn(Set.of("use", "usw", "usc")).when(persistentTopics).clusters();
doNothing().when(persistentTopics).validateAdminAccessForTenant("my-tenant");
doNothing().when(persistentTopics).validateAdminAccessForTenant("other-tenant");
doNothing().when(persistentTopics).validateAdminAccessForTenant("prop-xyz");
@@ -481,7 +480,7 @@ public class AdminTest extends MockedPulsarServiceBaseTest {
verify(properties, times(2)).validateSuperUserAccessAsync();
response = asyncRequests(ctx -> properties.getTenants(ctx));
- assertEquals(response, Lists.newArrayList("test-property"));
+ assertEquals(response, List.of("test-property"));
verify(properties, times(3)).validateSuperUserAccessAsync();
response = asyncRequests(ctx -> properties.getTenantAdmin(ctx, "test-property"));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AnalyzeBacklogSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AnalyzeBacklogSubscriptionTest.java
index fdf6fc562db..ab568ac5eec 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AnalyzeBacklogSubscriptionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AnalyzeBacklogSubscriptionTest.java
@@ -18,7 +18,14 @@
*/
package org.apache.pulsar.broker.admin;
-import com.google.common.collect.Lists;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertThrows;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
import lombok.Cleanup;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.api.Consumer;
@@ -33,16 +40,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertThrows;
-
@Test(groups = "broker-admin")
public class AnalyzeBacklogSubscriptionTest extends ProducerConsumerBase {
@@ -78,7 +75,7 @@ public class AnalyzeBacklogSubscriptionTest extends ProducerConsumerBase {
String subName = "sub-1";
admin.topics().createSubscription(topic, subName, MessageId.latest);
- assertEquals(admin.topics().getSubscriptions(topic), Lists.newArrayList("sub-1"));
+ assertEquals(admin.topics().getSubscriptions(topic), List.of("sub-1"));
verifyBacklog(topic, subName, 0, 0);
@@ -178,7 +175,7 @@ public class AnalyzeBacklogSubscriptionTest extends ProducerConsumerBase {
String subName = "sub-1";
admin.topics().createPartitionedTopic(topic, 2);
admin.topics().createSubscription(topic, subName, MessageId.latest);
- assertEquals(admin.topics().getSubscriptions(topic), Lists.newArrayList("sub-1"));
+ assertEquals(admin.topics().getSubscriptions(topic), List.of("sub-1"));
// you cannot use this feature on a partitioned topic
assertThrows(PulsarAdminException.NotAllowedException.class, () -> {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java
index ada26ee6c56..b5d5ffc0467 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/CreateSubscriptionTest.java
@@ -22,26 +22,24 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-
-import com.google.common.collect.Lists;
+import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import java.io.IOException;
import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Response.Status;
-
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl;
-import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
import org.apache.http.HttpResponse;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.admin.PulsarAdminException.ConflictException;
@@ -49,8 +47,8 @@ import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.ProducerConsumerBase;
+import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionMode;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.client.impl.MessageIdImpl;
@@ -95,7 +93,7 @@ public class CreateSubscriptionTest extends ProducerConsumerBase {
Status.CONFLICT.getStatusCode());
}
- assertEquals(admin.topics().getSubscriptions(topic), Lists.newArrayList("sub-1"));
+ assertEquals(admin.topics().getSubscriptions(topic), List.of("sub-1"));
Producer<byte[]> p1 = pulsarClient.newProducer().topic(topic).create();
p1.send("test-1".getBytes());
@@ -131,7 +129,7 @@ public class CreateSubscriptionTest extends ProducerConsumerBase {
for (int i = 0; i < 10; i++) {
assertEquals(admin.topics().getSubscriptions(TopicName.get(topic).getPartition(i).toString()),
- Lists.newArrayList("sub-1"));
+ List.of("sub-1"));
}
}
@@ -157,7 +155,7 @@ public class CreateSubscriptionTest extends ProducerConsumerBase {
for (int i = 0; i < 10; i++) {
assertEquals(
admin.topics().getSubscriptions(TopicName.get(topic).getPartition(i).toString()),
- Lists.newArrayList("sub-1"));
+ List.of("sub-1"));
}
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java
index 15bb5866077..1758e13d735 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/IncrementPartitionsTest.java
@@ -19,8 +19,8 @@
package org.apache.pulsar.broker.admin;
import static org.testng.Assert.assertEquals;
-import com.google.common.collect.Lists;
import java.util.Collections;
+import java.util.List;
import java.util.Set;
import lombok.Cleanup;
import org.apache.pulsar.broker.BrokerTestUtil;
@@ -100,7 +100,7 @@ public class IncrementPartitionsTest extends MockedPulsarServiceBaseTest {
assertEquals(admin.topics().getPartitionedTopicMetadata(partitionedTopicName).partitions, 20);
assertEquals(admin.topics().getSubscriptions(
- TopicName.get(partitionedTopicName).getPartition(15).toString()), Lists.newArrayList("sub-1"));
+ TopicName.get(partitionedTopicName).getPartition(15).toString()), List.of("sub-1"));
consumer.close();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java
index 87e4f703bbf..921aab3de07 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/MaxUnackedMessagesTest.java
@@ -47,7 +47,6 @@ import org.awaitility.Awaitility;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.testng.collections.Lists;
@Test(groups = "broker-admin")
public class MaxUnackedMessagesTest extends ProducerConsumerBase {
@@ -103,7 +102,7 @@ public class MaxUnackedMessagesTest extends ProducerConsumerBase {
Consumer<byte[]> consumer1 = consumerBuilder.subscribe();
Consumer<byte[]> consumer2 = consumerBuilder.subscribe();
Consumer<byte[]> consumer3 = consumerBuilder.subscribe();
- List<Consumer<?>> consumers = Lists.newArrayList(consumer1, consumer2, consumer3);
+ List<Consumer<?>> consumers = List.of(consumer1, consumer2, consumer3);
waitCacheInit(topicName);
admin.topics().setMaxUnackedMessagesOnSubscription(topicName, unackMsgAllowed);
Awaitility.await().untilAsserted(()
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
index 6c3fba38642..6fd874154fa 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
@@ -33,19 +33,18 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import com.google.common.collect.Lists;
import java.lang.reflect.Field;
import java.net.URI;
import java.net.URL;
import java.time.Duration;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import java.util.TreeSet;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
@@ -171,7 +170,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
doReturn("test").when(namespaces).clientAppId();
doReturn(null).when(namespaces).originalPrincipal();
doReturn(null).when(namespaces).clientAuthData();
- doReturn(new TreeSet<>(Lists.newArrayList("use", "usw", "usc", "global"))).when(namespaces).clusters();
+ doReturn(Set.of("use", "usw", "usc", "global")).when(namespaces).clusters();
admin.clusters().createCluster("use", ClusterData.builder().serviceUrl("http://broker-use.com:8080").build());
admin.clusters().createCluster("usw", ClusterData.builder().serviceUrl("http://broker-usw.com:8080").build());
@@ -269,13 +268,16 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
@Test
public void testGetNamespaces() throws Exception {
- List<String> expectedList = Lists.newArrayList(this.testLocalNamespaces.get(0).toString(),
+ List<String> expectedList = Arrays.asList(this.testLocalNamespaces.get(0).toString(),
this.testLocalNamespaces.get(1).toString());
expectedList.sort(null);
assertEquals(namespaces.getNamespacesForCluster(this.testTenant, this.testLocalCluster), expectedList);
- expectedList = Lists.newArrayList(this.testLocalNamespaces.get(0).toString(),
- this.testLocalNamespaces.get(1).toString(), this.testLocalNamespaces.get(2).toString(),
- this.testGlobalNamespaces.get(0).toString());
+ expectedList = Arrays.asList(
+ this.testLocalNamespaces.get(0).toString(),
+ this.testLocalNamespaces.get(1).toString(),
+ this.testLocalNamespaces.get(2).toString(),
+ this.testGlobalNamespaces.get(0).toString()
+ );
expectedList.sort(null);
AsyncResponse response = mock(AsyncResponse.class);
namespaces.getTenantNamespaces(response, this.testTenant);
@@ -510,18 +512,18 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
asyncRequests(rsp -> namespaces.setNamespaceReplicationClusters(rsp,
this.testGlobalNamespaces.get(0).getTenant(), this.testGlobalNamespaces.get(0).getCluster(),
this.testGlobalNamespaces.get(0).getLocalName(),
- Lists.newArrayList("use", "usw")));
+ List.of("use", "usw")));
repCluster = (Set<String>) asyncRequests(rsp -> namespaces.getNamespaceReplicationClusters(rsp,
this.testGlobalNamespaces.get(0).getTenant(), this.testGlobalNamespaces.get(0).getCluster(),
this.testGlobalNamespaces.get(0).getLocalName()));
- assertEquals(repCluster, Lists.newArrayList("use", "usw"));
+ assertEquals(repCluster, List.of("use", "usw"));
try {
asyncRequests(rsp -> namespaces.setNamespaceReplicationClusters(rsp,
this.testGlobalNamespaces.get(0).getTenant(), this.testGlobalNamespaces.get(0).getCluster(),
this.testGlobalNamespaces.get(0).getLocalName(),
- Lists.newArrayList("use", "invalid-cluster")));
+ List.of("use", "invalid-cluster")));
fail("should have failed");
} catch (RestException e) {
assertEquals(e.getResponse().getStatus(), Status.FORBIDDEN.getStatusCode());
@@ -531,7 +533,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
asyncRequests(rsp -> namespaces.setNamespaceReplicationClusters(rsp,
this.testGlobalNamespaces.get(0).getTenant(), this.testGlobalNamespaces.get(0).getCluster(),
this.testGlobalNamespaces.get(0).getLocalName(),
- Lists.newArrayList("use", "global")));
+ List.of("use", "global")));
fail("should have failed");
} catch (RestException e) {
// Ok, global should not be allowed in the list of replication clusters
@@ -541,7 +543,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
try {
asyncRequests(rsp -> namespaces.setNamespaceReplicationClusters(rsp, this.testTenant, "global",
this.testGlobalNamespaces.get(0).getLocalName(),
- Lists.newArrayList("use", "invalid-cluster")));
+ List.of("use", "invalid-cluster")));
fail("should have failed");
} catch (RestException e) {
// Ok, invalid-cluster is an invalid cluster id
@@ -553,7 +555,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
try {
asyncRequests(rsp -> namespaces.setNamespaceReplicationClusters(rsp, this.testTenant, "global",
- this.testGlobalNamespaces.get(0).getLocalName(), Lists.newArrayList("use", "usw")));
+ this.testGlobalNamespaces.get(0).getLocalName(), List.of("use", "usw")));
fail("should have failed");
} catch (RestException e) {
// Ok, usw was not configured in the list of allowed clusters
@@ -566,7 +568,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
try {
asyncRequests(rsp -> namespaces.setNamespaceReplicationClusters(rsp, this.testTenant, "global",
- this.testGlobalNamespaces.get(0).getLocalName(), Lists.newArrayList("use")));
+ this.testGlobalNamespaces.get(0).getLocalName(), List.of("use")));
fail("should have failed");
} catch (RestException e) {
assertEquals(e.getResponse().getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
@@ -588,7 +590,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
store.invalidateAll();
try {
asyncRequests(rsp -> namespaces.setNamespaceReplicationClusters(rsp, this.testTenant, "global",
- this.testGlobalNamespaces.get(0).getLocalName(), Lists.newArrayList("use")));
+ this.testGlobalNamespaces.get(0).getLocalName(), List.of("use")));
fail("should have failed");
} catch (RestException e) {
assertEquals(e.getResponse().getStatus(), 500);
@@ -604,7 +606,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
try {
asyncRequests(rsp -> namespaces.setNamespaceReplicationClusters(rsp, this.testTenant,
- "global", "non-existing-ns", Lists.newArrayList("use")));
+ "global", "non-existing-ns", List.of("use")));
fail("should have failed");
} catch (RestException e) {
assertEquals(e.getResponse().getStatus(), Status.NOT_FOUND.getStatusCode());
@@ -637,7 +639,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
try {
asyncRequests(rsp -> namespaces.setNamespaceReplicationClusters(rsp, this.testTenant, this.testLocalCluster,
- this.testLocalNamespaces.get(0).getLocalName(), Lists.newArrayList("use")));
+ this.testLocalNamespaces.get(0).getLocalName(), List.of("use")));
fail("should have failed");
} catch (RestException e) {
assertEquals(e.getResponse().getStatus(), Status.PRECONDITION_FAILED.getStatusCode());
@@ -647,7 +649,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
@Test
public void testGetBundles() throws Exception {
- List<String> boundaries = Lists.newArrayList("0x00000000", "0x80000000", "0xffffffff");
+ List<String> boundaries = List.of("0x00000000", "0x80000000", "0xffffffff");
BundlesData bundle = BundlesData.builder()
.boundaries(boundaries)
.numBundles(boundaries.size() - 1)
@@ -783,8 +785,10 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
responseCaptor = ArgumentCaptor.forClass(Response.class);
verify(response, timeout(5000).times(1)).resume(responseCaptor.capture());
assertEquals(responseCaptor.getValue().getStatus(), Status.NO_CONTENT.getStatusCode());
- List<String> nsList = Lists.newArrayList(this.testLocalNamespaces.get(1).toString(),
- this.testLocalNamespaces.get(2).toString());
+ List<String> nsList = Arrays.asList(
+ this.testLocalNamespaces.get(1).toString(),
+ this.testLocalNamespaces.get(2).toString()
+ );
nsList.sort(null);
assertEquals(asyncRequests(ctx -> namespaces.getTenantNamespaces(ctx, this.testTenant)), nsList);
@@ -803,7 +807,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
public void testDeleteNamespaceWithBundles() throws Exception {
URL localWebServiceUrl = new URL(pulsar.getSafeWebServiceAddress());
String bundledNsLocal = "test-delete-namespace-with-bundles";
- List<String> boundaries = Lists.newArrayList("0x00000000", "0x80000000", "0xffffffff");
+ List<String> boundaries = List.of("0x00000000", "0x80000000", "0xffffffff");
BundlesData bundleData = BundlesData.builder()
.boundaries(boundaries)
.numBundles(boundaries.size() - 1)
@@ -901,7 +905,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
public void testSplitBundles() throws Exception {
URL localWebServiceUrl = new URL(pulsar.getSafeWebServiceAddress());
String bundledNsLocal = "test-bundled-namespace-1";
- List<String> boundaries = Lists.newArrayList("0x00000000", "0xffffffff");
+ List<String> boundaries = List.of("0x00000000", "0xffffffff");
BundlesData bundleData = BundlesData.builder()
.boundaries(boundaries)
.numBundles(boundaries.size() - 1)
@@ -940,7 +944,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
public void testSplitBundleWithUnDividedRange() throws Exception {
URL localWebServiceUrl = new URL(pulsar.getSafeWebServiceAddress());
String bundledNsLocal = "test-bundled-namespace-1";
- List<String> boundaries = Lists.newArrayList("0x00000000", "0x08375b1a", "0x08375b1b", "0xffffffff");
+ List<String> boundaries = List.of("0x00000000", "0x08375b1a", "0x08375b1b", "0xffffffff");
BundlesData bundleData = BundlesData.builder()
.boundaries(boundaries)
.numBundles(boundaries.size() - 1)
@@ -967,7 +971,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
public void testUnloadNamespaceWithBundles() throws Exception {
URL localWebServiceUrl = new URL(pulsar.getSafeWebServiceAddress());
String bundledNsLocal = "test-bundled-namespace-1";
- List<String> boundaries = Lists.newArrayList("0x00000000", "0x80000000", "0xffffffff");
+ List<String> boundaries = List.of("0x00000000", "0x80000000", "0xffffffff");
BundlesData bundleData = BundlesData.builder()
.boundaries(boundaries)
.numBundles(boundaries.size() - 1)
@@ -1030,7 +1034,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
try {
URL localWebServiceUrl = new URL(pulsar.getSafeWebServiceAddress());
String bundledNsLocal = "test-bundled-namespace-1";
- List<String> boundaries = Lists.newArrayList("0x00000000", "0xffffffff");
+ List<String> boundaries = List.of("0x00000000", "0xffffffff");
BundlesData bundleData = BundlesData.builder()
.boundaries(boundaries)
.numBundles(boundaries.size() - 1)
@@ -1101,7 +1105,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
public void testValidateTopicOwnership() throws Exception {
URL localWebServiceUrl = new URL(pulsar.getSafeWebServiceAddress());
String bundledNsLocal = "test-bundled-namespace-1";
- List<String> boundaries = Lists.newArrayList("0x00000000", "0xffffffff");
+ List<String> boundaries = List.of("0x00000000", "0xffffffff");
BundlesData bundleData = BundlesData.builder()
.boundaries(boundaries)
.numBundles(boundaries.size() - 1)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesV2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesV2Test.java
index 556f9f3ac05..91b0fdbf079 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesV2Test.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesV2Test.java
@@ -25,13 +25,11 @@ import static org.mockito.Mockito.spy;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import com.google.common.collect.Lists;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Set;
-import java.util.TreeSet;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.pulsar.broker.admin.v2.Namespaces;
@@ -97,7 +95,7 @@ public class NamespacesV2Test extends MockedPulsarServiceBaseTest {
doReturn("test").when(namespaces).clientAppId();
doReturn(null).when(namespaces).originalPrincipal();
doReturn(null).when(namespaces).clientAuthData();
- doReturn(new TreeSet<>(Lists.newArrayList("use", "usw", "usc", "global"))).when(namespaces).clusters();
+ doReturn(Set.of("use", "usw", "usc", "global")).when(namespaces).clusters();
admin.clusters().createCluster("use", ClusterData.builder().serviceUrl("http://broker-use.com:8080").build());
admin.clusters().createCluster("usw", ClusterData.builder().serviceUrl("http://broker-usw.com:8080").build());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
index 3a9bd21245b..5aef3644f2d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.common.collect.Lists;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
@@ -212,7 +211,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
response = mock(AsyncResponse.class);
persistentTopics.getSubscriptions(response, testTenant, testNamespace, testLocalTopicName + "-partition-0",
true);
- verify(response, timeout(5000).times(1)).resume(Lists.newArrayList("test"));
+ verify(response, timeout(5000).times(1)).resume(List.of("test"));
// 6) Delete the subscription
response = mock(AsyncResponse.class);
@@ -240,7 +239,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
response = mock(AsyncResponse.class);
persistentTopics.getSubscriptions(response, testTenant, testNamespace, testLocalTopicName + "-partition-1",
true);
- verify(response, timeout(5000).times(1)).resume(Lists.newArrayList("test"));
+ verify(response, timeout(5000).times(1)).resume(List.of("test"));
//
response = mock(AsyncResponse.class);
persistentTopics.getSubscriptions(response, testTenant, testNamespace, testLocalTopicName + "-partition-0",
@@ -249,7 +248,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
//
response = mock(AsyncResponse.class);
persistentTopics.getSubscriptions(response, testTenant, testNamespace, testLocalTopicName, true);
- verify(response, timeout(5000).times(1)).resume(Lists.newArrayList("test"));
+ verify(response, timeout(5000).times(1)).resume(List.of("test"));
// 9) Delete the partitioned topic
response = mock(AsyncResponse.class);
@@ -603,7 +602,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
when(pulsar.getPulsarResources().getTopicResources()
.listPersistentTopicsAsync(NamespaceName.get("my-tenant/my-namespace")))
- .thenReturn(CompletableFuture.completedFuture(Lists.newArrayList(
+ .thenReturn(CompletableFuture.completedFuture(List.of(
"persistent://my-tenant/my-namespace/" + nonPartitionTopicName1,
"persistent://my-tenant/my-namespace/" + nonPartitionTopicName2
)));
@@ -1188,7 +1187,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
producer.newMessage()
.keyBytes("partition123".getBytes())
.orderingKey(new byte[]{0})
- .replicationClusters(Lists.newArrayList("a", "b"))
+ .replicationClusters(List.of("a", "b"))
.sequenceId(112233)
.value("data")
.send();
@@ -1204,7 +1203,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
Assert.assertEquals("partition123".getBytes(), message.getKeyBytes());
Assert.assertTrue(message.hasBase64EncodedKey());
//test arrays
- Assert.assertEquals(Lists.newArrayList("a", "b"), message.getReplicateTo());
+ Assert.assertEquals(List.of("a", "b"), message.getReplicateTo());
//test string
Assert.assertEquals(producer.getProducerName(), message.getProducerName());
//test enum
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
index 0cf5ed79ea7..22670babcc6 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
@@ -88,7 +88,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import org.testng.collections.Lists;
@Slf4j
@Test(groups = "broker-admin")
@@ -3072,22 +3071,22 @@ public class TopicPoliciesTest extends MockedPulsarServiceBaseTest {
//shadow topic must exist
Assert.expectThrows(PulsarAdminException.PreconditionFailedException.class, ()->
- admin.topics().setShadowTopics(sourceTopic, Lists.newArrayList(shadowTopic1)));
+ admin.topics().setShadowTopics(sourceTopic, List.of(shadowTopic1)));
//shadow topic must be persistent topic
Assert.expectThrows(PulsarAdminException.PreconditionFailedException.class, ()->
admin.topics().setShadowTopics(sourceTopic,
- Lists.newArrayList("non-persistent://" + myNamespace + "/shadow-test1-" + UUID.randomUUID())));
+ List.of("non-persistent://" + myNamespace + "/shadow-test1-" + UUID.randomUUID())));
pulsarClient.newProducer().topic(shadowTopic1).create().close();
pulsarClient.newProducer().topic(shadowTopic2).create().close();
- admin.topics().setShadowTopics(sourceTopic, Lists.newArrayList(shadowTopic1));
+ admin.topics().setShadowTopics(sourceTopic, List.of(shadowTopic1));
Awaitility.await().untilAsserted(() -> Assert.assertEquals(admin.topics().getShadowTopics(sourceTopic),
- Lists.newArrayList(shadowTopic1)));
- admin.topics().setShadowTopics(sourceTopic, Lists.newArrayList(shadowTopic1, shadowTopic2));
+ List.of(shadowTopic1)));
+ admin.topics().setShadowTopics(sourceTopic, List.of(shadowTopic1, shadowTopic2));
Awaitility.await().untilAsserted(() -> Assert.assertEquals(admin.topics().getShadowTopics(sourceTopic),
- Lists.newArrayList(shadowTopic1, shadowTopic2)));
+ List.of(shadowTopic1, shadowTopic2)));
admin.topics().removeShadowTopics(sourceTopic);
Awaitility.await().untilAsserted(() -> assertNull(admin.topics().getShadowTopics(sourceTopic)));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApi2Test.java
index f339416c2b9..7dce82a3691 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApi2Test.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApi2Test.java
@@ -25,7 +25,6 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.net.URL;
import java.util.HashMap;
@@ -33,7 +32,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeSet;
import java.util.concurrent.TimeUnit;
import lombok.Cleanup;
import org.apache.bookkeeper.mledger.impl.ManagedCursorImpl;
@@ -151,7 +149,7 @@ public class V1_AdminApi2Test extends MockedPulsarServiceBaseTest {
PulsarClient client = PulsarClient.builder().serviceUrl(pulsarUrl.toString()).build();
Consumer<byte[]> consumer1 = client.newConsumer().topic(partitionedTopicName).subscriptionName(subName1)
.subscriptionType(SubscriptionType.Shared).subscribe();
- assertEquals(admin.topics().getSubscriptions(partitionedTopicName), Lists.newArrayList(subName1));
+ assertEquals(admin.topics().getSubscriptions(partitionedTopicName), List.of(subName1));
Consumer<byte[]> consumer2 = client.newConsumer().topic(partitionedTopicName).subscriptionName(subName2)
.subscriptionType(SubscriptionType.Shared).subscribe();
assertEquals(new HashSet<>(admin.topics().getSubscriptions(partitionedTopicName)),
@@ -189,7 +187,7 @@ public class V1_AdminApi2Test extends MockedPulsarServiceBaseTest {
// test cumulative stats for partitioned topic
PartitionedTopicStats topicStats = admin.topics().getPartitionedStats(partitionedTopicName, false);
- assertEquals(topicStats.getSubscriptions().keySet(), new TreeSet<>(Lists.newArrayList(subName1, subName2)));
+ assertEquals(topicStats.getSubscriptions().keySet(), Set.of(subName1, subName2));
assertEquals(topicStats.getSubscriptions().get(subName2).getConsumers().size(), 1);
assertEquals(topicStats.getSubscriptions().get(subName2).getMsgBacklog(), totalMessages);
assertEquals(topicStats.getPublishers().size(), 1);
@@ -242,12 +240,12 @@ public class V1_AdminApi2Test extends MockedPulsarServiceBaseTest {
publishMessagesOnTopic("non-persistent://prop-xyz/use/ns1/" + topicName, 10, 0);
NonPersistentTopicStats topicStats = admin.nonPersistentTopics().getStats(persistentTopicName);
- assertEquals(topicStats.getSubscriptions().keySet(), new TreeSet<>(Lists.newArrayList("my-sub")));
+ assertEquals(topicStats.getSubscriptions().keySet(), Set.of("my-sub"));
assertEquals(topicStats.getSubscriptions().get("my-sub").getConsumers().size(), 1);
assertEquals(topicStats.getPublishers().size(), 0);
PersistentTopicInternalStats internalStats = admin.nonPersistentTopics().getInternalStats(persistentTopicName);
- assertEquals(internalStats.cursors.keySet(), new TreeSet<>(Lists.newArrayList("my-sub")));
+ assertEquals(internalStats.cursors.keySet(), Set.of("my-sub"));
consumer.close();
client.close();
@@ -435,7 +433,7 @@ public class V1_AdminApi2Test extends MockedPulsarServiceBaseTest {
Consumer<byte[]> consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName("my-sub")
.subscriptionType(SubscriptionType.Shared).subscribe();
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, totalProducedMessages, 0);
@@ -555,21 +553,21 @@ public class V1_AdminApi2Test extends MockedPulsarServiceBaseTest {
admin.clusters().createCluster("us-east2",
ClusterData.builder().serviceUrl("http://broker.messaging.east2.example.com:8080").build());
- admin.clusters().updatePeerClusterNames("us-west1", Sets.newLinkedHashSet(Lists.newArrayList("us-west2")));
- assertEquals(admin.clusters().getCluster("us-west1").getPeerClusterNames(), Lists.newArrayList("us-west2"));
+ admin.clusters().updatePeerClusterNames("us-west1", Sets.newLinkedHashSet(List.of("us-west2")));
+ assertEquals(admin.clusters().getCluster("us-west1").getPeerClusterNames(), List.of("us-west2"));
assertNull(admin.clusters().getCluster("us-west2").getPeerClusterNames());
// update cluster with duplicate peer-clusters in the list
admin.clusters().updatePeerClusterNames("us-west1", Sets.newLinkedHashSet(
- Lists.newArrayList("us-west2", "us-east1", "us-west2", "us-east1", "us-west2", "us-east1")));
+ List.of("us-west2", "us-east1", "us-west2", "us-east1", "us-west2", "us-east1")));
assertEquals(admin.clusters().getCluster("us-west1").getPeerClusterNames(),
- Lists.newArrayList("us-west2", "us-east1"));
+ List.of("us-west2", "us-east1"));
admin.clusters().updatePeerClusterNames("us-west1", null);
assertNull(admin.clusters().getCluster("us-west1").getPeerClusterNames());
// Check name validation
try {
admin.clusters().updatePeerClusterNames("us-west1",
- Sets.newLinkedHashSet(Lists.newArrayList("invalid-cluster")));
+ Sets.newLinkedHashSet(List.of("invalid-cluster")));
fail("should have failed");
} catch (PulsarAdminException e) {
assertTrue(e instanceof PreconditionFailedException);
@@ -577,7 +575,7 @@ public class V1_AdminApi2Test extends MockedPulsarServiceBaseTest {
// Cluster itselft can't be part of peer-list
try {
- admin.clusters().updatePeerClusterNames("us-west1", Sets.newLinkedHashSet(Lists.newArrayList("us-west1")));
+ admin.clusters().updatePeerClusterNames("us-west1", Sets.newLinkedHashSet(List.of("us-west1")));
fail("should have failed");
} catch (PulsarAdminException e) {
assertTrue(e instanceof PreconditionFailedException);
@@ -615,9 +613,9 @@ public class V1_AdminApi2Test extends MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace(namespace);
admin.clusters().updatePeerClusterNames("us-west1",
- Sets.newLinkedHashSet(Lists.newArrayList("us-west2", "us-west3")));
+ Sets.newLinkedHashSet(List.of("us-west2", "us-west3")));
assertEquals(admin.clusters().getCluster("us-west1").getPeerClusterNames(),
- Lists.newArrayList("us-west2", "us-west3"));
+ List.of("us-west2", "us-west3"));
// (1) no conflicting peer
Set<String> clusterIds = Set.of("us-east1", "us-east2");
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
index 9d90933ee96..c0863cd7333 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
@@ -203,14 +203,14 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
ClusterData.builder().serviceUrl("http://broker.messaging.use.example.com:8080").build());
// "test" cluster is part of config-default cluster and it's znode gets created when PulsarService creates
// failure-domain znode of this default cluster
- assertEquals(admin.clusters().getClusters(), Lists.newArrayList("use", "usw"));
+ assertEquals(admin.clusters().getClusters(), List.of("use", "usw"));
assertEquals(admin.clusters().getCluster("use"),
ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build());
admin.clusters().updateCluster("usw",
ClusterData.builder().serviceUrl("http://new-broker.messaging.use.example.com:8080").build());
- assertEquals(admin.clusters().getClusters(), Lists.newArrayList("use", "usw"));
+ assertEquals(admin.clusters().getClusters(), List.of("use", "usw"));
assertEquals(admin.clusters().getCluster("usw"),
ClusterData.builder().serviceUrl("http://new-broker.messaging.use.example.com:8080").build());
@@ -219,7 +219,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
.serviceUrl("http://new-broker.messaging.usw.example.com:8080")
.serviceUrlTls("https://new-broker.messaging.usw.example.com:4443")
.build());
- assertEquals(admin.clusters().getClusters(), Lists.newArrayList("use", "usw"));
+ assertEquals(admin.clusters().getClusters(), List.of("use", "usw"));
assertEquals(admin.clusters().getCluster("usw"),
ClusterData.builder()
.serviceUrl("http://new-broker.messaging.usw.example.com:8080")
@@ -229,7 +229,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
admin.clusters().deleteCluster("usw");
Thread.sleep(300);
- assertEquals(admin.clusters().getClusters(), Lists.newArrayList("use"));
+ assertEquals(admin.clusters().getClusters(), List.of("use"));
admin.namespaces().deleteNamespace("prop-xyz/use/ns1");
admin.clusters().deleteCluster("use");
@@ -588,7 +588,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
TenantInfoImpl tenantInfo = new TenantInfoImpl(Set.of("role1", "role2"), allowedClusters);
admin.tenants().updateTenant("prop-xyz", tenantInfo);
- assertEquals(admin.tenants().getTenants(), Lists.newArrayList("prop-xyz"));
+ assertEquals(admin.tenants().getTenants(), List.of("prop-xyz"));
assertEquals(admin.tenants().getTenantInfo("prop-xyz"), tenantInfo);
@@ -635,9 +635,9 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
}
assertEquals(admin.namespaces().getNamespaces("prop-xyz"),
- Lists.newArrayList("prop-xyz/use/ns1", "prop-xyz/use/ns2"));
+ List.of("prop-xyz/use/ns1", "prop-xyz/use/ns2"));
assertEquals(admin.namespaces().getNamespaces("prop-xyz", "use"),
- Lists.newArrayList("prop-xyz/use/ns1", "prop-xyz/use/ns2"));
+ List.of("prop-xyz/use/ns1", "prop-xyz/use/ns2"));
try {
admin.namespaces().createNamespace("prop-xyz/usc/ns1");
@@ -693,7 +693,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
assertTrue(i < 10);
admin.namespaces().deleteNamespace("prop-xyz/use/ns1");
- assertEquals(admin.namespaces().getNamespaces("prop-xyz", "use"), Lists.newArrayList("prop-xyz/use/ns2"));
+ assertEquals(admin.namespaces().getNamespaces("prop-xyz", "use"), List.of("prop-xyz/use/ns2"));
try {
admin.namespaces().unload("prop-xyz/use/ns1");
@@ -719,7 +719,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
// Force to create a topic
publishMessagesOnPersistentTopic("persistent://prop-xyz/use/ns1/" + topicName, 0);
assertEquals(admin.topics().getList("prop-xyz/use/ns1"),
- Lists.newArrayList("persistent://prop-xyz/use/ns1/" + topicName));
+ List.of("persistent://prop-xyz/use/ns1/" + topicName));
// create consumer and subscription
@Cleanup
@@ -730,18 +730,18 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
Consumer<byte[]> consumer = client.newConsumer().topic(persistentTopicName).subscriptionName("my-sub")
.subscriptionType(SubscriptionType.Exclusive).subscribe();
- assertEquals(admin.topics().getSubscriptions(persistentTopicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(persistentTopicName), List.of("my-sub"));
publishMessagesOnPersistentTopic("persistent://prop-xyz/use/ns1/" + topicName, 10);
TopicStats topicStats = admin.topics().getStats(persistentTopicName);
- assertEquals(topicStats.getSubscriptions().keySet(), new TreeSet<>(Lists.newArrayList("my-sub")));
+ assertEquals(topicStats.getSubscriptions().keySet(), new TreeSet<>(List.of("my-sub")));
assertEquals(topicStats.getSubscriptions().get("my-sub").getConsumers().size(), 1);
assertEquals(topicStats.getSubscriptions().get("my-sub").getMsgBacklog(), 10);
assertEquals(topicStats.getPublishers().size(), 0);
PersistentTopicInternalStats internalStats = admin.topics().getInternalStats(persistentTopicName, false);
- assertEquals(internalStats.cursors.keySet(), new TreeSet<>(Lists.newArrayList("my-sub")));
+ assertEquals(internalStats.cursors.keySet(), new TreeSet<>(List.of("my-sub")));
List<Message<byte[]>> messages = admin.topics().peekMessages(persistentTopicName, "my-sub", 3);
assertEquals(messages.size(), 3);
@@ -797,7 +797,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
final String partitionedTopicName = "persistent://prop-xyz/use/ns1/" + topicName;
admin.topics().createPartitionedTopic(partitionedTopicName, 4);
assertEquals(admin.topics().getPartitionedTopicList("prop-xyz/use/ns1"),
- Lists.newArrayList(partitionedTopicName));
+ List.of(partitionedTopicName));
assertEquals(admin.topics().getPartitionedTopicMetadata(partitionedTopicName).partitions, 4);
@@ -819,7 +819,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
Consumer<byte[]> consumer = client.newConsumer().topic(partitionedTopicName).subscriptionName("my-sub")
.subscriptionType(SubscriptionType.Exclusive).subscribe();
- assertEquals(admin.topics().getSubscriptions(partitionedTopicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(partitionedTopicName), List.of("my-sub"));
try {
admin.topics().deleteSubscription(partitionedTopicName, "my-sub");
@@ -841,7 +841,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
consumer1.close();
admin.topics().deleteSubscription(partitionedTopicName, "my-sub-1");
- assertEquals(admin.topics().getSubscriptions(partitionedTopicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(partitionedTopicName), List.of("my-sub"));
Producer<byte[]> producer = client.newProducer(Schema.BYTES)
.topic(partitionedTopicName)
@@ -860,7 +860,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
// test cumulative stats for partitioned topic
PartitionedTopicStats topicStats = admin.topics().getPartitionedStats(partitionedTopicName, false);
- assertEquals(topicStats.getSubscriptions().keySet(), new TreeSet<>(Lists.newArrayList("my-sub")));
+ assertEquals(topicStats.getSubscriptions().keySet(), new TreeSet<>(List.of("my-sub")));
assertEquals(topicStats.getSubscriptions().get("my-sub").getConsumers().size(), 1);
assertEquals(topicStats.getSubscriptions().get("my-sub").getMsgBacklog(), 10);
assertEquals(topicStats.getPublishers().size(), 1);
@@ -974,7 +974,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
.create();
producer.send("message".getBytes());
publishMessagesOnPersistentTopic(topicName, 0);
- assertEquals(admin.topics().getList(namespace), Lists.newArrayList(topicName));
+ assertEquals(admin.topics().getList(namespace), List.of(topicName));
try {
admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true, null);
@@ -1004,7 +1004,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
.create();
producer.send("message".getBytes());
publishMessagesOnPersistentTopic(topicName, 0);
- assertEquals(admin.topics().getList(namespace), Lists.newArrayList(topicName));
+ assertEquals(admin.topics().getList(namespace), List.of(topicName));
try {
admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", false, null);
@@ -1113,13 +1113,13 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
// Force to create a topic
publishMessagesOnPersistentTopic("persistent://prop-xyz/use/ns1/ds2", 0);
assertEquals(admin.topics().getList("prop-xyz/use/ns1"),
- Lists.newArrayList("persistent://prop-xyz/use/ns1/ds2"));
+ List.of("persistent://prop-xyz/use/ns1/ds2"));
// create consumer and subscription
Consumer<byte[]> consumer = pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1/ds2")
.subscriptionName("my-sub").subscribe();
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/use/ns1/ds2"),
- Lists.newArrayList("my-sub"));
+ List.of("my-sub"));
// Create producer
Producer<byte[]> producer = pulsarClient.newProducer(Schema.BYTES)
@@ -1174,13 +1174,13 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
// Force to create a topic
publishMessagesOnPersistentTopic("persistent://prop-xyz/use/ns1-bundles/ds2", 0);
assertEquals(admin.topics().getList("prop-xyz/use/ns1-bundles"),
- Lists.newArrayList("persistent://prop-xyz/use/ns1-bundles/ds2"));
+ List.of("persistent://prop-xyz/use/ns1-bundles/ds2"));
// create consumer and subscription
Consumer<byte[]> consumer = pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds2")
.subscriptionName("my-sub").subscribe();
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/use/ns1-bundles/ds2"),
- Lists.newArrayList("my-sub"));
+ List.of("my-sub"));
// Create producer
Producer<byte[]> producer = pulsarClient.newProducer(Schema.BYTES)
@@ -1326,9 +1326,9 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
admin.namespaces().unsubscribeNamespace("prop-xyz/use/ns1-bundles", "my-sub");
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/use/ns1-bundles/ds2"),
- Lists.newArrayList("my-sub-1", "my-sub-2"));
+ List.of("my-sub-1", "my-sub-2"));
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/use/ns1-bundles/ds1"),
- Lists.newArrayList("my-sub-1"));
+ List.of("my-sub-1"));
consumer2.close();
consumer5.close();
@@ -1336,7 +1336,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
admin.namespaces().unsubscribeNamespace("prop-xyz/use/ns1-bundles", "my-sub-1");
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/use/ns1-bundles/ds2"),
- Lists.newArrayList("my-sub-2"));
+ List.of("my-sub-2"));
assertEquals(admin.topics().getSubscriptions("persistent://prop-xyz/use/ns1-bundles/ds1"),
new ArrayList<>());
}
@@ -1456,9 +1456,9 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
@Test
public void testBackwardCompatiblity() throws Exception {
- assertEquals(admin.tenants().getTenants(), Lists.newArrayList("prop-xyz"));
+ assertEquals(admin.tenants().getTenants(), List.of("prop-xyz"));
assertEquals(admin.tenants().getTenantInfo("prop-xyz").getAdminRoles(),
- Lists.newArrayList("role1", "role2"));
+ List.of("role1", "role2"));
assertEquals(admin.tenants().getTenantInfo("prop-xyz").getAllowedClusters(), Set.of("use"));
// Try to deserialize property JSON with IncompatiblePropertyAdmin format
@@ -1490,7 +1490,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
.subscriptionType(SubscriptionType.Exclusive)
.acknowledgmentGroupTime(0, TimeUnit.SECONDS).subscribe();
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, 5, 0);
@@ -1543,7 +1543,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
.subscriptionType(SubscriptionType.Exclusive)
.acknowledgmentGroupTime(0, TimeUnit.SECONDS).subscribe();
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, 5, 0);
@@ -1619,7 +1619,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
List<String> topics = admin.topics().getList("prop-xyz/use/ns1");
assertEquals(topics.size(), 4);
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, 5, 0);
Thread.sleep(1);
@@ -1661,7 +1661,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
String topicName = "persistent://prop-xyz/use/ns1/invalidcursorreset";
// Force to create a topic
publishMessagesOnPersistentTopic(topicName, 0);
- assertEquals(admin.topics().getList("prop-xyz/use/ns1"), Lists.newArrayList(topicName));
+ assertEquals(admin.topics().getList("prop-xyz/use/ns1"), List.of(topicName));
// create consumer and subscription
@Cleanup
@@ -1672,7 +1672,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
Consumer<byte[]> consumer = client.newConsumer().topic(topicName).subscriptionName("my-sub")
.subscriptionType(SubscriptionType.Exclusive).subscribe();
- assertEquals(admin.topics().getSubscriptions(topicName), Lists.newArrayList("my-sub"));
+ assertEquals(admin.topics().getSubscriptions(topicName), List.of("my-sub"));
publishMessagesOnPersistentTopic(topicName, 10);
@@ -1746,7 +1746,7 @@ public class V1_AdminApiTest extends MockedPulsarServiceBaseTest {
// Force to create a topic
publishMessagesOnPersistentTopic("persistent://prop-xyz/use/ns1/ds2", 0);
assertEquals(admin.topics().getList("prop-xyz/use/ns1"),
- Lists.newArrayList("persistent://prop-xyz/use/ns1/ds2"));
+ List.of("persistent://prop-xyz/use/ns1/ds2"));
// create consumer and subscription
@Cleanup
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java
index 2945049e3f5..d0243ecdef1 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java
@@ -19,26 +19,22 @@
package org.apache.pulsar.broker.auth;
import static org.testng.Assert.fail;
-
-import org.apache.pulsar.common.policies.data.ClusterData;
-import org.apache.pulsar.common.policies.data.TenantInfoImpl;
-import org.testng.annotations.AfterClass;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
+import com.google.common.collect.Sets;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.PulsarAdminException.NotAuthorizedException;
import org.apache.pulsar.client.admin.PulsarAdminException.ServerSideErrorException;
import org.apache.pulsar.client.api.Consumer;
+import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException.AuthenticationException;
import org.apache.pulsar.client.api.PulsarClientException.AuthorizationException;
-import org.apache.pulsar.client.api.Producer;
-import com.google.common.collect.Sets;
-
+import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.TenantInfoImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
/**
* This test doesn't test much in and off itself.
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthenticationServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthenticationServiceTest.java
index 15feac95380..24beb8f426a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthenticationServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthenticationServiceTest.java
@@ -21,13 +21,11 @@ package org.apache.pulsar.broker.auth;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
-
+import com.google.common.collect.Sets;
import java.io.IOException;
import java.util.Set;
-
import javax.naming.AuthenticationException;
import javax.servlet.http.HttpServletRequest;
-
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
import org.apache.pulsar.broker.authentication.AuthenticationProvider;
@@ -35,8 +33,6 @@ import org.apache.pulsar.broker.authentication.AuthenticationService;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.collect.Sets;
-
public class AuthenticationServiceTest {
private static final String s_authentication_success = "authenticated";
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java
index 39a91f72dc7..b533f8ce8b2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.when;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
+import com.google.common.collect.Sets;
import java.util.EnumSet;
import org.apache.pulsar.broker.authorization.AuthorizationService;
import org.apache.pulsar.client.admin.PulsarAdmin;
@@ -30,13 +31,12 @@ import org.apache.pulsar.common.naming.TopicDomain;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.AuthAction;
import org.apache.pulsar.common.policies.data.ClusterData;
-import org.apache.pulsar.common.policies.data.TenantInfoImpl;
import org.apache.pulsar.common.policies.data.SubscriptionAuthMode;
+import org.apache.pulsar.common.policies.data.TenantInfoImpl;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import com.google.common.collect.Sets;
@Test(groups = "flaky")
public class AuthorizationTest extends MockedPulsarServiceBaseTest {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthenticationProvider.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthenticationProvider.java
index a15a433f26e..3ef9b5ad2d6 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthenticationProvider.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockAuthenticationProvider.java
@@ -19,13 +19,10 @@
package org.apache.pulsar.broker.auth;
import java.io.IOException;
-
import javax.naming.AuthenticationException;
-
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
import org.apache.pulsar.broker.authentication.AuthenticationProvider;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java
index 84b24fc3121..e1edb8a9462 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java
@@ -21,17 +21,15 @@ package org.apache.pulsar.broker.loadbalance.impl;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-
-import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
-
+import java.util.List;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.loadbalance.LoadData;
-import org.apache.pulsar.policies.data.loadbalancer.LocalBrokerData;
-import org.apache.pulsar.policies.data.loadbalancer.ResourceUsage;
import org.apache.pulsar.policies.data.loadbalancer.BrokerData;
import org.apache.pulsar.policies.data.loadbalancer.BundleData;
+import org.apache.pulsar.policies.data.loadbalancer.LocalBrokerData;
+import org.apache.pulsar.policies.data.loadbalancer.ResourceUsage;
import org.apache.pulsar.policies.data.loadbalancer.TimeAverageMessageData;
import org.testng.annotations.Test;
@@ -148,7 +146,7 @@ public class OverloadShedderTest {
Multimap<String, String> bundlesToUnload = os.findBundlesForUnloading(loadData, conf);
assertFalse(bundlesToUnload.isEmpty());
- assertEquals(bundlesToUnload.get("broker-1"), Lists.newArrayList("bundle-10", "bundle-9"));
+ assertEquals(bundlesToUnload.get("broker-1"), List.of("bundle-10", "bundle-9"));
}
@Test
@@ -187,7 +185,7 @@ public class OverloadShedderTest {
Multimap<String, String> bundlesToUnload = os.findBundlesForUnloading(loadData, conf);
assertFalse(bundlesToUnload.isEmpty());
- assertEquals(bundlesToUnload.get("broker-1"), Lists.newArrayList("bundle-8", "bundle-7"));
+ assertEquals(bundlesToUnload.get("broker-1"), List.of("bundle-8", "bundle-7"));
}
@Test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedderTest.java
index 8461f8ce74c..adc7d2f9c73 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ThresholdShedderTest.java
@@ -21,16 +21,16 @@ package org.apache.pulsar.broker.loadbalance.impl;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
+import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.loadbalance.LoadData;
-import org.apache.pulsar.policies.data.loadbalancer.LocalBrokerData;
-import org.apache.pulsar.policies.data.loadbalancer.ResourceUsage;
import org.apache.pulsar.policies.data.loadbalancer.BrokerData;
import org.apache.pulsar.policies.data.loadbalancer.BundleData;
+import org.apache.pulsar.policies.data.loadbalancer.LocalBrokerData;
+import org.apache.pulsar.policies.data.loadbalancer.ResourceUsage;
import org.apache.pulsar.policies.data.loadbalancer.TimeAverageMessageData;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -161,7 +161,7 @@ public class ThresholdShedderTest {
Multimap<String, String> bundlesToUnload = thresholdShedder.findBundlesForUnloading(loadData, conf);
assertFalse(bundlesToUnload.isEmpty());
assertEquals(bundlesToUnload.get("broker-1"),
- Lists.newArrayList("bundle-10", "bundle-9", "bundle-8"));
+ List.of("bundle-10", "bundle-9", "bundle-8"));
}
@Test
@@ -209,7 +209,7 @@ public class ThresholdShedderTest {
Multimap<String, String> bundlesToUnload = thresholdShedder.findBundlesForUnloading(loadData, conf);
assertFalse(bundlesToUnload.isEmpty());
assertEquals(bundlesToUnload.get("broker-1"),
- Lists.newArrayList("bundle-8", "bundle-7", "bundle-6", "bundle-5"));
+ List.of("bundle-8", "bundle-7", "bundle-6", "bundle-5"));
}
@Test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
index cb806d3ccfe..ca8408c468d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
@@ -31,11 +31,14 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.google.common.hash.Hashing;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.URI;
+import java.util.ArrayList;
import java.util.EnumSet;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -45,7 +48,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-
import lombok.Cleanup;
import org.apache.bookkeeper.mledger.ManagedLedger;
import org.apache.commons.collections4.CollectionUtils;
@@ -64,13 +66,12 @@ import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.PulsarClient;
-
-import org.apache.pulsar.common.naming.ServiceUnitId;
-import org.apache.pulsar.common.naming.NamespaceBundleSplitAlgorithm;
-import org.apache.pulsar.common.naming.NamespaceBundleFactory;
import org.apache.pulsar.common.naming.NamespaceBundle;
+import org.apache.pulsar.common.naming.NamespaceBundleFactory;
+import org.apache.pulsar.common.naming.NamespaceBundleSplitAlgorithm;
import org.apache.pulsar.common.naming.NamespaceBundles;
import org.apache.pulsar.common.naming.NamespaceName;
+import org.apache.pulsar.common.naming.ServiceUnitId;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.BundlesData;
import org.apache.pulsar.common.policies.data.LocalPolicies;
@@ -82,10 +83,10 @@ import org.apache.pulsar.metadata.api.MetadataCache;
import org.apache.pulsar.metadata.api.Notification;
import org.apache.pulsar.metadata.api.extended.CreateOption;
import org.apache.pulsar.policies.data.loadbalancer.AdvertisedListener;
+import org.apache.pulsar.policies.data.loadbalancer.BundleData;
import org.apache.pulsar.policies.data.loadbalancer.LoadReport;
import org.apache.pulsar.policies.data.loadbalancer.LocalBrokerData;
import org.apache.pulsar.policies.data.loadbalancer.NamespaceBundleStats;
-import org.apache.pulsar.policies.data.loadbalancer.BundleData;
import org.awaitility.Awaitility;
import org.mockito.stubbing.Answer;
import org.slf4j.Logger;
@@ -95,11 +96,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.hash.Hashing;
-
@Test(groups = "flaky")
public class NamespaceServiceTest extends BrokerTestBase {
@@ -186,7 +182,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
OwnershipCache MockOwnershipCache = spy(pulsar.getNamespaceService().getOwnershipCache());
ManagedLedger ledger = mock(ManagedLedger.class);
- when(ledger.getCursors()).thenReturn(Lists.newArrayList());
+ when(ledger.getCursors()).thenReturn(new ArrayList<>());
doReturn(CompletableFuture.completedFuture(null)).when(MockOwnershipCache).disableOwnership(any(NamespaceBundle.class));
Field ownership = NamespaceService.class.getDeclaredField("ownershipCache");
@@ -240,7 +236,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
OwnershipCache MockOwnershipCache = spy(pulsar.getNamespaceService().getOwnershipCache());
ManagedLedger ledger = mock(ManagedLedger.class);
- when(ledger.getCursors()).thenReturn(Lists.newArrayList());
+ when(ledger.getCursors()).thenReturn(new ArrayList<>());
doReturn(CompletableFuture.completedFuture(null)).when(MockOwnershipCache).disableOwnership(any(NamespaceBundle.class));
Field ownership = NamespaceService.class.getDeclaredField("ownershipCache");
@@ -263,7 +259,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
OwnershipCache ownershipCache = spy(pulsar.getNamespaceService().getOwnershipCache());
ManagedLedger ledger = mock(ManagedLedger.class);
- when(ledger.getCursors()).thenReturn(Lists.newArrayList());
+ when(ledger.getCursors()).thenReturn(new ArrayList<>());
doReturn(CompletableFuture.completedFuture(null)).when(ownershipCache).disableOwnership(any(NamespaceBundle.class));
Field ownership = NamespaceService.class.getDeclaredField("ownershipCache");
@@ -386,7 +382,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
final String listenerUrl = "pulsar://localhost:7000";
final String listenerUrlTls = "pulsar://localhost:8000";
final String listener = "listenerName";
- Map<String, AdvertisedListener> advertisedListeners = Maps.newHashMap();
+ Map<String, AdvertisedListener> advertisedListeners = new HashMap<>();
advertisedListeners.put(listener, AdvertisedListener.builder().brokerServiceUrl(new URI(listenerUrl)).brokerServiceUrlTls(new URI(listenerUrlTls)).build());
LocalBrokerData ld = new LocalBrokerData(null, null, candidateBroker, null, advertisedListeners);
URI uri = new URI(candidateBroker);
@@ -570,7 +566,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
NamespaceName nsname = NamespaceName.get(namespace);
NamespaceBundles bundles = namespaceService.getNamespaceBundleFactory().getBundles(nsname);
- Map<String, Integer> topicCount = Maps.newHashMap();
+ Map<String, Integer> topicCount = new HashMap<>();
int maxTopics = 0;
String maxBundle = null;
for (int i = 0; i < totalTopics; i++) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java
index 6168c61bb20..db29d16c9ff 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.broker.namespace;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyLong;
@@ -34,6 +33,7 @@ import static org.testng.Assert.fail;
import com.google.common.collect.Range;
import com.google.common.hash.Hashing;
import java.util.EnumSet;
+import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -250,7 +250,7 @@ public class OwnershipCacheTest {
assertFalse(cache.getOwnerAsync(testBundle).get().isPresent());
try {
- checkNotNull(cache.getOwnedBundle(testBundle));
+ Objects.requireNonNull(cache.getOwnedBundle(testBundle));
fail("Should have failed");
} catch (NullPointerException npe) {
// OK for not owned namespace
@@ -264,7 +264,7 @@ public class OwnershipCacheTest {
"https://localhost:4443", false)),
Optional.of(-1L), EnumSet.of(CreateOption.Ephemeral)).join();
try {
- checkNotNull(cache.getOwnedBundle(testBundle));
+ Objects.requireNonNull(cache.getOwnedBundle(testBundle));
fail("Should have failed");
} catch (NullPointerException npe) {
// OK for not owned namespace
@@ -284,7 +284,7 @@ public class OwnershipCacheTest {
assertEquals(data1.getNativeUrlTls(), "pulsar://otherhost:8884");
assertFalse(data1.isDisabled());
try {
- checkNotNull(cache.getOwnedBundle(testBundle));
+ Objects.requireNonNull(cache.getOwnedBundle(testBundle));
fail("Should have failed");
} catch (NullPointerException npe) {
// OK for not owned namespace
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java
index cc1558fed27..b129995a8cc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AbstractBaseDispatcherTest.java
@@ -24,11 +24,11 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
-import com.google.common.collect.ImmutableMap;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.impl.EntryImpl;
@@ -87,7 +87,7 @@ public class AbstractBaseDispatcherTest {
EntryFilterWithClassLoader mockFilter = mock(EntryFilterWithClassLoader.class);
when(mockFilter.filterEntry(any(Entry.class), any(FilterContext.class))).thenReturn(
EntryFilter.FilterResult.REJECT);
- ImmutableMap<String, EntryFilterWithClassLoader> entryFilters = ImmutableMap.of("key", mockFilter);
+ Map<String, EntryFilterWithClassLoader> entryFilters = Map.of("key", mockFilter);
when(mockTopic.getEntryFilters()).thenReturn(entryFilters);
this.helper = new AbstractBaseDispatcherTestHelper(this.subscriptionMock, this.svcConfig);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
index b100c3a977a..fccc7abc668 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java
@@ -22,11 +22,11 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import com.beust.jcommander.internal.Maps;
import com.google.common.collect.Sets;
import java.net.URL;
import java.time.Duration;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
@@ -183,7 +183,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testBacklogQuotaWithReader() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -268,7 +268,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testTriggerBacklogQuotaSizeWithReader() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -340,7 +340,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testTriggerBacklogTimeQuotaWithReader() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -407,7 +407,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testConsumerBacklogEvictionSizeQuota() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -442,7 +442,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testConsumerBacklogEvictionTimeQuotaPrecise() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitTime(TIME_TO_CHECK_BACKLOG_QUOTA)
@@ -484,7 +484,7 @@ public class BacklogQuotaManagerTest {
@Test(timeOut = 60000)
public void testConsumerBacklogEvictionTimeQuota() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitTime(TIME_TO_CHECK_BACKLOG_QUOTA)
@@ -530,7 +530,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testConsumerBacklogEvictionTimeQuotaWithEmptyLedger() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitTime(TIME_TO_CHECK_BACKLOG_QUOTA)
@@ -577,7 +577,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testConsumerBacklogEvictionWithAckSizeQuota() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -612,7 +612,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testConsumerBacklogEvictionWithAckTimeQuotaPrecise() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitTime(TIME_TO_CHECK_BACKLOG_QUOTA)
@@ -675,7 +675,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testConsumerBacklogEvictionWithAckTimeQuota() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
@Cleanup
PulsarClient client = PulsarClient.builder().serviceUrl(adminUrl.toString()).build();
@@ -745,7 +745,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testConcurrentAckAndEviction() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -816,7 +816,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testNoEviction() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -880,7 +880,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testEvictionMulti() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/ns-quota"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/ns-quota",
BacklogQuota.builder()
.limitSize(15 * 1024)
@@ -982,7 +982,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testAheadProducerOnHold() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/quotahold"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/quotahold",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -1024,7 +1024,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testAheadProducerOnHoldTimeout() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/quotahold"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/quotahold",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -1062,7 +1062,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testProducerException() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/quotahold"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/quotahold",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -1102,7 +1102,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testProducerExceptionAndThenUnblockSizeQuota() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/quotahold"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/quotahold",
BacklogQuota.builder()
.limitSize(10 * 1024)
@@ -1166,7 +1166,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testProducerExceptionAndThenUnblockTimeQuotaPrecise() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/quotahold"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/quotahold",
BacklogQuota.builder()
.limitTime(TIME_TO_CHECK_BACKLOG_QUOTA)
@@ -1232,7 +1232,7 @@ public class BacklogQuotaManagerTest {
@Test
public void testProducerExceptionAndThenUnblockTimeQuota() throws Exception {
assertEquals(admin.namespaces().getBacklogQuotaMap("prop/quotahold"),
- Maps.newHashMap());
+ new HashMap<>());
admin.namespaces().setBacklogQuota("prop/quotahold",
BacklogQuota.builder()
.limitTime(TIME_TO_CHECK_BACKLOG_QUOTA)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
index e9c5032063f..fe2551287c8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
@@ -22,11 +22,8 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
-
-import com.google.common.collect.Lists;
-
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
@@ -39,7 +36,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-
import lombok.Cleanup;
import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers;
import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
@@ -130,7 +126,7 @@ public class BatchMessageTest extends BrokerTestBase {
.batcherBuilder(builder)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("my-message-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
@@ -179,7 +175,7 @@ public class BatchMessageTest extends BrokerTestBase {
.batcherBuilder(builder)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("my-message-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
@@ -223,7 +219,7 @@ public class BatchMessageTest extends BrokerTestBase {
.create();
Random random = new Random();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
// put a random sleep from 0 to 3 ms
Thread.sleep(random.nextInt(4));
@@ -259,7 +255,7 @@ public class BatchMessageTest extends BrokerTestBase {
.compressionType(compressionType).enableBatching(true).create();
Random random = new Random();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
// put a random sleep from 0 to 3 ms
Thread.sleep(random.nextInt(4));
@@ -298,7 +294,7 @@ public class BatchMessageTest extends BrokerTestBase {
.batcherBuilder(builder)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
if (i == 25) {
// send a large message
@@ -361,7 +357,7 @@ public class BatchMessageTest extends BrokerTestBase {
.batcherBuilder(builder)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("msg-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
@@ -509,7 +505,7 @@ public class BatchMessageTest extends BrokerTestBase {
.batcherBuilder(builder)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("msg-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
@@ -571,7 +567,7 @@ public class BatchMessageTest extends BrokerTestBase {
.batchingMaxPublishDelay(5, TimeUnit.SECONDS).batchingMaxMessages(numMsgsInBatch).enableBatching(true)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("msg-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
@@ -640,7 +636,7 @@ public class BatchMessageTest extends BrokerTestBase {
// create producer to publish non batch messages
Producer<byte[]> noBatchProducer = pulsarClient.newProducer().topic(topicName).create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("msg-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
@@ -697,7 +693,7 @@ public class BatchMessageTest extends BrokerTestBase {
.messageRoutingMode(MessageRoutingMode.SinglePartition)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs / 2; i++) {
byte[] message = ("msg-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
@@ -760,7 +756,7 @@ public class BatchMessageTest extends BrokerTestBase {
.batcherBuilder(builder)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("my-message-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
@@ -814,7 +810,7 @@ public class BatchMessageTest extends BrokerTestBase {
.subscriptionName(subscriptionName)
.subscriptionType(SubscriptionType.Key_Shared)
.subscribe();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
String[] keys = new String[]{"key-1", "key-2", "key-3"};
for (int i = 0; i < 10; i++) {
byte[] message = ("my-message-" + i).getBytes();
@@ -912,7 +908,7 @@ public class BatchMessageTest extends BrokerTestBase {
.batcherBuilder(builder)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("my-message-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
@@ -944,7 +940,7 @@ public class BatchMessageTest extends BrokerTestBase {
.batcherBuilder(builder)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("my-message-" + i).getBytes();
sendFutureList.add(producer.newMessage().sequenceId(i + 100).value(message).sendAsync());
@@ -1008,7 +1004,7 @@ public class BatchMessageTest extends BrokerTestBase {
Producer<byte[]> producer = pulsarClient.newProducer().topic(topicName).batchingMaxMessages(batchMessages)
.batchingMaxPublishDelay(500, TimeUnit.MILLISECONDS).enableBatching(true).create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("my-message-" + i).getBytes();
sendFutureList.add(producer.newMessage().value(message).sendAsync());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageWithBatchIndexLevelTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageWithBatchIndexLevelTest.java
index 731c65dd33d..c15c93c0e9a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageWithBatchIndexLevelTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageWithBatchIndexLevelTest.java
@@ -18,7 +18,13 @@
*/
package org.apache.pulsar.broker.service;
-import com.google.common.collect.Lists;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
import lombok.Cleanup;
import lombok.SneakyThrows;
import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers;
@@ -33,13 +39,6 @@ import org.apache.pulsar.common.util.FutureUtil;
import org.awaitility.Awaitility;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
@Test(groups = "broker")
public class BatchMessageWithBatchIndexLevelTest extends BatchMessageTest {
@@ -78,7 +77,7 @@ public class BatchMessageWithBatchIndexLevelTest extends BatchMessageTest {
.enableBatching(true)
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("batch-message-" + i).getBytes();
sendFutureList.add(producer.newMessage().value(message).sendAsync());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
index e575154a743..62469fdac9b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
@@ -23,9 +23,10 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.fail;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -390,7 +391,7 @@ public class BrokerBookieIsolationTest {
long ledgerId = lInfo.getLedgerId();
CompletableFuture<Versioned<LedgerMetadata>> ledgerMetaFuture = ledgerManager.readLedgerMetadata(ledgerId);
LedgerMetadata ledgerMetadata = ledgerMetaFuture.get().getValue();
- Set<BookieId> ledgerBookies = Sets.newHashSet();
+ Set<BookieId> ledgerBookies = new HashSet<>();
ledgerBookies.addAll(ledgerMetadata.getAllEnsembles().values().iterator().next());
assertEquals(ledgerBookies.size(), isolatedBookies.size());
ledgerBookies.removeAll(isolatedBookies);
@@ -736,7 +737,7 @@ public class BrokerBookieIsolationTest {
setDefaultIsolationGroup(brokerBookkeeperClientIsolationGroups, zkClient, defaultBookies);
// primary group empty
- setDefaultIsolationGroup(tenantNamespaceIsolationGroupsPrimary, zkClient, Sets.newHashSet());
+ setDefaultIsolationGroup(tenantNamespaceIsolationGroupsPrimary, zkClient, new HashSet<>());
setDefaultIsolationGroup(tenantNamespaceIsolationGroupsSecondary, zkClient, isolatedBookies);
ServiceConfiguration config = new ServiceConfiguration();
@@ -811,7 +812,7 @@ public class BrokerBookieIsolationTest {
long ledgerId = lInfo.getLedgerId();
CompletableFuture<Versioned<LedgerMetadata>> ledgerMetaFuture = ledgerManager.readLedgerMetadata(ledgerId);
LedgerMetadata ledgerMetadata = ledgerMetaFuture.get().getValue();
- Set<BookieId> ledgerBookies = Sets.newHashSet();
+ Set<BookieId> ledgerBookies = new HashSet<>();
ledgerBookies.addAll(ledgerMetadata.getAllEnsembles().values().iterator().next());
assertEquals(ledgerBookies.size(), defaultBookies.size());
ledgerBookies.removeAll(defaultBookies);
@@ -854,7 +855,7 @@ public class BrokerBookieIsolationTest {
bookies = new BookiesRackConfiguration();
}
- Map<String, BookieInfo> bookieInfoMap = Maps.newHashMap();
+ Map<String, BookieInfo> bookieInfoMap = new HashMap<>();
for (BookieId bkSocket : bookieAddresses) {
BookieInfo info = BookieInfo.builder().rack("use").hostname(bkSocket.toString()).build();
bookieInfoMap.put(bkSocket.toString(), info);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
index 389e9420c02..f011ef9b842 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
@@ -29,7 +29,6 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
@@ -579,8 +578,8 @@ public class BrokerServiceTest extends BrokerTestBase {
final String ns1 = "prop/stats1";
final String ns2 = "prop/stats2";
- List<String> nsList = Lists.newArrayList(ns1, ns2);
- List<Producer<byte[]>> producerList = Lists.newArrayList();
+ List<String> nsList = List.of(ns1, ns2);
+ List<Producer<byte[]>> producerList = new ArrayList<>();
BrokerStats brokerStatsClient = admin.brokerStats();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java
index 64cde26847f..5b1589a7c9b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java
@@ -22,8 +22,6 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-
-import com.google.common.collect.Lists;
import io.netty.buffer.ByteBuf;
import io.netty.channel.EventLoopGroup;
import io.netty.util.concurrent.DefaultThreadFactory;
@@ -259,7 +257,7 @@ public class BrokerServiceThrottlingTest extends BrokerTestBase {
.statsInterval(0, TimeUnit.SECONDS)
.ioThreads(20).connectionsPerBroker(20).build();
upsertLookupPermits(100);
- List<Consumer<byte[]>> consumers = Collections.synchronizedList(Lists.newArrayList());
+ List<Consumer<byte[]>> consumers = Collections.synchronizedList(new ArrayList<>());
@Cleanup("shutdownNow")
ExecutorService executor = Executors.newFixedThreadPool(10);
final int totalConsumers = 8;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DistributedIdGeneratorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DistributedIdGeneratorTest.java
index 75334d60bea..6aa9a53b336 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DistributedIdGeneratorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DistributedIdGeneratorTest.java
@@ -19,8 +19,8 @@
package org.apache.pulsar.broker.service;
import static org.testng.Assert.assertEquals;
-import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@@ -86,7 +86,7 @@ public class DistributedIdGeneratorTest {
@Cleanup("shutdownNow")
ExecutorService executor = Executors.newCachedThreadPool();
- List<String> results = Collections.synchronizedList(Lists.newArrayList());
+ List<String> results = Collections.synchronizedList(new ArrayList<>());
for (int i = 0; i < Threads; i++) {
executor.execute(() -> {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelectorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelectorTest.java
index dde0a586f03..ff9cb56b781 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelectorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/HashRangeExclusiveStickyKeyConsumerSelectorTest.java
@@ -20,16 +20,12 @@ package org.apache.pulsar.broker.service;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
-import com.google.common.collect.Lists;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.pulsar.client.api.Range;
import org.apache.pulsar.common.api.proto.IntRange;
import org.apache.pulsar.common.api.proto.KeySharedMeta;
@@ -228,12 +224,12 @@ public class HashRangeExclusiveStickyKeyConsumerSelectorTest {
Assert.assertEquals(selector.getRangeConsumer().size(),2);
final List<List<IntRange>> testRanges = new ArrayList<>();
- testRanges.add(Lists.newArrayList(
+ testRanges.add(List.of(
new IntRange().setStart(2).setEnd(2),
new IntRange().setStart(3).setEnd(3),
new IntRange().setStart(4).setEnd(5))
);
- testRanges.add(Lists.newArrayList(
+ testRanges.add(List.of(
new IntRange().setStart(0).setEnd(0),
new IntRange().setStart(1).setEnd(2))
);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageTTLTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageTTLTest.java
index 76f09377edc..38bb301ae38 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageTTLTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessageTTLTest.java
@@ -23,11 +23,10 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
-
import lombok.Cleanup;
import org.apache.bookkeeper.mledger.impl.PositionImpl;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
@@ -81,7 +80,7 @@ public class MessageTTLTest extends BrokerTestBase {
.enableBatching(false) // this makes the test easier and predictable
.create();
- List<CompletableFuture<MessageId>> sendFutureList = Lists.newArrayList();
+ List<CompletableFuture<MessageId>> sendFutureList = new ArrayList<>();
for (int i = 0; i < numMsgs; i++) {
byte[] message = ("my-message-" + i).getBytes();
sendFutureList.add(producer.sendAsync(message));
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java
index 8381ad599f1..5f145e258cf 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java
@@ -24,10 +24,10 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.fail;
-
+import com.google.common.collect.Sets;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.concurrent.TimeUnit;
-
import lombok.Cleanup;
import org.apache.pulsar.broker.BrokerTestUtil;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
@@ -43,9 +43,6 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import org.testng.collections.Lists;
-
-import com.google.common.collect.Sets;
@Test(groups = "broker")
public class PeerReplicatorTest extends ReplicatorTestBase {
@@ -130,7 +127,7 @@ public class PeerReplicatorTest extends ReplicatorTestBase {
}
// set peer-clusters : r3->r1
- admin1.clusters().updatePeerClusterNames("r3", Sets.newLinkedHashSet(Lists.newArrayList("r1")));
+ admin1.clusters().updatePeerClusterNames("r3", Sets.newLinkedHashSet(List.of("r1")));
Producer<byte[]> producer = client3.newProducer().topic(topic1).create();
PersistentTopic topic = (PersistentTopic) pulsar1.getBrokerService().getOrCreateTopic(topic1).get();
assertNotNull(topic);
@@ -145,7 +142,7 @@ public class PeerReplicatorTest extends ReplicatorTestBase {
producer.close();
// set peer-clusters : r3->r2
- admin2.clusters().updatePeerClusterNames("r3", Sets.newLinkedHashSet(Lists.newArrayList("r2")));
+ admin2.clusters().updatePeerClusterNames("r3", Sets.newLinkedHashSet(List.of("r2")));
producer = client3.newProducer().topic(topic2).create();
topic = (PersistentTopic) pulsar2.getBrokerService().getOrCreateTopic(topic2).get();
assertNotNull(topic);
@@ -172,7 +169,7 @@ public class PeerReplicatorTest extends ReplicatorTestBase {
final String mainClusterName = "r1";
assertNull(admin1.clusters().getPeerClusterNames(mainClusterName));
- LinkedHashSet<String> peerClusters = Sets.newLinkedHashSet(Lists.newArrayList("r2", "r3"));
+ LinkedHashSet<String> peerClusters = Sets.newLinkedHashSet(List.of("r2", "r3"));
admin1.clusters().updatePeerClusterNames(mainClusterName, peerClusters);
retryStrategically((test) -> {
try {
@@ -214,8 +211,8 @@ public class PeerReplicatorTest extends ReplicatorTestBase {
@Cleanup
PulsarClient client3 = PulsarClient.builder().serviceUrl(serviceUrl).statsInterval(0, TimeUnit.SECONDS).build();
// set peer-clusters : r3->r1
- admin1.clusters().updatePeerClusterNames("r3", Sets.newLinkedHashSet(Lists.newArrayList("r1")));
- admin1.clusters().updatePeerClusterNames("r1", Sets.newLinkedHashSet(Lists.newArrayList("r3")));
+ admin1.clusters().updatePeerClusterNames("r3", Sets.newLinkedHashSet(List.of("r1")));
+ admin1.clusters().updatePeerClusterNames("r1", Sets.newLinkedHashSet(List.of("r3")));
Producer<byte[]> producer = client3.newProducer().topic(topic1).create();
PersistentTopic topic = (PersistentTopic) pulsar1.getBrokerService().getOrCreateTopic(topic1).get();
assertNotNull(topic);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java
index 9fe83f7b11d..fa382ef3c5e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java
@@ -23,17 +23,14 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-
-import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-
import org.apache.pulsar.broker.BrokerTestUtil;
import org.apache.pulsar.broker.service.persistent.PersistentDispatcherSingleActiveConsumer;
import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
@@ -123,8 +120,8 @@ public class PersistentFailoverE2ETest extends BrokerTestBase {
private static class ActiveInactiveListenerEvent implements ConsumerEventListener {
- private final Set<Integer> activePtns = Sets.newHashSet();
- private final Set<Integer> inactivePtns = Sets.newHashSet();
+ private final Set<Integer> activePtns = new HashSet<>();
+ private final Set<Integer> inactivePtns = new HashSet<>();
@Override
public synchronized void becameActive(Consumer<?> consumer, int partitionId) {
@@ -171,7 +168,7 @@ public class PersistentFailoverE2ETest extends BrokerTestBase {
assertTrue(subRef.getDispatcher().isConsumerConnected());
assertEquals(subRef.getDispatcher().getType(), SubType.Failover);
- List<CompletableFuture<MessageId>> futures = Lists.newArrayListWithCapacity(numMsgs);
+ List<CompletableFuture<MessageId>> futures = new ArrayList<>(numMsgs);
Producer<byte[]> producer = pulsarClient.newProducer().topic(topicName)
.enableBatching(false)
.messageRoutingMode(MessageRoutingMode.SinglePartition)
@@ -332,7 +329,7 @@ public class PersistentFailoverE2ETest extends BrokerTestBase {
// equal distribution between both consumers
int totalMessages = 0;
Message<byte[]> msg = null;
- Set<Integer> receivedPtns = Sets.newHashSet();
+ Set<Integer> receivedPtns = new HashSet<>();
while (true) {
msg = consumer1.receive(1, TimeUnit.SECONDS);
if (msg == null) {
@@ -349,7 +346,7 @@ public class PersistentFailoverE2ETest extends BrokerTestBase {
Assert.assertEquals(totalMessages, numMsgs / 2);
- receivedPtns = Sets.newHashSet();
+ receivedPtns = new HashSet<>();
while (true) {
msg = consumer2.receive(1, TimeUnit.SECONDS);
if (msg == null) {
@@ -469,7 +466,7 @@ public class PersistentFailoverE2ETest extends BrokerTestBase {
final String topicName = "persistent://prop/use/ns-abc/failover-topic3";
final String subName = "sub1";
final int numMsgs = 100;
- List<Message<byte[]>> receivedMessages = Lists.newArrayList();
+ List<Message<byte[]>> receivedMessages = new ArrayList<>();
ConsumerBuilder<byte[]> consumerBuilder = pulsarClient.newConsumer().topic(topicName).subscriptionName(subName)
.subscriptionType(SubscriptionType.Failover).messageListener((consumer, msg) -> {
@@ -496,7 +493,7 @@ public class PersistentFailoverE2ETest extends BrokerTestBase {
PersistentSubscription subRef = topicRef.getSubscription(subName);
// enqueue messages
- List<CompletableFuture<MessageId>> futures = Lists.newArrayListWithCapacity(numMsgs);
+ List<CompletableFuture<MessageId>> futures = new ArrayList<>(numMsgs);
Producer<byte[]> producer = pulsarClient.newProducer().topic(topicName)
.enableBatching(false)
.messageRoutingMode(MessageRoutingMode.SinglePartition)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java
index 9564449ffcc..6d111a9806e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java
@@ -23,7 +23,7 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -31,7 +31,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-
import org.apache.commons.collections4.CollectionUtils;
import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
@@ -48,8 +47,8 @@ import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.client.impl.ConsumerImpl;
import org.apache.pulsar.common.api.proto.CommandSubscribe.SubType;
import org.apache.pulsar.common.policies.data.ConsumerStats;
-import org.apache.pulsar.common.policies.data.TopicStats;
import org.apache.pulsar.common.policies.data.SubscriptionStats;
+import org.apache.pulsar.common.policies.data.TopicStats;
import org.apache.pulsar.common.util.FutureUtil;
import org.awaitility.Awaitility;
import org.eclipse.jetty.util.BlockingArrayQueue;
@@ -59,8 +58,6 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import com.google.common.collect.Lists;
-
@Test(groups = "broker")
public class PersistentQueueE2ETest extends BrokerTestBase {
@@ -110,7 +107,7 @@ public class PersistentQueueE2ETest extends BrokerTestBase {
assertTrue(subRef.getDispatcher().isConsumerConnected());
assertEquals(subRef.getDispatcher().getType(), SubType.Shared);
- List<CompletableFuture<MessageId>> futures = Lists.newArrayListWithCapacity(numMsgs * 2);
+ List<CompletableFuture<MessageId>> futures = new ArrayList<>(numMsgs * 2);
Producer<byte[]> producer = pulsarClient.newProducer().topic(topicName)
.enableBatching(false)
.messageRoutingMode(MessageRoutingMode.SinglePartition)
@@ -193,7 +190,7 @@ public class PersistentQueueE2ETest extends BrokerTestBase {
final String subName = "sub3";
final int numMsgs = 100;
- final List<String> messagesProduced = Lists.newArrayListWithCapacity(numMsgs);
+ final List<String> messagesProduced = new ArrayList<>(numMsgs);
final List<String> messagesConsumed = new BlockingArrayQueue<>(numMsgs);
Consumer<byte[]> consumer1 = pulsarClient.newConsumer().topic(topicName).subscriptionName(subName)
@@ -213,7 +210,7 @@ public class PersistentQueueE2ETest extends BrokerTestBase {
// do nothing
}).subscribe();
- List<CompletableFuture<MessageId>> futures = Lists.newArrayListWithCapacity(numMsgs * 2);
+ List<CompletableFuture<MessageId>> futures = new ArrayList<>(numMsgs * 2);
Producer<byte[]> producer = pulsarClient.newProducer().topic(topicName).create();
for (int i = 0; i < numMsgs; i++) {
String message = "msg-" + i;
@@ -286,7 +283,7 @@ public class PersistentQueueE2ETest extends BrokerTestBase {
}
}).subscribe();
- List<CompletableFuture<MessageId>> futures = Lists.newArrayListWithCapacity(numMsgs);
+ List<CompletableFuture<MessageId>> futures = new ArrayList<>(numMsgs);
Producer<byte[]> producer = pulsarClient.newProducer().topic(topicName).create();
for (int i = 0; i < numMsgs * 3; i++) {
String message = "msg-" + i;
@@ -302,8 +299,8 @@ public class PersistentQueueE2ETest extends BrokerTestBase {
* i.e. each consumer will get 130 messages. In the 14th round, the balance is 411 - 130*3 = 21. Two consumers
* will get another batch of 10 messages (Total: 140) and the 3rd one will get the last one (Total: 131)
*/
- assertTrue(CollectionUtils.subtract(Lists.newArrayList(140, 140, 131),
- Lists.newArrayList(counter1.get(), counter2.get(), counter3.get())).isEmpty());
+ assertTrue(CollectionUtils.subtract(List.of(140, 140, 131),
+ List.of(counter1.get(), counter2.get(), counter3.get())).isEmpty());
consumer1.close();
consumer2.close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java
index cc987a2ddc0..29a8834b4ba 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicConcurrentTest.java
@@ -24,10 +24,10 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.testng.Assert.assertFalse;
-import com.google.common.collect.Lists;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@@ -108,7 +108,7 @@ public class PersistentTopicConcurrentTest extends MockedBookKeeperTestCase {
doReturn(true).when(nsSvc).isServiceUnitActive(any(TopicName.class));
doReturn(CompletableFuture.completedFuture(true)).when(nsSvc).checkTopicOwnership(any(TopicName.class));
- final List<Position> addedEntries = Lists.newArrayList();
+ final List<Position> addedEntries = new ArrayList<>();
for (int i = 0; i < 100; i++) {
Position pos = ledger.addEntry("entry".getBytes());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
index 2d8ff60fc27..970bfd763a4 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
@@ -44,8 +44,6 @@ import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertSame;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
@@ -777,7 +775,7 @@ public class PersistentTopicTest extends MockedBookKeeperTestCase {
consumer.close();
SubType previousSubType = SubType.Exclusive;
- for (SubType subType : Lists.newArrayList(SubType.Shared, SubType.Failover, SubType.Key_Shared,
+ for (SubType subType : List.of(SubType.Shared, SubType.Failover, SubType.Key_Shared,
SubType.Exclusive)) {
Dispatcher previousDispatcher = sub.getDispatcher();
@@ -1875,7 +1873,7 @@ public class PersistentTopicTest extends MockedBookKeeperTestCase {
PositionImpl position = new PositionImpl(1, 1);
long ledgerId = 0xc0bfefeL;
sub.acknowledgeMessage(Collections.singletonList(position), AckType.Cumulative,
- ImmutableMap.of(Compactor.COMPACTED_TOPIC_LEDGER_PROPERTY, ledgerId));
+ Map.of(Compactor.COMPACTED_TOPIC_LEDGER_PROPERTY, ledgerId));
verify(compactedTopic, Mockito.times(1)).newCompactedLedger(position, ledgerId);
}
@@ -1883,7 +1881,7 @@ public class PersistentTopicTest extends MockedBookKeeperTestCase {
@Test
public void testCompactorSubscriptionUpdatedOnInit() throws Exception {
long ledgerId = 0xc0bfefeL;
- Map<String, Long> properties = ImmutableMap.of(Compactor.COMPACTED_TOPIC_LEDGER_PROPERTY, ledgerId);
+ Map<String, Long> properties = Map.of(Compactor.COMPACTED_TOPIC_LEDGER_PROPERTY, ledgerId);
PositionImpl position = new PositionImpl(1, 1);
doAnswer((invokactionOnMock) -> properties).when(cursorMock).getProperties();
@@ -1935,7 +1933,7 @@ public class PersistentTopicTest extends MockedBookKeeperTestCase {
doReturn(compactPromise).when(compactor).compact(anyString());
ManagedCursor subCursor = mock(ManagedCursor.class);
- doReturn(Lists.newArrayList(subCursor)).when(ledgerMock).getCursors();
+ doReturn(List.of(subCursor)).when(ledgerMock).getCursors();
doReturn(Compactor.COMPACTION_SUBSCRIPTION).when(subCursor).getName();
Policies policies = new Policies();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java
index 25ae0e2f1fd..6de41a548cc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java
@@ -40,10 +40,9 @@ import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.net.BookieId;
import org.apache.bookkeeper.net.NetworkTopologyImpl;
import org.apache.bookkeeper.test.ServerTester;
+import org.apache.pulsar.bookie.rackawareness.BookieRackAffinityMapping;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.common.policies.data.BookieInfo;
-import org.apache.pulsar.bookie.rackawareness.BookieRackAffinityMapping;
-import org.assertj.core.util.Lists;
import org.awaitility.Awaitility;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -132,7 +131,7 @@ public class RackAwareTest extends BkEnsemblesTestBase {
.map(Map::values)
.flatMap(bookieId -> bookieId.stream().map(rackInfo -> rackInfo.get("rack")))
.collect(Collectors.toSet());
- assertTrue(racks.containsAll(Lists.newArrayList("rack-1", "rack-2")));
+ assertTrue(racks.containsAll(List.of("rack-1", "rack-2")));
});
BookKeeper bkc = this.pulsar.getBookKeeperClient();
@@ -284,7 +283,7 @@ public class RackAwareTest extends BkEnsemblesTestBase {
.flatMap(bookieId -> bookieId.stream().map(rackInfo -> rackInfo.get("rack")))
.collect(Collectors.toSet());
assertEquals(racks.size(), 2);
- assertTrue(racks.containsAll(Lists.newArrayList("rack-0", "rack-1")));
+ assertTrue(racks.containsAll(List.of("rack-0", "rack-1")));
});
Awaitility.await().untilAsserted(() -> {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java
index 9b87b06012e..09c7e042f58 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java
@@ -28,6 +28,7 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.scurrilous.circe.checksum.Crc32cIntChecksum;
import io.netty.buffer.ByteBuf;
@@ -51,7 +52,6 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import lombok.Cleanup;
-
import org.apache.bookkeeper.mledger.AsyncCallbacks.DeleteCursorCallback;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.ManagedCursor;
@@ -107,7 +107,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import org.testng.collections.Lists;
/**
* Starts 3 brokers that are in 3 different clusters
@@ -148,7 +147,7 @@ public class ReplicatorTest extends ReplicatorTestBase {
// This test is to verify that the config change on global namespace is successfully applied in broker during
// runtime.
// Run a set of producer tasks to create the topics
- List<Future<Void>> results = Lists.newArrayList();
+ List<Future<Void>> results = new ArrayList<>();
for (int i = 0; i < 10; i++) {
final TopicName dest = TopicName.get(BrokerTestUtil.newUniqueName("persistent://pulsar/ns/topic-" + i));
@@ -526,7 +525,7 @@ public class ReplicatorTest extends ReplicatorTestBase {
assertTrue(consumer3.drained());
// Produce a message not replicated to r2
- producer1.produce(1, producer1.newMessage().replicationClusters(Lists.newArrayList("r1", "r3")));
+ producer1.produce(1, producer1.newMessage().replicationClusters(List.of("r1", "r3")));
consumer1.receive(1);
assertTrue(consumer2.drained());
consumer3.receive(1);
@@ -823,7 +822,7 @@ public class ReplicatorTest extends ReplicatorTestBase {
@Test(timeOut = 60000, priority = -1)
public void testResumptionAfterBacklogRelaxed() throws Exception {
- List<RetentionPolicy> policies = Lists.newArrayList();
+ List<RetentionPolicy> policies = new ArrayList<>();
policies.add(RetentionPolicy.producer_exception);
policies.add(RetentionPolicy.producer_request_hold);
@@ -1098,7 +1097,7 @@ public class ReplicatorTest extends ReplicatorTestBase {
byte[] value = "test".getBytes();
// publish message local only
- TypedMessageBuilder<byte[]> msg = producer1.newMessage().replicationClusters(Lists.newArrayList("r1")).value(value);
+ TypedMessageBuilder<byte[]> msg = producer1.newMessage().replicationClusters(List.of("r1")).value(value);
msg.send();
assertEquals(consumer1.receive().getValue(), value);
@@ -1498,7 +1497,7 @@ public class ReplicatorTest extends ReplicatorTestBase {
assertTrue(topic.getReplicators().containsKey("r2"));
});
- admin1.topics().setReplicationClusters(dest.toString(), Lists.newArrayList("r1"));
+ admin1.topics().setReplicationClusters(dest.toString(), List.of("r1"));
Awaitility.await().untilAsserted(() -> {
Set<String> replicationClusters = admin1.topics().getReplicationClusters(dest.toString(), false);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java
index 7c28f183c99..d9bde8d4d5a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java
@@ -20,14 +20,13 @@ package org.apache.pulsar.broker.service;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
-
+import java.util.List;
import org.apache.pulsar.client.impl.PulsarClientImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import org.testng.collections.Lists;
@Test(groups = "broker")
public class ReplicatorTlsTest extends ReplicatorTestBase {
@@ -50,7 +49,7 @@ public class ReplicatorTlsTest extends ReplicatorTestBase {
@Test
public void testReplicationClient() throws Exception {
log.info("--- Starting ReplicatorTlsTest::testReplicationClient ---");
- for (BrokerService ns : Lists.newArrayList(ns1, ns2, ns3)) {
+ for (BrokerService ns : List.of(ns1, ns2, ns3)) {
ns.getReplicationClients().forEach((cluster, client) -> {
assertTrue(((PulsarClientImpl) client).getConfiguration().isUseTls());
assertEquals(((PulsarClientImpl) client).getConfiguration().getTlsTrustCertsFilePath(),
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
index 78e994568e8..afc4d5a7ef7 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
@@ -37,7 +37,6 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
-import com.google.common.collect.Maps;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandler;
@@ -52,6 +51,7 @@ import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -123,8 +123,8 @@ import org.apache.pulsar.common.protocol.Commands.ChecksumType;
import org.apache.pulsar.common.protocol.PulsarHandler;
import org.apache.pulsar.common.topics.TopicList;
import org.apache.pulsar.common.util.FutureUtil;
-import org.apache.pulsar.common.util.collections.ConcurrentLongHashMap;
import org.apache.pulsar.common.util.GracefulExecutorServicesShutdown;
+import org.apache.pulsar.common.util.collections.ConcurrentLongHashMap;
import org.apache.pulsar.common.util.netty.EventLoopUtil;
import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
import org.apache.pulsar.metadata.impl.ZKMetadataStore;
@@ -1422,17 +1422,17 @@ public class ServerCnxTest {
// Set encryption_required to true
Policies policies = mock(Policies.class);
policies.encryption_required = true;
- policies.topicDispatchRate = Maps.newHashMap();
- policies.clusterSubscribeRate = Maps.newHashMap();
+ policies.topicDispatchRate = new HashMap<>();
+ policies.clusterSubscribeRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.persistent.DispatchRateLimiter.getPoliciesDispatchRate`
- policies.clusterDispatchRate = Maps.newHashMap();
+ policies.clusterDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceSubscriptionDispatchRate`
- policies.subscriptionDispatchRate = Maps.newHashMap();
+ policies.subscriptionDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceReplicatorDispatchRate`
- policies.replicatorDispatchRate = Maps.newHashMap();
+ policies.replicatorDispatchRate = new HashMap<>();
doReturn(CompletableFuture.completedFuture(Optional.of(policies))).when(namespaceResources)
.getPoliciesAsync(TopicName.get(encryptionRequiredTopicName).getNamespaceObject());
@@ -1458,17 +1458,17 @@ public class ServerCnxTest {
// Set encryption_required to true
Policies policies = mock(Policies.class);
policies.encryption_required = true;
- policies.topicDispatchRate = Maps.newHashMap();
- policies.clusterSubscribeRate = Maps.newHashMap();
+ policies.topicDispatchRate = new HashMap<>();
+ policies.clusterSubscribeRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.persistent.DispatchRateLimiter.getPoliciesDispatchRate`
- policies.clusterDispatchRate = Maps.newHashMap();
+ policies.clusterDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceSubscriptionDispatchRate`
- policies.subscriptionDispatchRate = Maps.newHashMap();
+ policies.subscriptionDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceReplicatorDispatchRate`
- policies.replicatorDispatchRate = Maps.newHashMap();
+ policies.replicatorDispatchRate = new HashMap<>();
doReturn(CompletableFuture.completedFuture(Optional.of(policies))).when(namespaceResources)
.getPoliciesAsync(TopicName.get(encryptionRequiredTopicName).getNamespaceObject());
@@ -1499,16 +1499,16 @@ public class ServerCnxTest {
Policies policies = mock(Policies.class);
// Namespace policy doesn't require encryption
policies.encryption_required = false;
- policies.topicDispatchRate = Maps.newHashMap();
- policies.clusterSubscribeRate = Maps.newHashMap();
+ policies.topicDispatchRate = new HashMap<>();
+ policies.clusterSubscribeRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
- policies.clusterDispatchRate = Maps.newHashMap();
+ policies.clusterDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceSubscriptionDispatchRate`
- policies.subscriptionDispatchRate = Maps.newHashMap();
+ policies.subscriptionDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceReplicatorDispatchRate`
- policies.replicatorDispatchRate = Maps.newHashMap();
+ policies.replicatorDispatchRate = new HashMap<>();
doReturn(CompletableFuture.completedFuture(Optional.of(policies))).when(namespaceResources)
.getPoliciesAsync(TopicName.get(encryptionRequiredTopicName).getNamespaceObject());
@@ -1536,17 +1536,17 @@ public class ServerCnxTest {
// Set encryption_required to true
Policies policies = mock(Policies.class);
policies.encryption_required = true;
- policies.topicDispatchRate = Maps.newHashMap();
- policies.clusterSubscribeRate = Maps.newHashMap();
+ policies.topicDispatchRate = new HashMap<>();
+ policies.clusterSubscribeRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.persistent.DispatchRateLimiter.getPoliciesDispatchRate`
- policies.clusterDispatchRate = Maps.newHashMap();
+ policies.clusterDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceSubscriptionDispatchRate`
- policies.subscriptionDispatchRate = Maps.newHashMap();
+ policies.subscriptionDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceReplicatorDispatchRate`
- policies.replicatorDispatchRate = Maps.newHashMap();
+ policies.replicatorDispatchRate = new HashMap<>();
doReturn(CompletableFuture.completedFuture(Optional.of(policies))).when(namespaceResources)
.getPoliciesAsync(TopicName.get(encryptionRequiredTopicName).getNamespaceObject());
@@ -1580,17 +1580,17 @@ public class ServerCnxTest {
// Set encryption_required to true
Policies policies = mock(Policies.class);
policies.encryption_required = true;
- policies.topicDispatchRate = Maps.newHashMap();
- policies.clusterSubscribeRate = Maps.newHashMap();
+ policies.topicDispatchRate = new HashMap<>();
+ policies.clusterSubscribeRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.persistent.DispatchRateLimiter.getPoliciesDispatchRate`
- policies.clusterDispatchRate = Maps.newHashMap();
+ policies.clusterDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceSubscriptionDispatchRate`
- policies.subscriptionDispatchRate = Maps.newHashMap();
+ policies.subscriptionDispatchRate = new HashMap<>();
// add `clusterDispatchRate` otherwise there will be a NPE
// `org.apache.pulsar.broker.service.AbstractTopic.updateNamespaceReplicatorDispatchRate`
- policies.replicatorDispatchRate = Maps.newHashMap();
+ policies.replicatorDispatchRate = new HashMap<>();
doReturn(CompletableFuture.completedFuture(Optional.of(policies))).when(namespaceResources)
.getPoliciesAsync(TopicName.get(encryptionRequiredTopicName).getNamespaceObject());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java
index 66e6c7d1ff9..0e73db5291e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java
@@ -24,7 +24,6 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -367,7 +366,7 @@ public class SubscriptionSeekTest extends BrokerTestBase {
messageIds.add(msgId);
}
- List<PulsarAdminException> exceptions = Lists.newLinkedList();
+ List<PulsarAdminException> exceptions = new ArrayList<>();
class ResetCursorThread extends Thread {
public void run() {
try {
@@ -378,7 +377,7 @@ public class SubscriptionSeekTest extends BrokerTestBase {
}
}
- List<ResetCursorThread> resetCursorThreads = Lists.newLinkedList();
+ List<ResetCursorThread> resetCursorThreads = new ArrayList<>();
for (int i = 0; i < 4; i ++) {
ResetCursorThread thread = new ResetCursorThread();
resetCursorThreads.add(thread);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesServiceTest.java
index 6334eb3a74f..d33d5341e0b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesServiceTest.java
@@ -26,11 +26,12 @@ import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.assertTrue;
-import com.google.common.collect.Sets;
import java.lang.reflect.Field;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -281,7 +282,7 @@ public class SystemTopicBasedTopicPoliciesServiceTest extends MockedPulsarServic
private void prepareData() throws PulsarAdminException {
admin.clusters().createCluster("test", ClusterData.builder().serviceUrl(brokerUrl.toString()).build());
admin.tenants().createTenant("system-topic",
- new TenantInfoImpl(Sets.newHashSet(), Sets.newHashSet("test")));
+ new TenantInfoImpl(new HashSet<>(), Set.of("test")));
admin.namespaces().createNamespace(NAMESPACE1);
admin.namespaces().createNamespace(NAMESPACE2);
admin.namespaces().createNamespace(NAMESPACE3);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryControllerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryControllerTest.java
index 3cd6fc23de7..10b1e4961cc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryControllerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryControllerTest.java
@@ -24,8 +24,6 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
-
-import com.google.common.collect.Sets;
import java.lang.reflect.Field;
import java.util.Set;
import java.util.TreeSet;
@@ -165,18 +163,18 @@ public class MessageRedeliveryControllerTest {
controller.add(2, 1, 104);
if (allowOutOfOrderDelivery) {
- assertFalse(controller.containsStickyKeyHashes(Sets.newHashSet(100)));
- assertFalse(controller.containsStickyKeyHashes(Sets.newHashSet(101, 102, 103)));
- assertFalse(controller.containsStickyKeyHashes(Sets.newHashSet(104, 105)));
+ assertFalse(controller.containsStickyKeyHashes(Set.of(100)));
+ assertFalse(controller.containsStickyKeyHashes(Set.of(101, 102, 103)));
+ assertFalse(controller.containsStickyKeyHashes(Set.of(104, 105)));
} else {
- assertTrue(controller.containsStickyKeyHashes(Sets.newHashSet(100)));
- assertTrue(controller.containsStickyKeyHashes(Sets.newHashSet(101, 102, 103)));
- assertTrue(controller.containsStickyKeyHashes(Sets.newHashSet(104, 105)));
+ assertTrue(controller.containsStickyKeyHashes(Set.of(100)));
+ assertTrue(controller.containsStickyKeyHashes(Set.of(101, 102, 103)));
+ assertTrue(controller.containsStickyKeyHashes(Set.of(104, 105)));
}
- assertFalse(controller.containsStickyKeyHashes(Sets.newHashSet()));
- assertFalse(controller.containsStickyKeyHashes(Sets.newHashSet(99)));
- assertFalse(controller.containsStickyKeyHashes(Sets.newHashSet(105, 106)));
+ assertFalse(controller.containsStickyKeyHashes(Set.of()));
+ assertFalse(controller.containsStickyKeyHashes(Set.of(99)));
+ assertFalse(controller.containsStickyKeyHashes(Set.of(105, 106)));
}
@Test(dataProvider = "allowOutOfOrderDelivery", timeOut = 10000)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/FilterEntryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/FilterEntryTest.java
index c10ab392da0..bd8017390d8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/FilterEntryTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/plugin/FilterEntryTest.java
@@ -28,10 +28,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import java.lang.reflect.Field;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
@@ -93,7 +92,7 @@ public class FilterEntryTest extends BrokerTestBase {
EntryFilterWithClassLoader mockFilter = mock(EntryFilterWithClassLoader.class);
when(mockFilter.filterEntry(any(Entry.class), any(FilterContext.class))).thenReturn(
EntryFilter.FilterResult.REJECT);
- ImmutableMap<String, EntryFilterWithClassLoader> entryFilters = ImmutableMap.of("key", mockFilter);
+ Map<String, EntryFilterWithClassLoader> entryFilters = Map.of("key", mockFilter);
Field field = topicRef.getClass().getSuperclass().getDeclaredField("entryFilters");
field.setAccessible(true);
@@ -102,7 +101,7 @@ public class FilterEntryTest extends BrokerTestBase {
EntryFilterWithClassLoader mockFilter1 = mock(EntryFilterWithClassLoader.class);
when(mockFilter1.filterEntry(any(Entry.class), any(FilterContext.class))).thenReturn(
EntryFilter.FilterResult.ACCEPT);
- ImmutableMap<String, EntryFilterWithClassLoader> entryFilters1 = ImmutableMap.of("key2", mockFilter1);
+ Map<String, EntryFilterWithClassLoader> entryFilters1 = Map.of("key2", mockFilter1);
Field field2 = pulsar.getBrokerService().getClass().getDeclaredField("entryFilters");
field2.setAccessible(true);
field2.set(pulsar.getBrokerService(), entryFilters1);
@@ -168,7 +167,7 @@ public class FilterEntryTest extends BrokerTestBase {
EntryFilterWithClassLoader loader1 = spyWithClassAndConstructorArgsRecordingInvocations(EntryFilterWithClassLoader.class, filter1, narClassLoader);
EntryFilter filter2 = new EntryFilter2Test();
EntryFilterWithClassLoader loader2 = spyWithClassAndConstructorArgsRecordingInvocations(EntryFilterWithClassLoader.class, filter2, narClassLoader);
- field.set(dispatcher, ImmutableList.of(loader1, loader2));
+ field.set(dispatcher, List.of(loader1, loader2));
Producer<String> producer = pulsarClient.newProducer(Schema.STRING)
.enableBatching(false).topic(topic).create();
@@ -263,7 +262,7 @@ public class FilterEntryTest extends BrokerTestBase {
.getTopicReference(topic).get();
Field field1 = topicRef.getClass().getSuperclass().getDeclaredField("entryFilters");
field1.setAccessible(true);
- field1.set(topicRef, ImmutableMap.of("1", loader1, "2", loader2));
+ field1.set(topicRef, Map.of("1", loader1, "2", loader2));
cleanup();
verify(loader1, times(1)).close();
@@ -293,7 +292,7 @@ public class FilterEntryTest extends BrokerTestBase {
EntryFilterWithClassLoader loader1 = spyWithClassAndConstructorArgs(EntryFilterWithClassLoader.class, filter1, narClassLoader);
EntryFilter filter2 = new EntryFilter2Test();
EntryFilterWithClassLoader loader2 = spyWithClassAndConstructorArgs(EntryFilterWithClassLoader.class, filter2, narClassLoader);
- field.set(dispatcher, ImmutableList.of(loader1, loader2));
+ field.set(dispatcher, List.of(loader1, loader2));
for (int i = 0; i < 10; i++) {
producer.send("test");
@@ -368,7 +367,7 @@ public class FilterEntryTest extends BrokerTestBase {
EntryFilter filter2 = new EntryFilterTest();
EntryFilterWithClassLoader loader2 =
spyWithClassAndConstructorArgs(EntryFilterWithClassLoader.class, filter2, narClassLoader);
- field.set(dispatcher, ImmutableList.of(loader1, loader2));
+ field.set(dispatcher, List.of(loader1, loader2));
for (int i = 0; i < numMessages; i++) {
if (i % 2 == 0) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java
index 78cb9af48cb..a2e3bed7bbf 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java
@@ -18,13 +18,14 @@
*/
package org.apache.pulsar.broker.service.schema;
-import com.google.common.collect.Maps;
+import java.util.HashMap;
+import java.util.Map;
import lombok.Data;
import org.apache.pulsar.client.api.schema.SchemaDefinition;
import org.apache.pulsar.client.impl.schema.AvroSchema;
import org.apache.pulsar.client.impl.schema.JSONSchema;
-import org.apache.pulsar.client.impl.schema.StringSchema;
import org.apache.pulsar.client.impl.schema.KeyValueSchemaImpl;
+import org.apache.pulsar.client.impl.schema.StringSchema;
import org.apache.pulsar.common.policies.data.SchemaCompatibilityStrategy;
import org.apache.pulsar.common.protocol.schema.SchemaData;
import org.apache.pulsar.common.schema.SchemaType;
@@ -32,12 +33,10 @@ import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.util.Map;
-
@Test(groups = "broker")
public class KeyValueSchemaCompatibilityCheckTest {
- private final Map<SchemaType, SchemaCompatibilityCheck> checkers = Maps.newHashMap();
+ private final Map<SchemaType, SchemaCompatibilityCheck> checkers = new HashMap<>();
@Data
private static class Foo {
@@ -63,7 +62,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueAvroCompatibilityFull() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -77,7 +76,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueAvroInCompatibilityFull() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -91,7 +90,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueAvroCompatibilityBackward() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -105,7 +104,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueAvroInCompatibilityBackward() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -119,7 +118,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueAvroCompatibilityForward() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -133,7 +132,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueAvroInCompatibilityForward() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -147,7 +146,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueJsonCompatibilityFull() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -161,7 +160,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueJsonInCompatibilityFull() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -175,7 +174,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueJsonCompatibilityBackward() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -189,7 +188,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueJsonInCompatibilityBackWard() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -203,7 +202,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueJsonCompatibilityForward() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -217,7 +216,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyValueJsonInCompatibilityForward() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -231,7 +230,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyAvroValueJsonCompatibilityFull() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -245,7 +244,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyAvroValueJsonInCompatibilityFull() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -259,7 +258,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyAvroValueJsonCompatibilityBackward() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -273,7 +272,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyAvroValueJsonInCompatibilityBackward() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -287,7 +286,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyAvroValueJsonCompatibilityForward() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -301,7 +300,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyAvroValueJsonInCompatibilityForward() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
JSONSchema<Bar> barSchema = JSONSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
properties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -315,7 +314,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyJsonValueAvroCompatibilityFull() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -329,7 +328,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyJsonValueAvroInCompatibilityFull() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -343,7 +342,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyJsonValueAvroCompatibilityBackward() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -357,7 +356,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyJsonValueAvroInCompatibilityBackward() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -372,7 +371,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyJsonValueAvroCompatibilityForward() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -386,7 +385,7 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyJsonValueAvroInCompatibilityForward() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = new HashMap<>();
properties.put("key.schema.type", String.valueOf(SchemaType.JSON));
properties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -400,10 +399,10 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyJsonValueAvroKeyTypeInCompatibility() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> fromProperties = Maps.newHashMap();
+ Map<String, String> fromProperties = new HashMap<>();
fromProperties.put("key.schema.type", String.valueOf(SchemaType.JSON));
fromProperties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
- Map<String, String> toProperties = Maps.newHashMap();
+ Map<String, String> toProperties = new HashMap<>();
toProperties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
toProperties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -417,10 +416,10 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckKeyJsonValueAvroValueTypeInCompatibility() {
JSONSchema<Foo> fooSchema = JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> fromProperties = Maps.newHashMap();
+ Map<String, String> fromProperties = new HashMap<>();
fromProperties.put("key.schema.type", String.valueOf(SchemaType.JSON));
fromProperties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
- Map<String, String> toProperties = Maps.newHashMap();
+ Map<String, String> toProperties = new HashMap<>();
toProperties.put("key.schema.type", String.valueOf(SchemaType.JSON));
toProperties.put("value.schema.type", String.valueOf(SchemaType.JSON));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -434,10 +433,10 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckPropertiesNullTypeCompatibility() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> fromProperties = Maps.newHashMap();
+ Map<String, String> fromProperties = new HashMap<>();
fromProperties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
fromProperties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
- Map<String, String> toProperties = Maps.newHashMap();
+ Map<String, String> toProperties = new HashMap<>();
toProperties.put("key.schema.type", String.valueOf(SchemaType.AVRO));
toProperties.put("value.schema.type", String.valueOf(SchemaType.AVRO));
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
@@ -451,8 +450,8 @@ public class KeyValueSchemaCompatibilityCheckTest {
public void testCheckSchemaTypeNullCompatibility() {
AvroSchema<Foo> fooSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
AvroSchema<Bar> barSchema = AvroSchema.of(SchemaDefinition.<Bar>builder().withPojo(Bar.class).build());
- Map<String, String> fromProperties = Maps.newHashMap();
- Map<String, String> toProperties = Maps.newHashMap();
+ Map<String, String> fromProperties = new HashMap<>();
+ Map<String, String> toProperties = new HashMap<>();
SchemaData fromSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
.data(KeyValueSchemaImpl.of(fooSchema, barSchema).getSchemaInfo().getSchema()).props(fromProperties).build();
SchemaData toSchemaData = SchemaData.builder().type(SchemaType.KEY_VALUE)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java
index 52a684bbf27..0a63e7a2b3e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java
@@ -18,9 +18,28 @@
*/
package org.apache.pulsar.broker.service.streamingdispatch;
-import com.google.common.base.Charsets;
+import static org.awaitility.Awaitility.await;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.bookkeeper.common.util.OrderedExecutor;
import org.apache.bookkeeper.common.util.OrderedScheduler;
import org.apache.bookkeeper.mledger.AsyncCallbacks;
@@ -40,34 +59,13 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.testng.annotations.Test;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.awaitility.Awaitility.await;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
-
/**
* Tests for {@link StreamingEntryReader}
*/
@Test(groups = "flaky")
public class StreamingEntryReaderTests extends MockedBookKeeperTestCase {
- private static final Charset Encoding = Charsets.UTF_8;
+ private static final Charset Encoding = StandardCharsets.UTF_8;
private PersistentTopic mockTopic;
private StreamingDispatcher mockDispatcher;
private BrokerService mockBrokerService;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ConsumerStatsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ConsumerStatsTest.java
index 801a55ad419..7eb96e2bd58 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ConsumerStatsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ConsumerStatsTest.java
@@ -25,7 +25,6 @@ import static org.testng.Assert.assertNotEquals;
import static org.testng.AssertJUnit.assertEquals;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import java.io.ByteArrayOutputStream;
@@ -409,7 +408,7 @@ public class ConsumerStatsTest extends ProducerConsumerBase {
EntryFilterWithClassLoader
loader = spyWithClassAndConstructorArgs(EntryFilterWithClassLoader.class, filter,
narClassLoader);
- ImmutableMap<String, EntryFilterWithClassLoader> entryFilters = ImmutableMap.of("filter", loader);
+ Map<String, EntryFilterWithClassLoader> entryFilters = Map.of("filter", loader);
PersistentTopic topicRef = (PersistentTopic) pulsar.getBrokerService()
.getTopicReference(topic).get();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/SubscriptionStatsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/SubscriptionStatsTest.java
index b1b865727a0..67c60585d2f 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/SubscriptionStatsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/SubscriptionStatsTest.java
@@ -20,21 +20,29 @@ package org.apache.pulsar.broker.stats;
import static org.apache.pulsar.broker.BrokerTestUtil.spyWithClassAndConstructorArgs;
import static org.mockito.Mockito.mock;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimap;
import java.io.ByteArrayOutputStream;
import java.lang.reflect.Field;
import java.util.Collection;
+import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.service.Dispatcher;
import org.apache.pulsar.broker.service.EntryFilterSupport;
-import org.apache.pulsar.broker.service.plugin.*;
+import org.apache.pulsar.broker.service.plugin.EntryFilter;
+import org.apache.pulsar.broker.service.plugin.EntryFilterTest;
+import org.apache.pulsar.broker.service.plugin.EntryFilterWithClassLoader;
import org.apache.pulsar.broker.stats.prometheus.PrometheusMetricsGenerator;
import org.apache.pulsar.client.admin.PulsarAdminException;
-import org.apache.pulsar.client.api.*;
+import org.apache.pulsar.client.api.Consumer;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.ProducerConsumerBase;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.nar.NarClassLoader;
import org.apache.pulsar.common.policies.data.SubscriptionStats;
@@ -187,7 +195,7 @@ public class SubscriptionStatsTest extends ProducerConsumerBase {
EntryFilter filter1 = new EntryFilterTest();
EntryFilterWithClassLoader loader1 =
spyWithClassAndConstructorArgs(EntryFilterWithClassLoader.class, filter1, narClassLoader);
- field.set(dispatcher, ImmutableList.of(loader1));
+ field.set(dispatcher, List.of(loader1));
}
for (int i = 0; i < 100; i++) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorClientTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorClientTest.java
index a277e91f13a..7421a1b69f9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorClientTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/coordinator/TransactionCoordinatorClientTest.java
@@ -20,8 +20,8 @@ package org.apache.pulsar.broker.transaction.coordinator;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
-import com.google.common.collect.Lists;
import java.lang.reflect.Field;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import org.apache.pulsar.broker.PulsarService;
@@ -83,7 +83,7 @@ public class TransactionCoordinatorClientTest extends TransactionMetaStoreTestBa
@Test
public void testCommitAndAbort() throws TransactionCoordinatorClientException {
TxnID txnID = transactionCoordinatorClient.newTransaction();
- transactionCoordinatorClient.addPublishPartitionToTxn(txnID, Lists.newArrayList("persistent://public/default/testCommitAndAbort"));
+ transactionCoordinatorClient.addPublishPartitionToTxn(txnID, List.of("persistent://public/default/testCommitAndAbort"));
transactionCoordinatorClient.commit(txnID);
try {
transactionCoordinatorClient.abort(txnID);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ExceptionHandlerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ExceptionHandlerTest.java
index ed708695dc1..35d6ac0ce9b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ExceptionHandlerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/ExceptionHandlerTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.pulsar.broker.web;
+import static org.eclipse.jetty.http.HttpStatus.INTERNAL_SERVER_ERROR_500;
+import static org.eclipse.jetty.http.HttpStatus.PRECONDITION_FAILED_412;
+import javax.servlet.http.HttpServletResponse;
import lombok.SneakyThrows;
import org.apache.pulsar.common.intercept.InterceptException;
import org.eclipse.jetty.server.HttpChannel;
@@ -25,11 +28,6 @@ import org.eclipse.jetty.server.Response;
import org.mockito.Mockito;
import org.testng.annotations.Test;
-import javax.servlet.http.HttpServletResponse;
-
-import static org.eclipse.jetty.http.HttpStatus.INTERNAL_SERVER_ERROR_500;
-import static org.eclipse.jetty.http.HttpStatus.PRECONDITION_FAILED_412;
-
/**
* Unit test for ExceptionHandler.
*/
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/PulsarWebResourceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/PulsarWebResourceTest.java
index 18e3e961370..06f80afda95 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/PulsarWebResourceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/PulsarWebResourceTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.pulsar.broker.web;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import javax.servlet.ServletContext;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Feature;
@@ -36,9 +38,6 @@ import org.glassfish.jersey.test.spi.TestContainerFactory;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-
/**
* A base class for testing subclasses of {@link PulsarWebResource}.
*/
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java
index c1938adfc5f..8e6df74d5a0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java
@@ -19,7 +19,6 @@
package org.apache.pulsar.broker.web;
import static org.testng.Assert.assertEquals;
-
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response.Status;
import org.apache.pulsar.common.policies.data.ErrorData;
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
index 42c29fd7ab6..2f623bfdf1c 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
@@ -25,7 +25,6 @@ import static org.apache.bookkeeper.mledger.ManagedCursor.FindPositionConstraint
import static org.apache.pulsar.sql.presto.PulsarConnectorUtils.restoreNamespaceDelimiterIfNeeded;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Predicate;
import io.airlift.log.Logger;
import io.trino.spi.TrinoException;
import io.trino.spi.block.Block;
@@ -48,7 +47,6 @@ import java.util.LinkedList;
import java.util.List;
import javax.inject.Inject;
import lombok.Data;
-import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.ManagedLedgerConfig;
import org.apache.bookkeeper.mledger.ManagedLedgerException;
import org.apache.bookkeeper.mledger.ManagedLedgerFactory;
@@ -442,19 +440,18 @@ public class PulsarSplitManager implements ConnectorSplitManager {
private static PositionImpl findPosition(ReadOnlyCursor readOnlyCursor, long timestamp) throws
ManagedLedgerException,
InterruptedException {
- return (PositionImpl) readOnlyCursor.findNewestMatching(SearchAllAvailableEntries, new Predicate<Entry>() {
- @Override
- public boolean apply(Entry entry) {
- try {
- long entryTimestamp = Commands.getEntryTimestamp(entry.getDataBuffer());
- return entryTimestamp <= timestamp;
- } catch (Exception e) {
- log.error(e, "Failed To deserialize message when finding position with error: %s", e);
- } finally {
- entry.release();
- }
- return false;
- }
- });
+ return (PositionImpl) readOnlyCursor.findNewestMatching(
+ SearchAllAvailableEntries,
+ entry -> {
+ try {
+ long entryTimestamp = Commands.getEntryTimestamp(entry.getDataBuffer());
+ return entryTimestamp <= timestamp;
+ } catch (Exception e) {
+ log.error(e, "Failed To deserialize message when finding position with error: %s", e);
+ } finally {
+ entry.release();
+ }
+ return false;
+ });
}
}
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
index ad1c0f4b03d..3668921138a 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
@@ -18,6 +18,17 @@
*/
package org.apache.pulsar.sql.presto;
+import static org.apache.pulsar.common.protocol.Commands.serializeMetadataAndPayload;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertNotNull;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.airlift.log.Logger;
import io.netty.buffer.ByteBuf;
@@ -26,6 +37,21 @@ import io.trino.spi.connector.ConnectorContext;
import io.trino.spi.predicate.TupleDomain;
import io.trino.testing.TestingConnectorContext;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import javax.ws.rs.ClientErrorException;
+import javax.ws.rs.core.Response;
import org.apache.bookkeeper.mledger.AsyncCallbacks;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.ManagedLedgerConfig;
@@ -62,33 +88,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
-import javax.ws.rs.ClientErrorException;
-import javax.ws.rs.core.Response;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static org.apache.pulsar.common.protocol.Commands.serializeMetadataAndPayload;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertNotNull;
-
public abstract class TestPulsarConnector {
protected static final long currentTimeMicros = 1534806330000000L;
@@ -664,8 +663,8 @@ public abstract class TestPulsarConnector {
@Override
public Position answer(InvocationOnMock invocationOnMock) throws Throwable {
Object[] args = invocationOnMock.getArguments();
- com.google.common.base.Predicate<Entry> predicate
- = (com.google.common.base.Predicate<Entry>) args[1];
+ Predicate<Entry> predicate
+ = (Predicate<Entry>) args[1];
String schemaName = TopicName.get(
TopicName.get(
@@ -676,7 +675,7 @@ public abstract class TestPulsarConnector {
Integer target = null;
for (int i=entries.size() - 1; i >= 0; i--) {
Entry entry = entries.get(i);
- if (predicate.apply(entry)) {
+ if (predicate.test(entry)) {
target = i;
break;
}