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 2025/05/05 14:04:27 UTC
(pulsar) branch branch-3.3 updated (4911d31e9ad -> 7f977d7cd0e)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from 4911d31e9ad [improve][io] support kafka connect transforms and predicates (#24221)
new de825d0efb6 [fix][test] Fix resource leaks in PulsarBrokerStarterTest (#24235)
new 8c1e96e65af [improve][build] Upgrade Lombok to 1.18.38 to support JDK 24 (#24237)
new fe164aac3a1 [fix][cli] Refactor scripts to detect major Java version and pass correct add-opens parameters (#22927)
new 04a53aa6274 [improve] Adapt startup scripts for Java 24 changes (#24236)
new 194f6e80034 [improve][build] Upgrade to jacoco 0.8.13 (#24240)
new b94967f7301 [improve][misc] Migrate from multiple nullness annotation libraries to JSpecify annotations (#24239)
new 7f977d7cd0e [improve][build] Upgrade SpotBugs to 4.9.x (#24243)
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bin/bookkeeper | 47 +++++++++++----
bin/function-localrunner | 58 +++++++++++++------
bin/pulsar | 63 ++++++++++++++-------
bin/pulsar-admin-common.cmd | 52 +++++++++++------
bin/pulsar-admin-common.sh | 37 ++++++++++--
bin/pulsar-admin.cmd | 5 +-
bin/pulsar-client.cmd | 5 +-
bin/pulsar-perf | 22 ++++++--
bin/pulsar-perf.cmd | 66 +++-------------------
bin/pulsar-shell.cmd | 6 +-
.../src/main/resources/pulsar/checkstyle.xml | 16 ++++++
conf/bkenv.sh | 2 +-
conf/pulsar_env.sh | 2 +-
distribution/server/src/assemble/LICENSE.bin.txt | 2 +
distribution/shell/src/assemble/LICENSE.bin.txt | 1 +
.../bookkeeper/mledger/impl/ManagedCursorImpl.java | 2 +-
.../bookkeeper/mledger/impl/ManagedLedgerImpl.java | 2 +-
pom.xml | 34 +++++++----
.../oidc/OpenIDProviderMetadataCache.java | 6 +-
pulsar-broker/pom.xml | 4 ++
.../pulsar/broker/admin/impl/NamespacesBase.java | 6 +-
.../broker/admin/impl/PersistentTopicsBase.java | 4 +-
.../pulsar/broker/admin/v3/Transactions.java | 2 +-
.../bucket/BookkeeperBucketSnapshotStorage.java | 4 +-
.../broker/namespace/NamespaceEphemeralData.java | 4 +-
.../pulsar/broker/namespace/NamespaceService.java | 2 +-
.../broker/service/AbstractBaseDispatcher.java | 2 +-
.../pulsar/broker/service/AbstractTopic.java | 4 +-
.../pulsar/broker/service/BrokerService.java | 12 ++--
.../pulsar/broker/service/EntryAndMetadata.java | 2 +-
.../SystemTopicBasedTopicPoliciesService.java | 17 +++---
.../persistent/PersistentMessageExpiryMonitor.java | 2 +-
.../broker/service/persistent/PersistentTopic.java | 6 +-
.../broker/service/persistent/SystemTopic.java | 4 +-
.../service/schema/BookkeeperSchemaStorage.java | 34 +++++------
.../schema/BookkeeperSchemaStorageFactory.java | 4 +-
.../service/schema/SchemaRegistryServiceImpl.java | 8 +--
.../service/schema/SchemaStorageFactory.java | 4 +-
.../pulsar/broker/web/PulsarWebResource.java | 4 +-
.../pulsar/compaction/CompactedTopicImpl.java | 2 +-
.../pulsar/compaction/CompactedTopicUtils.java | 2 +-
.../compaction/CompactionServiceFactory.java | 6 +-
.../compaction/PulsarCompactionServiceFactory.java | 8 +--
.../compaction/PulsarTopicCompactionService.java | 4 +-
.../pulsar/compaction/TopicCompactionService.java | 4 +-
.../org/apache/pulsar/PulsarBrokerStarterTest.java | 5 ++
.../pulsar/broker/MultiBrokerTestZKBaseTest.java | 4 +-
.../ManagedLedgerInterceptorImplTest.java | 3 +-
.../broker/testcontext/PulsarTestContext.java | 4 +-
.../MultiBrokerMetadataConsistencyTest.java | 4 +-
.../pulsar/compaction/CompactedTopicImplTest.java | 4 +-
pulsar-client/pom.xml | 5 ++
.../client/impl/ControlledClusterFailover.java | 2 +-
.../client/impl/MultiTopicsConsumerImpl.java | 2 +-
.../PersistentAcknowledgmentsGroupingTracker.java | 2 +-
.../pulsar/client/impl/PulsarClientImpl.java | 2 +-
pulsar-common/pom.xml | 5 ++
.../data/stats/NonPersistentTopicStatsImpl.java | 2 -
.../org/apache/pulsar/common/util/FutureUtil.java | 4 +-
.../pulsar/common/util/URIPreconditions.java | 16 +++---
.../collections/GrowableArrayBlockingQueue.java | 2 +-
.../instance/JavaInstanceRunnableTest.java | 4 +-
.../functions/instance/JavaInstanceDepsTest.java | 1 +
.../pulsar/io/azuredataexplorer/ADXSink.java | 8 +--
.../io/azuredataexplorer/ADXSinkConfigTest.java | 6 +-
pulsar-io/core/pom.xml | 4 ++
.../server/ProxyWithExtensibleLoadManagerTest.java | 4 +-
src/pulsar-io-gen.sh | 5 ++
68 files changed, 413 insertions(+), 268 deletions(-)
(pulsar) 06/07: [improve][misc] Migrate from multiple nullness annotation libraries to JSpecify annotations (#24239)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit b94967f7301949c976bf725b168434a2b99c6e74
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Sat May 3 14:47:06 2025 +0300
[improve][misc] Migrate from multiple nullness annotation libraries to JSpecify annotations (#24239)
(cherry picked from commit 9a1124516ed46cf59cba39ffa7b12a0caf7b9d80)
---
.../src/main/resources/pulsar/checkstyle.xml | 16 ++++++++++
distribution/server/src/assemble/LICENSE.bin.txt | 2 ++
distribution/shell/src/assemble/LICENSE.bin.txt | 1 +
.../bookkeeper/mledger/impl/ManagedCursorImpl.java | 2 +-
.../bookkeeper/mledger/impl/ManagedLedgerImpl.java | 2 +-
pom.xml | 5 ++++
.../oidc/OpenIDProviderMetadataCache.java | 6 ++--
pulsar-broker/pom.xml | 4 +++
.../pulsar/broker/admin/impl/NamespacesBase.java | 6 ++--
.../broker/admin/impl/PersistentTopicsBase.java | 4 +--
.../pulsar/broker/admin/v3/Transactions.java | 2 +-
.../bucket/BookkeeperBucketSnapshotStorage.java | 4 +--
.../broker/namespace/NamespaceEphemeralData.java | 4 +--
.../pulsar/broker/namespace/NamespaceService.java | 2 +-
.../broker/service/AbstractBaseDispatcher.java | 2 +-
.../pulsar/broker/service/AbstractTopic.java | 4 +--
.../pulsar/broker/service/BrokerService.java | 12 ++++----
.../pulsar/broker/service/EntryAndMetadata.java | 2 +-
.../SystemTopicBasedTopicPoliciesService.java | 17 +++++------
.../persistent/PersistentMessageExpiryMonitor.java | 2 +-
.../broker/service/persistent/PersistentTopic.java | 6 ++--
.../broker/service/persistent/SystemTopic.java | 4 +--
.../service/schema/BookkeeperSchemaStorage.java | 34 +++++++++++-----------
.../schema/BookkeeperSchemaStorageFactory.java | 4 +--
.../service/schema/SchemaRegistryServiceImpl.java | 8 ++---
.../service/schema/SchemaStorageFactory.java | 4 +--
.../pulsar/broker/web/PulsarWebResource.java | 4 +--
.../pulsar/compaction/CompactedTopicImpl.java | 2 +-
.../pulsar/compaction/CompactedTopicUtils.java | 2 +-
.../compaction/CompactionServiceFactory.java | 6 ++--
.../compaction/PulsarCompactionServiceFactory.java | 8 ++---
.../compaction/PulsarTopicCompactionService.java | 4 +--
.../pulsar/compaction/TopicCompactionService.java | 4 +--
.../pulsar/broker/MultiBrokerTestZKBaseTest.java | 4 +--
.../ManagedLedgerInterceptorImplTest.java | 3 +-
.../broker/testcontext/PulsarTestContext.java | 4 +--
.../MultiBrokerMetadataConsistencyTest.java | 4 +--
.../pulsar/compaction/CompactedTopicImplTest.java | 4 +--
pulsar-client/pom.xml | 5 ++++
.../client/impl/ControlledClusterFailover.java | 2 +-
.../client/impl/MultiTopicsConsumerImpl.java | 2 +-
.../PersistentAcknowledgmentsGroupingTracker.java | 2 +-
.../pulsar/client/impl/PulsarClientImpl.java | 2 +-
pulsar-common/pom.xml | 5 ++++
.../org/apache/pulsar/common/util/FutureUtil.java | 4 +--
.../pulsar/common/util/URIPreconditions.java | 16 +++++-----
.../collections/GrowableArrayBlockingQueue.java | 2 +-
.../instance/JavaInstanceRunnableTest.java | 4 +--
.../functions/instance/JavaInstanceDepsTest.java | 1 +
.../pulsar/io/azuredataexplorer/ADXSink.java | 8 ++---
.../io/azuredataexplorer/ADXSinkConfigTest.java | 6 ++--
pulsar-io/core/pom.xml | 4 +++
.../server/ProxyWithExtensibleLoadManagerTest.java | 4 +--
53 files changed, 158 insertions(+), 117 deletions(-)
diff --git a/buildtools/src/main/resources/pulsar/checkstyle.xml b/buildtools/src/main/resources/pulsar/checkstyle.xml
index 14808cf8663..12126ab6154 100644
--- a/buildtools/src/main/resources/pulsar/checkstyle.xml
+++ b/buildtools/src/main/resources/pulsar/checkstyle.xml
@@ -140,6 +140,22 @@ page at http://checkstyle.sourceforge.net/config.html -->
value="autovalue.shaded, avro.shaded, bk-shade, com.google.api.client.repackaged, com.google.appengine.repackaged, org.apache.curator.shaded, org.testcontainers.shaded, org.junit" />
</module>
+ <module name="IllegalImport">
+ <property name="illegalPkgs"
+ value="org.jetbrains.annotations, org.checkerframework.checker.nullness.qual" />
+ <property name="illegalClasses"
+ value="javax.annotation.Nullable, javax.annotation.Nonnull" />
+ <message key="import.illegal"
+ value="{0}; Use org.jspecify.annotations.Nullable and org.jspecify.annotations.NonNull instead."/>
+ </module>
+
+ <module name="IllegalImport">
+ <property name="illegalClasses"
+ value="javax.validation.constraints.Null, javax.validation.constraints.NotNull" />
+ <message key="import.illegal"
+ value="{0}; Use org.jspecify.annotations.Nullable and org.jspecify.annotations.NonNull for nullness information. Check Jakarta Bean Validation API if you are looking for user input validation with annotations."/>
+ </module>
+
<module name="RedundantModifier">
<!-- Checks for redundant modifiers on various symbol definitions.
See: http://checkstyle.sourceforge.net/config_modifier.html#RedundantModifier
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 3b3a964db0b..a877866dd47 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -538,6 +538,8 @@ The Apache Software License, Version 2.0
- io.opentelemetry.semconv-opentelemetry-semconv-1.29.0-alpha.jar
* Spotify completable-futures
- com.spotify-completable-futures-0.3.6.jar
+ * JSpecify
+ - org.jspecify-jspecify-1.0.0.jar
BSD 3-clause "New" or "Revised" License
* Google auth library
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
index 93cfb805046..65adb7cd5f3 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -417,6 +417,7 @@ The Apache Software License, Version 2.0
- avro-1.11.4.jar
- avro-protobuf-1.11.4.jar
* Spotify completable-futures -- completable-futures-0.3.6.jar
+ * JSpecify -- jspecify-1.0.0.jar
BSD 3-clause "New" or "Revised" License
* JSR305 -- jsr305-3.0.2.jar -- ../licenses/LICENSE-JSR305.txt
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 56965862975..fce2a26e156 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
@@ -63,7 +63,6 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.LongStream;
-import javax.annotation.Nullable;
import lombok.Getter;
import org.apache.bookkeeper.client.AsyncCallback.CloseCallback;
import org.apache.bookkeeper.client.AsyncCallback.OpenCallback;
@@ -109,6 +108,7 @@ import org.apache.pulsar.common.util.collections.LongPairRangeSet;
import org.apache.pulsar.common.util.collections.LongPairRangeSet.LongPairConsumer;
import org.apache.pulsar.common.util.collections.LongPairRangeSet.RangeBoundConsumer;
import org.apache.pulsar.metadata.api.Stat;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
index 9fea9754cd6..ede725c1a01 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -67,7 +67,6 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
import lombok.Getter;
import org.apache.bookkeeper.client.AsyncCallback;
import org.apache.bookkeeper.client.AsyncCallback.CreateCallback;
@@ -141,6 +140,7 @@ import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.LazyLoadableValue;
import org.apache.pulsar.common.util.collections.ConcurrentLongHashMap;
import org.apache.pulsar.metadata.api.Stat;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pom.xml b/pom.xml
index d69144cbe5b..0230275df8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1621,6 +1621,11 @@ flexible messaging model and an intuitive client API.</description>
<artifactId>checker-qual</artifactId>
<version>${checkerframework.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jspecify</groupId>
+ <artifactId>jspecify</artifactId>
+ <version>1.0.0</version>
+ </dependency>
<dependency>
<groupId>io.rest-assured</groupId>
diff --git a/pulsar-broker-auth-oidc/src/main/java/org/apache/pulsar/broker/authentication/oidc/OpenIDProviderMetadataCache.java b/pulsar-broker-auth-oidc/src/main/java/org/apache/pulsar/broker/authentication/oidc/OpenIDProviderMetadataCache.java
index 111399adbd7..10e1be3c946 100644
--- a/pulsar-broker-auth-oidc/src/main/java/org/apache/pulsar/broker/authentication/oidc/OpenIDProviderMetadataCache.java
+++ b/pulsar-broker-auth-oidc/src/main/java/org/apache/pulsar/broker/authentication/oidc/OpenIDProviderMetadataCache.java
@@ -40,10 +40,10 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
import javax.naming.AuthenticationException;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.asynchttpclient.AsyncHttpClient;
+import org.jspecify.annotations.NonNull;
/**
* Class used to cache metadata responses from OpenID Providers.
@@ -90,7 +90,7 @@ class OpenIDProviderMetadataCache {
* @return the {@link OpenIDProviderMetadata} for the given issuer. Fail the completable future with
* AuthenticationException if any exceptions occur while retrieving the metadata.
*/
- CompletableFuture<OpenIDProviderMetadata> getOpenIDProviderMetadataForIssuer(@Nonnull String issuer) {
+ CompletableFuture<OpenIDProviderMetadata> getOpenIDProviderMetadataForIssuer(@NonNull String issuer) {
return cache.get(Optional.of(issuer));
}
@@ -217,7 +217,7 @@ class OpenIDProviderMetadataCache {
* @param isK8s - whether the issuer is represented by the Kubernetes API server. This affects error reporting.
* @throws AuthenticationException if the issuer does not exactly match the metadata issuer
*/
- private void verifyIssuer(@Nonnull String issuer, OpenIDProviderMetadata metadata,
+ private void verifyIssuer(@NonNull String issuer, OpenIDProviderMetadata metadata,
boolean isK8s) throws AuthenticationException {
if (!issuer.equals(metadata.getIssuer())) {
if (isK8s) {
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index b30de05d05d..3244e54834f 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -315,6 +315,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jspecify</groupId>
+ <artifactId>jspecify</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
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 9f69ef8f987..fefa01d6e99 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
@@ -43,7 +43,6 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.annotation.Nonnull;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.container.AsyncResponse;
import javax.ws.rs.core.Response;
@@ -118,6 +117,7 @@ import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.metadata.api.MetadataStoreException.BadVersionException;
import org.apache.pulsar.metadata.api.MetadataStoreException.NotFoundException;
import org.apache.zookeeper.KeeperException;
+import org.jspecify.annotations.NonNull;
@Slf4j
public abstract class NamespacesBase extends AdminResource {
@@ -211,13 +211,13 @@ public abstract class NamespacesBase extends AdminResource {
* Delete the namespace and retry to resolve some topics that were not created successfully(in metadata)
* during the deletion.
*/
- protected @Nonnull CompletableFuture<Void> internalDeleteNamespaceAsync(boolean force) {
+ protected @NonNull CompletableFuture<Void> internalDeleteNamespaceAsync(boolean force) {
final CompletableFuture<Void> future = new CompletableFuture<>();
internalRetryableDeleteNamespaceAsync0(force, 5, future);
return future;
}
private void internalRetryableDeleteNamespaceAsync0(boolean force, int retryTimes,
- @Nonnull CompletableFuture<Void> callback) {
+ @NonNull CompletableFuture<Void> callback) {
precheckWhenDeleteNamespace(namespaceName, force)
.thenCompose(policies -> {
final CompletableFuture<List<String>> topicsFuture;
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 f59e74999cb..df1f532851e 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
@@ -48,7 +48,6 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.annotation.Nonnull;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.container.AsyncResponse;
import javax.ws.rs.core.Response;
@@ -150,6 +149,7 @@ import org.apache.pulsar.common.util.collections.BitSetRecyclable;
import org.apache.pulsar.compaction.Compactor;
import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.transaction.coordinator.TransactionCoordinatorID;
+import org.jspecify.annotations.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -355,7 +355,7 @@ public class PersistentTopicsBase extends AdminResource {
* @exception RestException Unprocessable entity, status code: 422. throw it when some pre-check failed.
* @exception RestException Internal Server Error, status code: 500. throw it when get unknown Exception
*/
- protected @Nonnull CompletableFuture<Void> internalUpdatePartitionedTopicAsync(int expectPartitions,
+ protected @NonNull CompletableFuture<Void> internalUpdatePartitionedTopicAsync(int expectPartitions,
boolean updateLocal,
boolean force) {
PulsarService pulsarService = pulsar();
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Transactions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Transactions.java
index 7e3806aa9b4..ffcfd8f3de2 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Transactions.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v3/Transactions.java
@@ -55,7 +55,7 @@ import org.apache.pulsar.common.policies.data.TransactionPendingAckInternalStats
import org.apache.pulsar.common.policies.data.TransactionPendingAckStats;
import org.apache.pulsar.common.stats.PositionInPendingAckStats;
import org.apache.pulsar.common.util.FutureUtil;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
@Path("/transactions")
@Produces(MediaType.APPLICATION_JSON)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BookkeeperBucketSnapshotStorage.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BookkeeperBucketSnapshotStorage.java
index 0d90e5e1d98..ba37092e88d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BookkeeperBucketSnapshotStorage.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BookkeeperBucketSnapshotStorage.java
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
-import javax.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.client.BKException;
import org.apache.bookkeeper.client.BookKeeper;
@@ -41,6 +40,7 @@ import org.apache.pulsar.broker.delayed.proto.SnapshotMetadata;
import org.apache.pulsar.broker.delayed.proto.SnapshotSegment;
import org.apache.pulsar.common.allocator.PulsarByteBufAllocator;
import org.apache.pulsar.common.util.FutureUtil;
+import org.jspecify.annotations.NonNull;
@Slf4j
public class BookkeeperBucketSnapshotStorage implements BucketSnapshotStorage {
@@ -165,7 +165,7 @@ public class BookkeeperBucketSnapshotStorage implements BucketSnapshotStorage {
return snapshotMetadataList;
}
- @NotNull
+ @NonNull
private CompletableFuture<LedgerHandle> createLedger(String bucketKey, String topicName, String cursorName) {
CompletableFuture<LedgerHandle> future = new CompletableFuture<>();
Map<String, byte[]> metadata = LedgerMetadataUtils.buildMetadataForDelayedIndexBucket(bucketKey,
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 1ffc03786d5..825942d0de1 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
@@ -21,10 +21,10 @@ package org.apache.pulsar.broker.namespace;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import javax.validation.constraints.NotNull;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.pulsar.policies.data.loadbalancer.AdvertisedListener;
+import org.jspecify.annotations.NonNull;
@Data
@NoArgsConstructor
@@ -55,7 +55,7 @@ public class NamespaceEphemeralData {
}
}
- @NotNull
+ @NonNull
public Map<String, AdvertisedListener> getAdvertisedListeners() {
if (this.advertisedListeners == null) {
return Collections.emptyMap();
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 f3fb17c02fc..cffd3529c31 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
@@ -52,7 +52,6 @@ import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
@@ -115,6 +114,7 @@ import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.opentelemetry.annotations.PulsarDeprecatedMetric;
import org.apache.pulsar.policies.data.loadbalancer.AdvertisedListener;
import org.apache.pulsar.policies.data.loadbalancer.LocalBrokerData;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractBaseDispatcher.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractBaseDispatcher.java
index c2730374926..b213ac21c26 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractBaseDispatcher.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractBaseDispatcher.java
@@ -52,7 +52,7 @@ import org.apache.pulsar.common.api.proto.ReplicatedSubscriptionsSnapshot;
import org.apache.pulsar.common.protocol.Commands;
import org.apache.pulsar.common.protocol.Markers;
import org.apache.pulsar.compaction.Compactor;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
@Slf4j
public abstract class AbstractBaseDispatcher extends EntryFilterSupport implements Dispatcher {
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 4d70603e195..033fcd3986c 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
@@ -43,7 +43,6 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import java.util.concurrent.atomic.LongAdder;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.ToLongFunction;
-import javax.annotation.Nonnull;
import lombok.Getter;
import lombok.Setter;
import org.apache.bookkeeper.mledger.util.StatsBuckets;
@@ -84,6 +83,7 @@ import org.apache.pulsar.common.policies.data.impl.DispatchRateImpl;
import org.apache.pulsar.common.protocol.schema.SchemaData;
import org.apache.pulsar.common.protocol.schema.SchemaVersion;
import org.apache.pulsar.common.util.FutureUtil;
+import org.jspecify.annotations.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1152,7 +1152,7 @@ public abstract class AbstractTopic implements Topic, TopicPolicyListener<TopicP
updateResourceGroupLimiter(policies);
}
- public void updateResourceGroupLimiter(@Nonnull Policies namespacePolicies) {
+ public void updateResourceGroupLimiter(@NonNull Policies namespacePolicies) {
requireNonNull(namespacePolicies);
// attach the resource-group level rate limiters, if set
String rgName = namespacePolicies.resource_group_name;
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 766af721a6b..0a2db0003de 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
@@ -74,8 +74,6 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Consumer;
import java.util.function.Predicate;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -187,6 +185,8 @@ import org.apache.pulsar.metadata.api.NotificationType;
import org.apache.pulsar.opentelemetry.annotations.PulsarDeprecatedMetric;
import org.apache.pulsar.policies.data.loadbalancer.NamespaceBundleStats;
import org.apache.pulsar.transaction.coordinator.TransactionMetadataStore;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1179,7 +1179,7 @@ public class BrokerService implements Closeable {
}
}
- private CompletableFuture<Optional<TopicPolicies>> getTopicPoliciesBypassSystemTopic(@Nonnull TopicName topicName) {
+ private CompletableFuture<Optional<TopicPolicies>> getTopicPoliciesBypassSystemTopic(@NonNull TopicName topicName) {
Objects.requireNonNull(topicName);
final ServiceConfiguration serviceConfiguration = pulsar.getConfiguration();
if (serviceConfiguration.isSystemTopicAndTopicLevelPoliciesEnabled()
@@ -1873,14 +1873,14 @@ public class BrokerService implements Closeable {
return result;
}
- public CompletableFuture<ManagedLedgerConfig> getManagedLedgerConfig(@Nonnull TopicName topicName) {
+ public CompletableFuture<ManagedLedgerConfig> getManagedLedgerConfig(@NonNull TopicName topicName) {
final CompletableFuture<Optional<TopicPolicies>> topicPoliciesFuture =
getTopicPoliciesBypassSystemTopic(topicName);
return topicPoliciesFuture.thenCompose(optionalTopicPolicies ->
getManagedLedgerConfig(topicName, optionalTopicPolicies.orElse(null)));
}
- private CompletableFuture<ManagedLedgerConfig> getManagedLedgerConfig(@Nonnull TopicName topicName,
+ private CompletableFuture<ManagedLedgerConfig> getManagedLedgerConfig(@NonNull TopicName topicName,
@Nullable TopicPolicies topicPolicies) {
requireNonNull(topicName);
NamespaceName namespace = topicName.getNamespaceObject();
@@ -3635,7 +3635,7 @@ public class BrokerService implements Closeable {
return null;
}
- public @Nonnull CompletionStage<Boolean> isAllowAutoSubscriptionCreationAsync(@Nonnull TopicName tpName) {
+ public @NonNull CompletionStage<Boolean> isAllowAutoSubscriptionCreationAsync(@NonNull TopicName tpName) {
requireNonNull(tpName);
// topic level policies
final var topicPolicies = getTopicPolicies(tpName);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryAndMetadata.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryAndMetadata.java
index 70643d5de2a..15a784a0978 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryAndMetadata.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryAndMetadata.java
@@ -21,12 +21,12 @@ package org.apache.pulsar.broker.service;
import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import java.nio.charset.StandardCharsets;
-import javax.annotation.Nullable;
import lombok.Getter;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.Position;
import org.apache.pulsar.common.api.proto.MessageMetadata;
import org.apache.pulsar.common.protocol.Commands;
+import org.jspecify.annotations.Nullable;
public class EntryAndMetadata implements Entry {
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 e81cde75d68..10d3ceea9bc 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
@@ -34,7 +34,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
import org.apache.commons.lang3.concurrent.ConcurrentInitializer;
import org.apache.commons.lang3.concurrent.LazyInitializer;
import org.apache.commons.lang3.tuple.MutablePair;
@@ -59,7 +58,7 @@ import org.apache.pulsar.common.naming.NamespaceName;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.TopicPolicies;
import org.apache.pulsar.common.util.FutureUtil;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -307,9 +306,9 @@ public class SystemTopicBasedTopicPoliciesService implements TopicPoliciesServic
}
}
- @NotNull
+ @NonNull
@Override
- public CompletableFuture<Optional<TopicPolicies>> getTopicPoliciesAsync(@NotNull TopicName topicName,
+ public CompletableFuture<Optional<TopicPolicies>> getTopicPoliciesAsync(@NonNull TopicName topicName,
boolean isGlobal) {
requireNonNull(topicName);
final CompletableFuture<Void> preparedFuture = prepareInitPoliciesCacheAsync(topicName.getNamespaceObject());
@@ -321,9 +320,9 @@ public class SystemTopicBasedTopicPoliciesService implements TopicPoliciesServic
});
}
- @NotNull
+ @NonNull
@Override
- public CompletableFuture<Optional<TopicPolicies>> getTopicPoliciesAsync(@NotNull TopicName topicName) {
+ public CompletableFuture<Optional<TopicPolicies>> getTopicPoliciesAsync(@NonNull TopicName topicName) {
requireNonNull(topicName);
final CompletableFuture<Void> preparedFuture = prepareInitPoliciesCacheAsync(topicName.getNamespaceObject());
return preparedFuture.thenApply(__ -> {
@@ -373,7 +372,7 @@ public class SystemTopicBasedTopicPoliciesService implements TopicPoliciesServic
}
@VisibleForTesting
- @Nonnull CompletableFuture<Void> prepareInitPoliciesCacheAsync(@Nonnull NamespaceName namespace) {
+ @NonNull CompletableFuture<Void> prepareInitPoliciesCacheAsync(@NonNull NamespaceName namespace) {
requireNonNull(namespace);
if (closed.get()) {
return CompletableFuture.completedFuture(null);
@@ -525,11 +524,11 @@ public class SystemTopicBasedTopicPoliciesService implements TopicPoliciesServic
});
}
- private void cleanCacheAndCloseReader(@Nonnull NamespaceName namespace, boolean cleanOwnedBundlesCount) {
+ private void cleanCacheAndCloseReader(@NonNull NamespaceName namespace, boolean cleanOwnedBundlesCount) {
cleanCacheAndCloseReader(namespace, cleanOwnedBundlesCount, false);
}
- private void cleanCacheAndCloseReader(@Nonnull NamespaceName namespace, boolean cleanOwnedBundlesCount,
+ private void cleanCacheAndCloseReader(@NonNull NamespaceName namespace, boolean cleanOwnedBundlesCount,
boolean cleanWriterCache) {
if (cleanWriterCache) {
writerCaches.synchronous().invalidate(namespace);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java
index eba233559bf..f8d76e2dedd 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java
@@ -24,7 +24,6 @@ import java.util.Optional;
import java.util.SortedMap;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.LongAdder;
-import javax.annotation.Nullable;
import org.apache.bookkeeper.mledger.AsyncCallbacks.FindEntryCallback;
import org.apache.bookkeeper.mledger.AsyncCallbacks.MarkDeleteCallback;
import org.apache.bookkeeper.mledger.ManagedCursor;
@@ -41,6 +40,7 @@ import org.apache.pulsar.client.impl.MessageImpl;
import org.apache.pulsar.common.api.proto.CommandSubscribe.SubType;
import org.apache.pulsar.common.protocol.Commands;
import org.apache.pulsar.common.stats.Rate;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
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 e81686a3514..5874afe095c 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
@@ -56,7 +56,6 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
import lombok.Getter;
import lombok.Value;
import org.apache.bookkeeper.client.api.LedgerMetadata;
@@ -199,6 +198,7 @@ import org.apache.pulsar.compaction.TopicCompactionService;
import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.policies.data.loadbalancer.NamespaceBundleStats;
import org.apache.pulsar.utils.StatsOutputStream;
+import org.jspecify.annotations.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -572,7 +572,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
* @throws SubscriptionConflictUnloadException Conflict topic-close, topic-delete, another-subscribe-unload,
* cannot unload subscription now
*/
- public CompletableFuture<Void> unloadSubscription(@Nonnull String subName) {
+ public CompletableFuture<Void> unloadSubscription(@NonNull String subName) {
final PersistentSubscription sub = subscriptions.get(subName);
if (sub == null) {
return CompletableFuture.failedFuture(
@@ -3506,7 +3506,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
}
@Override
- public CompletableFuture<Void> onPoliciesUpdate(@Nonnull Policies data) {
+ public CompletableFuture<Void> onPoliciesUpdate(@NonNull Policies data) {
requireNonNull(data);
if (log.isDebugEnabled()) {
log.debug("[{}] isEncryptionRequired changes: {} -> {}", topic, isEncryptionRequired,
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
index a26255c9f8b..98711dab9b0 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
@@ -21,7 +21,6 @@ package org.apache.pulsar.broker.service.persistent;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
import org.apache.bookkeeper.mledger.ManagedLedger;
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.namespace.NamespaceService;
@@ -33,6 +32,7 @@ import org.apache.pulsar.common.naming.SystemTopicNames;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.EntryFilters;
import org.apache.pulsar.common.policies.data.Policies;
+import org.jspecify.annotations.NonNull;
public class SystemTopic extends PersistentTopic {
@@ -123,7 +123,7 @@ public class SystemTopic extends PersistentTopic {
}
@Override
- public void updateResourceGroupLimiter(@Nonnull Policies namespacePolicies) {
+ public void updateResourceGroupLimiter(@NonNull Policies namespacePolicies) {
// nothing todo.
}
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 99f0249b304..ae587c1dec2 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
@@ -42,7 +42,6 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import java.util.stream.Collectors;
-import javax.validation.constraints.NotNull;
import org.apache.bookkeeper.client.AsyncCallback;
import org.apache.bookkeeper.client.BKException;
import org.apache.bookkeeper.client.BookKeeper;
@@ -64,6 +63,7 @@ import org.apache.pulsar.metadata.api.MetadataSerde;
import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.metadata.api.Stat;
import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
+import org.jspecify.annotations.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -234,7 +234,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
return delete(key, false);
}
- @NotNull
+ @NonNull
private CompletableFuture<StoredSchema> getSchema(String schemaId) {
// There's already a schema read operation in progress. Just piggyback on that
return readSchemaOperations.computeIfAbsent(schemaId, key -> {
@@ -282,7 +282,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
}
}
- @NotNull
+ @NonNull
private CompletableFuture<StoredSchema> getSchema(String schemaId, long version) {
if (log.isDebugEnabled()) {
log.debug("[{}] Get schema - version: {}", schemaId, version);
@@ -312,7 +312,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
});
}
- @NotNull
+ @NonNull
private CompletableFuture<Long> putSchema(String schemaId, byte[] data, byte[] hash) {
return getSchemaLocator(getSchemaPath(schemaId)).thenCompose(optLocatorEntry ->
putSchema(schemaId, data, hash, optLocatorEntry));
@@ -365,7 +365,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
});
}
- @NotNull
+ @NonNull
private CompletableFuture<Long> deleteSchema(String schemaId, boolean forcefully) {
return (forcefully ? CompletableFuture.completedFuture(null)
: ignoreUnrecoverableBKException(getSchema(schemaId))).thenCompose(schemaAndVersion -> {
@@ -425,12 +425,12 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
});
}
- @NotNull
+ @NonNull
private static String getSchemaPath(String schemaId) {
return SchemaPath + "/" + schemaId;
}
- @NotNull
+ @NonNull
private CompletableFuture<SchemaStorageFormat.PositionInfo> addNewSchemaEntryToStore(
String schemaId,
List<SchemaStorageFormat.IndexEntry> index,
@@ -447,7 +447,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
});
}
- @NotNull
+ @NonNull
private CompletableFuture<Long> updateSchemaLocator(
String schemaId,
LocatorEntry locatorEntry,
@@ -491,7 +491,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
});
}
- @NotNull
+ @NonNull
private CompletableFuture<SchemaStorageFormat.SchemaEntry> findSchemaEntryByVersion(
List<SchemaStorageFormat.IndexEntry> index,
long version
@@ -518,7 +518,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
return completedFuture(null);
}
- @NotNull
+ @NonNull
private CompletableFuture<SchemaStorageFormat.SchemaEntry> readSchemaEntry(
SchemaStorageFormat.PositionInfo position
) {
@@ -535,26 +535,26 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
).thenCompose(Functions::parseSchemaEntry);
}
- @NotNull
+ @NonNull
private CompletableFuture<Void> updateSchemaLocator(String id,
SchemaStorageFormat.SchemaLocator schema, long version) {
return store.put(id, schema.toByteArray(), Optional.of(version)).thenApply(__ -> null);
}
- @NotNull
+ @NonNull
private CompletableFuture<LocatorEntry> createSchemaLocator(String id, SchemaStorageFormat.SchemaLocator locator) {
return store.put(id, locator.toByteArray(), Optional.of(-1L))
.thenApply(stat -> new LocatorEntry(locator, stat.getVersion()));
}
- @NotNull
+ @NonNull
private CompletableFuture<Optional<LocatorEntry>> getSchemaLocator(String schema) {
return locatorEntryCache.getWithStats(schema)
.thenApply(o ->
o.map(r -> new LocatorEntry(r.getValue(), r.getStat().getVersion())));
}
- @NotNull
+ @NonNull
private CompletableFuture<Long> addEntry(LedgerHandle ledgerHandle, SchemaStorageFormat.SchemaEntry entry) {
final CompletableFuture<Long> future = new CompletableFuture<>();
ledgerHandle.asyncAddEntry(entry.toByteArray(),
@@ -569,7 +569,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
return future;
}
- @NotNull
+ @NonNull
private CompletableFuture<LedgerHandle> createLedger(String schemaId) {
Map<String, byte[]> metadata = LedgerMetadataUtils.buildMetadataForSchema(schemaId);
final CompletableFuture<LedgerHandle> future = new CompletableFuture<>();
@@ -594,7 +594,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
return future;
}
- @NotNull
+ @NonNull
private CompletableFuture<LedgerHandle> openLedger(Long ledgerId) {
final CompletableFuture<LedgerHandle> future = new CompletableFuture<>();
bookKeeper.asyncOpenLedger(
@@ -612,7 +612,7 @@ public class BookkeeperSchemaStorage implements SchemaStorage {
return future;
}
- @NotNull
+ @NonNull
private CompletableFuture<Void> closeLedger(LedgerHandle ledgerHandle) {
CompletableFuture<Void> future = new CompletableFuture<>();
ledgerHandle.asyncClose((rc, handle, ctx) -> {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java
index 2c84805584d..58154deda8c 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorageFactory.java
@@ -18,14 +18,14 @@
*/
package org.apache.pulsar.broker.service.schema;
-import javax.validation.constraints.NotNull;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.common.protocol.schema.SchemaStorage;
+import org.jspecify.annotations.NonNull;
@SuppressWarnings("unused")
public class BookkeeperSchemaStorageFactory implements SchemaStorageFactory {
@Override
- @NotNull
+ @NonNull
public SchemaStorage create(PulsarService pulsar) {
return new BookkeeperSchemaStorage(pulsar);
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java
index 2bbe2e366b6..8e21748e403 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java
@@ -40,7 +40,6 @@ import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors;
-import javax.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;
import org.apache.avro.Schema;
import org.apache.bookkeeper.common.concurrent.FutureUtils;
@@ -60,6 +59,7 @@ import org.apache.pulsar.common.protocol.schema.StoredSchema;
import org.apache.pulsar.common.schema.LongSchemaVersion;
import org.apache.pulsar.common.schema.SchemaType;
import org.apache.pulsar.common.util.FutureUtil;
+import org.jspecify.annotations.NonNull;
@Slf4j
public class SchemaRegistryServiceImpl implements SchemaRegistryService {
@@ -87,7 +87,7 @@ public class SchemaRegistryServiceImpl implements SchemaRegistryService {
}
@Override
- @NotNull
+ @NonNull
public CompletableFuture<SchemaAndMetadata> getSchema(String schemaId) {
return getSchema(schemaId, SchemaVersion.Latest).thenApply((schema) -> {
if (schema != null && schema.schema.isDeleted()) {
@@ -99,7 +99,7 @@ public class SchemaRegistryServiceImpl implements SchemaRegistryService {
}
@Override
- @NotNull
+ @NonNull
public CompletableFuture<SchemaAndMetadata> getSchema(String schemaId, SchemaVersion version) {
long start = this.clock.millis();
@@ -184,7 +184,7 @@ public class SchemaRegistryServiceImpl implements SchemaRegistryService {
}
@Override
- @NotNull
+ @NonNull
public CompletableFuture<SchemaVersion> putSchemaIfAbsent(String schemaId, SchemaData schema,
SchemaCompatibilityStrategy strategy) {
MutableLong start = new MutableLong(0);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaStorageFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaStorageFactory.java
index ec0021c1ea8..c29b754abf8 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaStorageFactory.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaStorageFactory.java
@@ -18,11 +18,11 @@
*/
package org.apache.pulsar.broker.service.schema;
-import javax.validation.constraints.NotNull;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.common.protocol.schema.SchemaStorage;
+import org.jspecify.annotations.NonNull;
public interface SchemaStorageFactory {
- @NotNull
+ @NonNull
SchemaStorage create(PulsarService pulsar) throws Exception;
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
index f191fc3a384..5be4a170db0 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
@@ -96,8 +96,8 @@ import org.apache.pulsar.common.policies.path.PolicyPath;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.metadata.api.coordination.LockManager;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicImpl.java
index 562d9786544..ddc4c08bfdd 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicImpl.java
@@ -35,7 +35,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Predicate;
-import javax.annotation.Nullable;
import org.apache.bookkeeper.client.BKException;
import org.apache.bookkeeper.client.BookKeeper;
import org.apache.bookkeeper.client.LedgerEntry;
@@ -54,6 +53,7 @@ import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.RawMessage;
import org.apache.pulsar.client.impl.RawMessageImpl;
import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicUtils.java
index e313a8a5f84..098bb248d04 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicUtils.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactedTopicUtils.java
@@ -24,7 +24,6 @@ import com.google.common.annotations.Beta;
import java.util.Collections;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nullable;
import org.apache.bookkeeper.mledger.AsyncCallbacks;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.ManagedCursor;
@@ -36,6 +35,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.pulsar.broker.service.Consumer;
import org.apache.pulsar.broker.service.persistent.PersistentDispatcherSingleActiveConsumer;
import org.apache.pulsar.common.util.FutureUtil;
+import org.jspecify.annotations.Nullable;
public class CompactedTopicUtils {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactionServiceFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactionServiceFactory.java
index 7bb30372e45..e1a3945f50a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactionServiceFactory.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/CompactionServiceFactory.java
@@ -19,10 +19,10 @@
package org.apache.pulsar.compaction;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.common.classification.InterfaceAudience;
import org.apache.pulsar.common.classification.InterfaceStability;
+import org.jspecify.annotations.NonNull;
@InterfaceAudience.Public
@InterfaceStability.Evolving
@@ -35,7 +35,7 @@ public interface CompactionServiceFactory extends AutoCloseable {
* the pulsar service instance
* @return a future represents the initialization result
*/
- CompletableFuture<Void> initialize(@Nonnull PulsarService pulsarService);
+ CompletableFuture<Void> initialize(@NonNull PulsarService pulsarService);
/**
* Create a new topic compaction service for topic.
@@ -44,5 +44,5 @@ public interface CompactionServiceFactory extends AutoCloseable {
* the topic name
* @return a future represents the topic compaction service
*/
- CompletableFuture<TopicCompactionService> newTopicCompactionService(@Nonnull String topic);
+ CompletableFuture<TopicCompactionService> newTopicCompactionService(@NonNull String topic);
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/PulsarCompactionServiceFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/PulsarCompactionServiceFactory.java
index 424733ad581..02ea8c7f751 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/PulsarCompactionServiceFactory.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/PulsarCompactionServiceFactory.java
@@ -22,12 +22,12 @@ import com.google.common.annotations.VisibleForTesting;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import lombok.AccessLevel;
import lombok.Getter;
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.PulsarService;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
public class PulsarCompactionServiceFactory implements CompactionServiceFactory {
@@ -60,14 +60,14 @@ public class PulsarCompactionServiceFactory implements CompactionServiceFactory
}
@Override
- public CompletableFuture<Void> initialize(@Nonnull PulsarService pulsarService) {
+ public CompletableFuture<Void> initialize(@NonNull PulsarService pulsarService) {
Objects.requireNonNull(pulsarService);
this.pulsarService = pulsarService;
return CompletableFuture.completedFuture(null);
}
@Override
- public CompletableFuture<TopicCompactionService> newTopicCompactionService(@Nonnull String topic) {
+ public CompletableFuture<TopicCompactionService> newTopicCompactionService(@NonNull String topic) {
Objects.requireNonNull(topic);
PulsarTopicCompactionService pulsarTopicCompactionService =
new PulsarTopicCompactionService(topic, pulsarService.getBookKeeperClient(), () -> {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/PulsarTopicCompactionService.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/PulsarTopicCompactionService.java
index 16543bc7aa7..cf1073394e6 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/PulsarTopicCompactionService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/PulsarTopicCompactionService.java
@@ -30,7 +30,6 @@ import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.function.Predicate;
import java.util.function.Supplier;
-import javax.annotation.Nonnull;
import org.apache.bookkeeper.client.BookKeeper;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.Position;
@@ -38,6 +37,7 @@ import org.apache.bookkeeper.mledger.impl.PositionImpl;
import org.apache.pulsar.common.api.proto.BrokerEntryMetadata;
import org.apache.pulsar.common.protocol.Commands;
import org.apache.pulsar.common.util.FutureUtil;
+import org.jspecify.annotations.NonNull;
public class PulsarTopicCompactionService implements TopicCompactionService {
@@ -67,7 +67,7 @@ public class PulsarTopicCompactionService implements TopicCompactionService {
}
@Override
- public CompletableFuture<List<Entry>> readCompactedEntries(@Nonnull Position startPosition,
+ public CompletableFuture<List<Entry>> readCompactedEntries(@NonNull Position startPosition,
int numberOfEntriesToRead) {
Objects.requireNonNull(startPosition);
checkArgument(numberOfEntriesToRead > 0);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TopicCompactionService.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TopicCompactionService.java
index fdd6bebbdec..11ce916f3ea 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TopicCompactionService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TopicCompactionService.java
@@ -20,11 +20,11 @@ package org.apache.pulsar.compaction;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.Position;
import org.apache.pulsar.common.classification.InterfaceAudience;
import org.apache.pulsar.common.classification.InterfaceStability;
+import org.jspecify.annotations.NonNull;
@InterfaceAudience.Public
@InterfaceStability.Evolving
@@ -45,7 +45,7 @@ public interface TopicCompactionService extends AutoCloseable {
* @param numberOfEntriesToRead the maximum number of entries to read.
* @return a future that will be completed with the list of entries, this list can be null.
*/
- CompletableFuture<List<Entry>> readCompactedEntries(@Nonnull Position startPosition, int numberOfEntriesToRead);
+ CompletableFuture<List<Entry>> readCompactedEntries(@NonNull Position startPosition, int numberOfEntriesToRead);
/**
* Read the last compacted entry from the TopicCompactionService.
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java
index a78254df4aa..96d88032302 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java
@@ -26,7 +26,7 @@ import org.apache.pulsar.metadata.TestZKServer;
import org.apache.pulsar.metadata.api.MetadataStoreConfig;
import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
/**
* Multiple brokers with a real test Zookeeper server (instead of the mock server)
@@ -71,7 +71,7 @@ public abstract class MultiBrokerTestZKBaseTest extends MultiBrokerBaseTest {
.configurationMetadataStore(createMetadataStore(MetadataStoreConfig.CONFIGURATION_METADATA_STORE));
}
- @NotNull
+ @NonNull
protected MetadataStoreExtended createMetadataStore(String metadataStoreName) {
try {
MetadataStoreExtended store =
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/ManagedLedgerInterceptorImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/ManagedLedgerInterceptorImplTest.java
index 8b49cc4bc52..e7d625d347e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/ManagedLedgerInterceptorImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/ManagedLedgerInterceptorImplTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.broker.intercept;
-
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.ArrayList;
@@ -47,7 +46,7 @@ import org.apache.pulsar.common.intercept.BrokerEntryMetadataInterceptor;
import org.apache.pulsar.common.intercept.BrokerEntryMetadataUtils;
import org.apache.pulsar.common.intercept.ManagedLedgerPayloadProcessor;
import org.apache.pulsar.common.protocol.Commands;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java
index d8299a5ff34..f8edc77138b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java
@@ -73,7 +73,7 @@ import org.apache.zookeeper.MockZooKeeper;
import org.apache.zookeeper.MockZooKeeperSession;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.ZooKeeper;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
import org.mockito.Mockito;
import org.mockito.internal.util.MockUtil;
@@ -982,7 +982,7 @@ public class PulsarTestContext implements AutoCloseable {
}
}
- @NotNull
+ @NonNull
private static ManagedLedgerStorage createManagedLedgerClientFactory(BookKeeper bookKeeperClient,
ManagedLedgerFactory managedLedgerFactory) {
return new ManagedLedgerStorage() {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java
index c998a1ba57c..e58ff6b8b2a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/MultiBrokerMetadataConsistencyTest.java
@@ -31,7 +31,7 @@ import org.apache.pulsar.metadata.TestZKServer;
import org.apache.pulsar.metadata.api.MetadataStoreConfig;
import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
import org.testng.annotations.Test;
@Slf4j
@@ -93,7 +93,7 @@ public class MultiBrokerMetadataConsistencyTest extends MultiBrokerBaseTest {
.configurationMetadataStore(configurationStore);
}
- @NotNull
+ @NonNull
protected MetadataStoreExtended createMetadataStore(String name) {
try {
return MetadataStoreExtended.create(testZKServer.getConnectionString(),
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java
index c9933b7ef8f..fe638dbe6df 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java
@@ -31,8 +31,8 @@ import java.util.function.Function;
import java.util.function.Supplier;
import org.apache.bookkeeper.mledger.impl.PositionImpl;
import org.apache.pulsar.common.api.proto.MessageIdData;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml
index 2b993683468..89ce86cf27f 100644
--- a/pulsar-client/pom.xml
+++ b/pulsar-client/pom.xml
@@ -180,6 +180,11 @@
<artifactId>jcip-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jspecify</groupId>
+ <artifactId>jspecify</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java
index 1674f7469af..c52a70c6cd7 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java
@@ -52,7 +52,7 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig;
import org.asynchttpclient.Request;
import org.asynchttpclient.Response;
import org.asynchttpclient.channel.DefaultKeepAliveStrategy;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
@Slf4j
public class ControlledClusterFailover implements ServiceUrlProvider {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
index 551acfb9798..8ab3b7ac7de 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
@@ -52,7 +52,6 @@ import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.annotation.Nullable;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.pulsar.client.api.BatchReceivePolicy;
@@ -77,6 +76,7 @@ import org.apache.pulsar.common.partition.PartitionedTopicMetadata;
import org.apache.pulsar.common.util.CompletableFutureCancellationHandler;
import org.apache.pulsar.common.util.ExceptionHandler;
import org.apache.pulsar.common.util.FutureUtil;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
index d30c3de0fd7..5f7957d7f1d 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PersistentAcknowledgmentsGroupingTracker.java
@@ -39,7 +39,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Function;
-import javax.annotation.Nullable;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.tuple.Triple;
@@ -53,6 +52,7 @@ import org.apache.pulsar.common.protocol.Commands;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.collections.BitSetRecyclable;
import org.apache.pulsar.common.util.collections.ConcurrentBitSetRecyclable;
+import org.jspecify.annotations.Nullable;
/**
* Group the acknowledgements for a certain time and then sends them out in a single protobuf command.
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
index 2b1efafcaff..95c2f3bde5e 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
@@ -48,7 +48,6 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nullable;
import lombok.Builder;
import lombok.Getter;
import org.apache.commons.lang3.tuple.Pair;
@@ -94,6 +93,7 @@ import org.apache.pulsar.common.util.Backoff;
import org.apache.pulsar.common.util.BackoffBuilder;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.netty.EventLoopUtil;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index 0739c3787bd..1e9f248e646 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -83,6 +83,11 @@
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jspecify</groupId>
+ <artifactId>jspecify</artifactId>
+ </dependency>
+
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FutureUtil.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FutureUtil.java
index 454eee0f966..b9ee70dc825 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FutureUtil.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FutureUtil.java
@@ -39,8 +39,8 @@ import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
+import org.jspecify.annotations.NonNull;
/**
* This class is aimed at simplifying work with {@code CompletableFuture}.
@@ -284,7 +284,7 @@ public class FutureUtil {
* @throws RejectedExecutionException if this task cannot be accepted for execution
* @throws NullPointerException if one of params is null
*/
- public static <T> @Nonnull CompletableFuture<T> composeAsync(Supplier<CompletableFuture<T>> futureSupplier,
+ public static <T> @NonNull CompletableFuture<T> composeAsync(Supplier<CompletableFuture<T>> futureSupplier,
Executor executor) {
Objects.requireNonNull(futureSupplier);
Objects.requireNonNull(executor);
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/URIPreconditions.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/URIPreconditions.java
index ea7fae2fdf0..946fcd56c0f 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/URIPreconditions.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/URIPreconditions.java
@@ -22,9 +22,9 @@ import static java.util.Objects.requireNonNull;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.function.Predicate;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
/**
* Static convenience URI checker.
@@ -39,8 +39,8 @@ public class URIPreconditions {
* @param predicate User defined rule
* @throws IllegalArgumentException Illegal URI or failed in the user's rules
*/
- public static void checkURI(@Nonnull String uri,
- @Nonnull Predicate<URI> predicate) throws IllegalArgumentException {
+ public static void checkURI(@NonNull String uri,
+ @NonNull Predicate<URI> predicate) throws IllegalArgumentException {
checkURI(uri, predicate, null);
}
@@ -52,7 +52,7 @@ public class URIPreconditions {
* @throws IllegalArgumentException Illegal URI or failed in the user's rules
*/
public static void checkURIIfPresent(@Nullable String uri,
- @Nonnull Predicate<URI> predicate) throws IllegalArgumentException {
+ @NonNull Predicate<URI> predicate) throws IllegalArgumentException {
checkURIIfPresent(uri, predicate, null);
}
@@ -65,7 +65,7 @@ public class URIPreconditions {
* @throws IllegalArgumentException Illegal URI or failed in the user's rules
*/
public static void checkURIIfPresent(@Nullable String uri,
- @Nonnull Predicate<URI> predicate,
+ @NonNull Predicate<URI> predicate,
@Nullable String errorMessage) throws IllegalArgumentException {
if (uri == null || uri.length() == 0) {
return;
@@ -81,8 +81,8 @@ public class URIPreconditions {
* @param errorMessage Error message
* @throws IllegalArgumentException Illegal URI or failed in the user's rules
*/
- public static void checkURI(@Nonnull String uri,
- @Nonnull Predicate<URI> predicate,
+ public static void checkURI(@NonNull String uri,
+ @NonNull Predicate<URI> predicate,
@Nullable String errorMessage) throws IllegalArgumentException {
requireNonNull(uri, "uri");
requireNonNull(predicate, "predicate");
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueue.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueue.java
index 94bfad1fbd2..8ad75cd4e72 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueue.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueue.java
@@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.StampedLock;
import java.util.function.Consumer;
import java.util.function.Predicate;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
/**
* This implements a {@link BlockingQueue} backed by an array with no fixed capacity.
diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java
index c83648132d4..c5ac63af24a 100644
--- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java
+++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java
@@ -60,7 +60,7 @@ import org.apache.pulsar.io.core.SinkContext;
import org.apache.pulsar.io.core.Source;
import org.apache.pulsar.io.core.SourceContext;
import org.awaitility.Awaitility;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
@@ -200,7 +200,7 @@ public class JavaInstanceRunnableTest {
verify(record, times(1)).ack();
}
- @NotNull
+ @NonNull
private JavaInstanceRunnable getJavaInstanceRunnable(boolean autoAck,
org.apache.pulsar.functions.proto.Function.ProcessingGuarantees processingGuarantees) throws Exception {
FunctionDetails functionDetails = FunctionDetails.newBuilder()
diff --git a/pulsar-functions/runtime-all/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceDepsTest.java b/pulsar-functions/runtime-all/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceDepsTest.java
index e29f19a8eee..7551270eac6 100644
--- a/pulsar-functions/runtime-all/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceDepsTest.java
+++ b/pulsar-functions/runtime-all/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceDepsTest.java
@@ -82,6 +82,7 @@ public class JavaInstanceDepsTest {
&& !name.startsWith("org/apache/commons/codec")
&& !name.startsWith("com/google")
&& !name.startsWith("org/checkerframework")
+ && !name.startsWith("org/jspecify/annotations")
&& !name.startsWith("javax/annotation")
&& !name.startsWith("org/apache/logging/slf4j")
&& !name.startsWith("org/apache/logging/log4j")) {
diff --git a/pulsar-io/azure-data-explorer/src/main/java/org/apache/pulsar/io/azuredataexplorer/ADXSink.java b/pulsar-io/azure-data-explorer/src/main/java/org/apache/pulsar/io/azuredataexplorer/ADXSink.java
index 07eb372833b..e19506cfd8b 100644
--- a/pulsar-io/azure-data-explorer/src/main/java/org/apache/pulsar/io/azuredataexplorer/ADXSink.java
+++ b/pulsar-io/azure-data-explorer/src/main/java/org/apache/pulsar/io/azuredataexplorer/ADXSink.java
@@ -54,7 +54,7 @@ import org.apache.pulsar.io.core.Sink;
import org.apache.pulsar.io.core.SinkContext;
import org.apache.pulsar.io.core.annotations.Connector;
import org.apache.pulsar.io.core.annotations.IOType;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
@Connector(
name = "adx",
@@ -177,7 +177,7 @@ public class ADXSink implements Sink<byte[]> {
}
}
- private boolean hasStreamingSucceeded(@NotNull IngestionStatus status) {
+ private boolean hasStreamingSucceeded(@NonNull IngestionStatus status) {
switch (status.status) {
case Succeeded:
case Queued:
@@ -230,7 +230,7 @@ public class ADXSink implements Sink<byte[]> {
}
}
- private @NotNull ADXPulsarEvent getADXPulsarEvent(@NotNull Record<byte[]> record) throws Exception {
+ private @NonNull ADXPulsarEvent getADXPulsarEvent(@NonNull Record<byte[]> record) throws Exception {
ADXPulsarEvent event = new ADXPulsarEvent();
record.getEventTime().ifPresent(time -> event.setEventTime(Instant.ofEpochMilli(time)));
record.getKey().ifPresent(event::setKey);
@@ -254,7 +254,7 @@ public class ADXSink implements Sink<byte[]> {
};
}
- private ConnectionStringBuilder getConnectionStringBuilder(@NotNull ADXSinkConfig adxConfig) {
+ private ConnectionStringBuilder getConnectionStringBuilder(@NonNull ADXSinkConfig adxConfig) {
if (adxConfig.getManagedIdentityId() != null) {
if ("system".equalsIgnoreCase(adxConfig.getManagedIdentityId())) {
diff --git a/pulsar-io/azure-data-explorer/src/test/java/org/apache/pulsar/io/azuredataexplorer/ADXSinkConfigTest.java b/pulsar-io/azure-data-explorer/src/test/java/org/apache/pulsar/io/azuredataexplorer/ADXSinkConfigTest.java
index c05e3b159d8..63aeb1091c3 100644
--- a/pulsar-io/azure-data-explorer/src/test/java/org/apache/pulsar/io/azuredataexplorer/ADXSinkConfigTest.java
+++ b/pulsar-io/azure-data-explorer/src/test/java/org/apache/pulsar/io/azuredataexplorer/ADXSinkConfigTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.pulsar.io.azuredataexplorer;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
import org.testng.annotations.Test;
import java.io.File;
@@ -88,7 +88,7 @@ public class ADXSinkConfigTest {
assertEquals(config.getBatchTimeMs(), 10000);
}
- @NotNull
+ @NonNull
private static Map<String, Object> getConfig() {
Map<String, Object> map = new HashMap<>();
map.put("clusterUrl", "https://somecluster.eastus.kusto.windows.net");
@@ -106,7 +106,7 @@ public class ADXSinkConfigTest {
return map;
}
- private @NotNull File readSinkConfig(String name) {
+ private @NonNull File readSinkConfig(String name) {
ClassLoader classLoader = getClass().getClassLoader();
return new File(Objects.requireNonNull(classLoader.getResource(name)).getFile());
}
diff --git a/pulsar-io/core/pom.xml b/pulsar-io/core/pom.xml
index e595f7229ba..01dd5ecbfb3 100644
--- a/pulsar-io/core/pom.xml
+++ b/pulsar-io/core/pom.xml
@@ -36,6 +36,10 @@
<artifactId>pulsar-functions-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jspecify</groupId>
+ <artifactId>jspecify</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithExtensibleLoadManagerTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithExtensibleLoadManagerTest.java
index 3567c8264f1..f0f8a3bbcae 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithExtensibleLoadManagerTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithExtensibleLoadManagerTest.java
@@ -66,7 +66,7 @@ import org.apache.pulsar.common.naming.TopicDomain;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.net.ServiceURI;
import org.apache.pulsar.metadata.impl.ZKMetadataStore;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
import org.mockito.Mockito;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -134,7 +134,7 @@ public class ProxyWithExtensibleLoadManagerTest extends MultiBrokerBaseTest {
}
}
- @NotNull
+ @NonNull
private InetSocketAddress getSourceBrokerInetAddress(TopicName topicName) throws PulsarAdminException {
var srcBrokerUrl = admin.lookups().lookupTopic(topicName.toString());
var serviceUri = ServiceURI.create(srcBrokerUrl);
(pulsar) 03/07: [fix][cli] Refactor scripts to detect major Java version and pass correct add-opens parameters (#22927)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit fe164aac3a14653571037d01955dfc79576f2c01
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Wed Jun 19 17:05:39 2024 +0300
[fix][cli] Refactor scripts to detect major Java version and pass correct add-opens parameters (#22927)
(cherry picked from commit e0f545ab0583daf83430ef7a8c6d619c70fe1642)
---
bin/bookkeeper | 40 +++++++++++++++++++--------
bin/function-localrunner | 51 ++++++++++++++++++++++++-----------
bin/pulsar | 55 ++++++++++++++++++++++++-------------
bin/pulsar-admin-common.cmd | 46 +++++++++++++++++++------------
bin/pulsar-admin-common.sh | 32 +++++++++++++++++++---
bin/pulsar-admin.cmd | 5 ++--
bin/pulsar-client.cmd | 5 ++--
bin/pulsar-perf | 17 +++++++++---
bin/pulsar-perf.cmd | 66 ++++++---------------------------------------
bin/pulsar-shell.cmd | 6 ++---
10 files changed, 188 insertions(+), 135 deletions(-)
diff --git a/bin/bookkeeper b/bin/bookkeeper
index 0cc07dd49ab..668c5d4db70 100755
--- a/bin/bookkeeper
+++ b/bin/bookkeeper
@@ -69,6 +69,29 @@ else
JAVA=$JAVA_HOME/bin/java
fi
+# JAVA_MAJOR_VERSION should get set by conf/bkenv.sh, just in case it's not
+if [[ -z $JAVA_MAJOR_VERSION ]]; then
+ for token in $("$JAVA" -version 2>&1 | grep 'version "'); do
+ if [[ $token =~ \"([[:digit:]]+)\.([[:digit:]]+)(.*)\" ]]; then
+ if [[ ${BASH_REMATCH[1]} == "1" ]]; then
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[2]}
+ else
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[1]}
+ fi
+ break
+ elif [[ $token =~ \"([[:digit:]]+)(.*)\" ]]; then
+ # Process the java versions without dots, such as `17-internal`.
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[1]}
+ break
+ fi
+ done
+fi
+
+if [[ $JAVA_MAJOR_VERSION -lt 17 ]]; then
+ echo "Error: Bookkeeper included in Pulsar requires Java 17 or later." 1>&2
+ exit 1
+fi
+
# exclude tests jar
RELEASE_JAR=`ls $BK_HOME/bookkeeper-server-*.jar 2> /dev/null | grep -v tests | tail -1`
if [ $? == 0 ]; then
@@ -168,17 +191,12 @@ OPTS="$OPTS -Dlog4j.configurationFile=`basename $BOOKIE_LOG_CONF`"
# Allow Netty to use reflection access
OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
-IS_JAVA_8=$( $JAVA -version 2>&1 | grep version | grep '"1\.8' )
-# Start --add-opens options
-# '--add-opens' option is not supported in jdk8
-if [[ -z "$IS_JAVA_8" ]]; then
- # BookKeeper: enable posix_fadvise usage and DirectMemoryCRC32Digest (https://github.com/apache/bookkeeper/pull/3234)
- OPTS="$OPTS --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED"
- # Netty: enable java.nio.DirectByteBuffer
- # https://github.com/netty/netty/blob/4.1/common/src/main/java/io/netty/util/internal/PlatformDependent0.java
- # https://github.com/netty/netty/issues/12265
- OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
-fi
+# BookKeeper: enable posix_fadvise usage and DirectMemoryCRC32Digest (https://github.com/apache/bookkeeper/pull/3234)
+OPTS="$OPTS --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED"
+# Netty: enable java.nio.DirectByteBuffer
+# https://github.com/netty/netty/blob/4.1/common/src/main/java/io/netty/util/internal/PlatformDependent0.java
+# https://github.com/netty/netty/issues/12265
+OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
OPTS="-cp $BOOKIE_CLASSPATH $OPTS"
diff --git a/bin/function-localrunner b/bin/function-localrunner
index 84de2803794..a47f3efa486 100755
--- a/bin/function-localrunner
+++ b/bin/function-localrunner
@@ -34,6 +34,21 @@ else
JAVA=$JAVA_HOME/bin/java
fi
+for token in $("$JAVA" -version 2>&1 | grep 'version "'); do
+ if [[ $token =~ \"([[:digit:]]+)\.([[:digit:]]+)(.*)\" ]]; then
+ if [[ ${BASH_REMATCH[1]} == "1" ]]; then
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[2]}
+ else
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[1]}
+ fi
+ break
+ elif [[ $token =~ \"([[:digit:]]+)(.*)\" ]]; then
+ # Process the java versions without dots, such as `17-internal`.
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[1]}
+ break
+ fi
+done
+
PULSAR_MEM=${PULSAR_MEM:-"-Xmx128m -XX:MaxDirectMemorySize=128m"}
# Garbage collection options
@@ -47,15 +62,18 @@ if [ -z "$PULSAR_GC" ]; then
fi
# Garbage collection log.
-IS_JAVA_8=$( $JAVA -version 2>&1 | grep version | grep '"1\.8' )
-if [[ -z "$IS_JAVA_8" ]]; then
- # >= JDK 9
- PULSAR_GC_LOG=${PULSAR_GC_LOG:-"-Xlog:gc:logs/pulsar_gc_%p.log:time,uptime:filecount=10,filesize=20M"}
- # '--add-opens' option is not supported in JDK 1.8
- OPTS="$OPTS --add-opens java.base/sun.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED"
-else
- # == JDK 1.8
- PULSAR_GC_LOG=${PULSAR_GC_LOG:-"-Xloggc:logs/pulsar_gc_%p.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=20M"}
+PULSAR_GC_LOG_DIR=${PULSAR_GC_LOG_DIR:-logs}
+if [[ -z "$PULSAR_GC_LOG" ]]; then
+ if [[ $JAVA_MAJOR_VERSION -gt 8 ]]; then
+ PULSAR_GC_LOG="-Xlog:gc*,safepoint:${PULSAR_GC_LOG_DIR}/pulsar_gc_%p.log:time,uptime,tags:filecount=10,filesize=20M"
+ if [[ $JAVA_MAJOR_VERSION -ge 17 ]]; then
+ # Use async logging on Java 17+ https://bugs.openjdk.java.net/browse/JDK-8264323
+ PULSAR_GC_LOG="-Xlog:async ${PULSAR_GC_LOG}"
+ fi
+ else
+ # Java 8 gc log options
+ PULSAR_GC_LOG="-Xloggc:${PULSAR_GC_LOG_DIR}/pulsar_gc_%p.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=20M"
+ fi
fi
# Extra options to be passed to the jvm
@@ -97,13 +115,16 @@ OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF`"
# Allow Netty to use reflection access
OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
+OPTS="$OPTS -Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true"
+
+if [[ $JAVA_MAJOR_VERSION -gt 8 ]]; then
+ # Required by Pulsar client optimized checksum calculation on other than Linux x86_64 platforms
+ # reflection access to java.util.zip.CRC32C
+ OPTS="$OPTS --add-opens java.base/java.util.zip=ALL-UNNAMED"
+fi
-# Start --add-opens options
-# '--add-opens' option is not supported in jdk8
-if [[ -z "$IS_JAVA_8" ]]; then
- # Netty: enable java.nio.DirectByteBuffer
- # https://github.com/netty/netty/blob/4.1/common/src/main/java/io/netty/util/internal/PlatformDependent0.java
- # https://github.com/netty/netty/issues/12265
+if [[ $JAVA_MAJOR_VERSION -ge 11 ]]; then
+ # Required by Netty for optimized direct byte buffer access
OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
fi
diff --git a/bin/pulsar b/bin/pulsar
index 7b5ee6c454d..ceea9ff26e7 100755
--- a/bin/pulsar
+++ b/bin/pulsar
@@ -129,6 +129,29 @@ else
JAVA=$JAVA_HOME/bin/java
fi
+# JAVA_MAJOR_VERSION should get set by conf/pulsar_env.sh, just in case it's not
+if [[ -z $JAVA_MAJOR_VERSION ]]; then
+ for token in $("$JAVA" -version 2>&1 | grep 'version "'); do
+ if [[ $token =~ \"([[:digit:]]+)\.([[:digit:]]+)(.*)\" ]]; then
+ if [[ ${BASH_REMATCH[1]} == "1" ]]; then
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[2]}
+ else
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[1]}
+ fi
+ break
+ elif [[ $token =~ \"([[:digit:]]+)(.*)\" ]]; then
+ # Process the java versions without dots, such as `17-internal`.
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[1]}
+ break
+ fi
+ done
+fi
+
+if [[ $JAVA_MAJOR_VERSION -lt 17 ]]; then
+ echo "Error: Pulsar requires Java 17 or later." 1>&2
+ exit 1
+fi
+
# exclude tests jar
RELEASE_JAR=`ls $PULSAR_HOME/pulsar-*.jar 2> /dev/null | grep -v tests | tail -1`
if [ $? == 0 ]; then
@@ -254,27 +277,21 @@ OPTS="$OPTS -Djute.maxbuffer=10485760 -Djava.net.preferIPv4Stack=true"
# Enable TCP keepalive for all Zookeeper client connections
OPTS="$OPTS -Dzookeeper.clientTcpKeepAlive=true"
+# BookKeeper: enable posix_fadvise usage and DirectMemoryCRC32Digest (https://github.com/apache/bookkeeper/pull/3234)
+OPTS="$OPTS --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED"
+# Required by JvmDefaultGCMetricsLogger & MBeanStatsGenerator
+OPTS="$OPTS --add-opens java.management/sun.management=ALL-UNNAMED"
+# Required by MBeanStatsGenerator
+OPTS="$OPTS --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED"
# Allow Netty to use reflection access
OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
-IS_JAVA_8=$( $JAVA -version 2>&1 | grep version | grep '"1\.8' )
-# Start --add-opens options
-# '--add-opens' option is not supported in jdk8
-if [[ -z "$IS_JAVA_8" ]]; then
- # BookKeeper: enable posix_fadvise usage and DirectMemoryCRC32Digest (https://github.com/apache/bookkeeper/pull/3234)
- OPTS="$OPTS --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED"
- # Netty: enable java.nio.DirectByteBuffer
- # https://github.com/netty/netty/blob/4.1/common/src/main/java/io/netty/util/internal/PlatformDependent0.java
- # https://github.com/netty/netty/issues/12265
- OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
- # netty.DnsResolverUtil
- OPTS="$OPTS --add-opens java.base/sun.net=ALL-UNNAMED"
- # JvmDefaultGCMetricsLogger & MBeanStatsGenerator
- OPTS="$OPTS --add-opens java.management/sun.management=ALL-UNNAMED"
- # MBeanStatsGenerator
- OPTS="$OPTS --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED"
- # LinuxInfoUtils
- OPTS="$OPTS --add-opens java.base/jdk.internal.platform=ALL-UNNAMED"
-fi
+OPTS="$OPTS -Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true"
+# Netty: enable java.nio.DirectByteBuffer
+# https://github.com/netty/netty/blob/4.1/common/src/main/java/io/netty/util/internal/PlatformDependent0.java
+# https://github.com/netty/netty/issues/12265
+OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
+# Required by LinuxInfoUtils
+OPTS="$OPTS --add-opens java.base/jdk.internal.platform=ALL-UNNAMED"
OPTS="-cp $PULSAR_CLASSPATH $OPTS"
diff --git a/bin/pulsar-admin-common.cmd b/bin/pulsar-admin-common.cmd
index 013d9ef4a55..c45800fd7bb 100644
--- a/bin/pulsar-admin-common.cmd
+++ b/bin/pulsar-admin-common.cmd
@@ -19,7 +19,7 @@
@echo off
-if "%JAVA_HOME%" == "" (
+if not defined JAVA_HOME (
for %%i in (java.exe) do set "JAVACMD=%%~$PATH:i"
) else (
set "JAVACMD=%JAVA_HOME%\bin\java.exe"
@@ -28,16 +28,28 @@ if "%JAVA_HOME%" == "" (
if not exist "%JAVACMD%" (
echo The JAVA_HOME environment variable is not defined correctly, so Pulsar CLI cannot be started. >&2
echo JAVA_HOME is set to "%JAVA_HOME%", but "%JAVACMD%" does not exist. >&2
- goto error
+ exit /b 1
)
+set JAVA_MAJOR_VERSION=0
+REM Requires "setlocal enabledelayedexpansion" to work
+for /f tokens^=3 %%g in ('"!JAVACMD!" -version 2^>^&1 ^| findstr /i version') do (
+ set JAVA_MAJOR_VERSION=%%g
+)
+set JAVA_MAJOR_VERSION=%JAVA_MAJOR_VERSION:"=%
+for /f "delims=.-_ tokens=1-2" %%v in ("%JAVA_MAJOR_VERSION%") do (
+ if /I "%%v" EQU "1" (
+ set JAVA_MAJOR_VERSION=%%w
+ ) else (
+ set JAVA_MAJOR_VERSION=%%v
+ )
+)
for %%i in ("%~dp0.") do SET "SCRIPT_PATH=%%~fi"
set "PULSAR_HOME_DIR=%SCRIPT_PATH%\..\"
for %%i in ("%PULSAR_HOME_DIR%.") do SET "PULSAR_HOME=%%~fi"
set "PULSAR_CLASSPATH=%PULSAR_CLASSPATH%;%PULSAR_HOME%\lib\*"
-
if "%PULSAR_CLIENT_CONF%" == "" set "PULSAR_CLIENT_CONF=%PULSAR_HOME%\conf\client.conf"
if "%PULSAR_LOG_CONF%" == "" set "PULSAR_LOG_CONF=%PULSAR_HOME%\conf\log4j2.yaml"
@@ -50,18 +62,21 @@ set "PULSAR_CLASSPATH=%PULSAR_CLASSPATH%;%PULSAR_LOG_CONF_DIR%"
set "OPTS=%OPTS% -Dlog4j.configurationFile="%PULSAR_LOG_CONF_BASENAME%""
set "OPTS=%OPTS% -Djava.net.preferIPv4Stack=true"
-set "isjava8=false"
-FOR /F "tokens=*" %%g IN ('"java -version 2>&1"') do (
- echo %%g|find "version" >nul
- if errorlevel 0 (
- echo %%g|find "1.8" >nul
- if errorlevel 0 (
- set "isjava8=true"
- )
- )
+REM Allow Netty to use reflection access
+set "OPTS=%OPTS% -Dio.netty.tryReflectionSetAccessible=true"
+set "OPTS=%OPTS% -Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true"
+
+if %JAVA_MAJOR_VERSION% GTR 8 (
+ set "OPTS=%OPTS% --add-opens java.base/sun.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED"
+ REM Required by Pulsar client optimized checksum calculation on other than Linux x86_64 platforms
+ REM reflection access to java.util.zip.CRC32C
+ set "OPTS=%OPTS% --add-opens java.base/java.util.zip=ALL-UNNAMED"
)
-if "%isjava8%" == "false" set "OPTS=%OPTS% --add-opens java.base/sun.net=ALL-UNNAMED"
+if %JAVA_MAJOR_VERSION% GEQ 11 (
+ REM Required by Netty for optimized direct byte buffer access
+ set "OPTS=%OPTS% --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
+)
set "OPTS=-cp "%PULSAR_CLASSPATH%" %OPTS%"
set "OPTS=%OPTS% %PULSAR_EXTRA_OPTS%"
@@ -82,7 +97,4 @@ if not "%PULSAR_LOG_ROOT_LEVEL%" == "" (
)
)
set "OPTS=%OPTS% -Dpulsar.log.immediateFlush=%PULSAR_LOG_IMMEDIATE_FLUSH%"
-set "OPTS=%OPTS% -Dpulsar.routing.appender.default=%PULSAR_ROUTING_APPENDER_DEFAULT%"
-
-:error
-exit /b 1
+set "OPTS=%OPTS% -Dpulsar.routing.appender.default=%PULSAR_ROUTING_APPENDER_DEFAULT%"
\ No newline at end of file
diff --git a/bin/pulsar-admin-common.sh b/bin/pulsar-admin-common.sh
index 8aa21c00f63..336ff43c1a8 100755
--- a/bin/pulsar-admin-common.sh
+++ b/bin/pulsar-admin-common.sh
@@ -37,6 +37,21 @@ else
JAVA=$JAVA_HOME/bin/java
fi
+for token in $("$JAVA" -version 2>&1 | grep 'version "'); do
+ if [[ $token =~ \"([[:digit:]]+)\.([[:digit:]]+)(.*)\" ]]; then
+ if [[ ${BASH_REMATCH[1]} == "1" ]]; then
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[2]}
+ else
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[1]}
+ fi
+ break
+ elif [[ $token =~ \"([[:digit:]]+)(.*)\" ]]; then
+ # Process the java versions without dots, such as `17-internal`.
+ JAVA_MAJOR_VERSION=${BASH_REMATCH[1]}
+ break
+ fi
+done
+
# exclude tests jar
RELEASE_JAR=`ls $PULSAR_HOME/pulsar-*.jar 2> /dev/null | grep -v tests | tail -1`
if [ $? == 0 ]; then
@@ -91,11 +106,20 @@ PULSAR_CLASSPATH="`dirname $PULSAR_LOG_CONF`:$PULSAR_CLASSPATH"
OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF`"
OPTS="$OPTS -Djava.net.preferIPv4Stack=true"
-IS_JAVA_8=$( $JAVA -version 2>&1 | grep version | grep '"1\.8' )
-# Start --add-opens options
-# '--add-opens' option is not supported in jdk8
-if [[ -z "$IS_JAVA_8" ]]; then
+# Allow Netty to use reflection access
+OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
+OPTS="$OPTS -Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true"
+
+if [[ $JAVA_MAJOR_VERSION -gt 8 ]]; then
OPTS="$OPTS --add-opens java.base/sun.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED"
+ # Required by Pulsar client optimized checksum calculation on other than Linux x86_64 platforms
+ # reflection access to java.util.zip.CRC32C
+ OPTS="$OPTS --add-opens java.base/java.util.zip=ALL-UNNAMED"
+fi
+
+if [[ $JAVA_MAJOR_VERSION -ge 11 ]]; then
+ # Required by Netty for optimized direct byte buffer access
+ OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
fi
OPTS="-cp $PULSAR_CLASSPATH $OPTS"
diff --git a/bin/pulsar-admin.cmd b/bin/pulsar-admin.cmd
index 45bd8d4541f..e29d804d70c 100644
--- a/bin/pulsar-admin.cmd
+++ b/bin/pulsar-admin.cmd
@@ -18,7 +18,7 @@
@REM
@echo off
-
+setlocal enabledelayedexpansion
for %%i in ("%~dp0.") do SET "SCRIPT_PATH=%%~fi"
set "PULSAR_HOME_DIR=%SCRIPT_PATH%\..\"
for %%i in ("%PULSAR_HOME_DIR%.") do SET "PULSAR_HOME=%%~fi"
@@ -27,4 +27,5 @@ if ERRORLEVEL 1 (
exit /b 1
)
cd "%PULSAR_HOME%"
-"%JAVACMD%" %OPTS% org.apache.pulsar.admin.cli.PulsarAdminTool %PULSAR_CLIENT_CONF% %*
\ No newline at end of file
+"%JAVACMD%" %OPTS% org.apache.pulsar.admin.cli.PulsarAdminTool %PULSAR_CLIENT_CONF% %*
+endlocal
\ No newline at end of file
diff --git a/bin/pulsar-client.cmd b/bin/pulsar-client.cmd
index 9e3cef45a25..9cacf71cc3a 100644
--- a/bin/pulsar-client.cmd
+++ b/bin/pulsar-client.cmd
@@ -18,7 +18,7 @@
@REM
@echo off
-
+setlocal enabledelayedexpansion
for %%i in ("%~dp0.") do SET "SCRIPT_PATH=%%~fi"
set "PULSAR_HOME_DIR=%SCRIPT_PATH%\..\"
for %%i in ("%PULSAR_HOME_DIR%.") do SET "PULSAR_HOME=%%~fi"
@@ -27,4 +27,5 @@ if ERRORLEVEL 1 (
exit /b 1
)
cd "%PULSAR_HOME%"
-"%JAVACMD%" %OPTS% org.apache.pulsar.client.cli.PulsarClientTool %PULSAR_CLIENT_CONF% %*
\ No newline at end of file
+"%JAVACMD%" %OPTS% org.apache.pulsar.client.cli.PulsarClientTool %PULSAR_CLIENT_CONF% %*
+endlocal
\ No newline at end of file
diff --git a/bin/pulsar-perf b/bin/pulsar-perf
index d479a0b6cde..e785cc58580 100755
--- a/bin/pulsar-perf
+++ b/bin/pulsar-perf
@@ -103,11 +103,20 @@ PULSAR_CLASSPATH="$PULSAR_JAR:$PULSAR_CLASSPATH:$PULSAR_EXTRA_CLASSPATH"
PULSAR_CLASSPATH="`dirname $PULSAR_LOG_CONF`:$PULSAR_CLASSPATH"
OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF` -Djava.net.preferIPv4Stack=true"
-IS_JAVA_8=$( $JAVA -version 2>&1 | grep version | grep '"1\.8' )
-# Start --add-opens options
-# '--add-opens' option is not supported in jdk8
-if [[ -z "$IS_JAVA_8" ]]; then
+# Allow Netty to use reflection access
+OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
+OPTS="$OPTS -Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true"
+
+if [[ $JAVA_MAJOR_VERSION -gt 8 ]]; then
OPTS="$OPTS --add-opens java.base/sun.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED"
+ # Required by Pulsar client optimized checksum calculation on other than Linux x86_64 platforms
+ # reflection access to java.util.zip.CRC32C
+ OPTS="$OPTS --add-opens java.base/java.util.zip=ALL-UNNAMED"
+fi
+
+if [[ $JAVA_MAJOR_VERSION -ge 11 ]]; then
+ # Required by Netty for optimized direct byte buffer access
+ OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
fi
OPTS="-cp $PULSAR_CLASSPATH $OPTS"
diff --git a/bin/pulsar-perf.cmd b/bin/pulsar-perf.cmd
index f2b33ef6eb8..aaeaa7a2185 100644
--- a/bin/pulsar-perf.cmd
+++ b/bin/pulsar-perf.cmd
@@ -18,67 +18,17 @@
@REM
@echo off
-
-if "%JAVA_HOME%" == "" (
- for %%i in (java.exe) do set "JAVACMD=%%~$PATH:i"
-) else (
- set "JAVACMD=%JAVA_HOME%\bin\java.exe"
-)
-
-if not exist "%JAVACMD%" (
- echo The JAVA_HOME environment variable is not defined correctly, so Pulsar CLI cannot be started. >&2
- echo JAVA_HOME is set to "%JAVA_HOME%", but "%JAVACMD%" does not exist. >&2
- exit /B 1
-)
-
+setlocal enabledelayedexpansion
for %%i in ("%~dp0.") do SET "SCRIPT_PATH=%%~fi"
set "PULSAR_HOME_DIR=%SCRIPT_PATH%\..\"
for %%i in ("%PULSAR_HOME_DIR%.") do SET "PULSAR_HOME=%%~fi"
-set "PULSAR_CLASSPATH=%PULSAR_CLASSPATH%;%PULSAR_HOME%\lib\*"
-
-
-if "%PULSAR_CLIENT_CONF%" == "" set "PULSAR_CLIENT_CONF=%PULSAR_HOME%\conf\client.conf"
-if "%PULSAR_LOG_CONF%" == "" set "PULSAR_LOG_CONF=%PULSAR_HOME%\conf\log4j2.yaml"
-
-set "PULSAR_LOG_CONF_DIR1=%PULSAR_LOG_CONF%\..\"
-for %%i in ("%PULSAR_LOG_CONF_DIR1%.") do SET "PULSAR_LOG_CONF_DIR=%%~fi"
-for %%a in ("%PULSAR_LOG_CONF%") do SET "PULSAR_LOG_CONF_BASENAME=%%~nxa"
-
-set "PULSAR_CLASSPATH=%PULSAR_CLASSPATH%;%PULSAR_LOG_CONF_DIR%"
-if not "%PULSAR_EXTRA_CLASSPATH%" == "" set "PULSAR_CLASSPATH=%PULSAR_CLASSPATH%;%PULSAR_EXTRA_CLASSPATH%"
-
-
-if "%PULSAR_PERFTEST_CONF%" == "" set "PULSAR_PERFTEST_CONF=%PULSAR_CLIENT_CONF%"
-
-
-set "OPTS=%OPTS% -Dlog4j.configurationFile="%PULSAR_LOG_CONF_BASENAME%""
-set "OPTS=%OPTS% -Djava.net.preferIPv4Stack=true"
-
-
-set "OPTS=-cp "%PULSAR_CLASSPATH%" %OPTS%"
-set "OPTS=%OPTS% %PULSAR_EXTRA_OPTS%"
-
-if "%PULSAR_LOG_DIR%" == "" set "PULSAR_LOG_DIR=%PULSAR_HOME%\logs"
-if "%PULSAR_LOG_FILE%" == "" set "PULSAR_LOG_FILE=pulsar-perftest.log"
if "%PULSAR_LOG_APPENDER%" == "" set "PULSAR_LOG_APPENDER=Console"
-if "%PULSAR_LOG_LEVEL%" == "" set "PULSAR_LOG_LEVEL=info"
-if "%PULSAR_LOG_ROOT_LEVEL%" == "" set "PULSAR_LOG_ROOT_LEVEL=%PULSAR_LOG_LEVEL%"
-if "%PULSAR_LOG_IMMEDIATE_FLUSH%" == "" set "PULSAR_LOG_IMMEDIATE_FLUSH=false"
-
-
-set "OPTS=%OPTS% -Dpulsar.log.appender=%PULSAR_LOG_APPENDER%"
-set "OPTS=%OPTS% -Dpulsar.log.dir=%PULSAR_LOG_DIR%"
-set "OPTS=%OPTS% -Dpulsar.log.level=%PULSAR_LOG_LEVEL%"
-set "OPTS=%OPTS% -Dpulsar.log.root.level=%PULSAR_LOG_ROOT_LEVEL%"
-set "OPTS=%OPTS% -Dpulsar.log.immediateFlush=%PULSAR_LOG_IMMEDIATE_FLUSH%"
-
+if "%PULSAR_LOG_FILE%" == "" set "PULSAR_LOG_FILE=pulsar-perftest.log"
+call "%PULSAR_HOME%\bin\pulsar-admin-common.cmd"
+if ERRORLEVEL 1 (
+ exit /b 1
+)
+if "%PULSAR_PERFTEST_CONF%" == "" set "PULSAR_PERFTEST_CONF=%PULSAR_CLIENT_CONF%"
"%JAVACMD%" %OPTS% org.apache.pulsar.testclient.PulsarPerfTestTool "%PULSAR_PERFTEST_CONF%" %*
-
-
-
-:error
-set ERROR_CODE=1
-goto :eof
-
-
+endlocal
diff --git a/bin/pulsar-shell.cmd b/bin/pulsar-shell.cmd
index c339d342895..615408f9c7a 100644
--- a/bin/pulsar-shell.cmd
+++ b/bin/pulsar-shell.cmd
@@ -18,7 +18,7 @@
@REM
@echo off
-
+setlocal enabledelayedexpansion
for %%i in ("%~dp0.") do SET "SCRIPT_PATH=%%~fi"
set "PULSAR_HOME_DIR=%SCRIPT_PATH%\..\"
for %%i in ("%PULSAR_HOME_DIR%.") do SET "PULSAR_HOME=%%~fi"
@@ -26,9 +26,9 @@ call "%PULSAR_HOME%\bin\pulsar-admin-common.cmd"
if ERRORLEVEL 1 (
exit /b 1
)
-
set "OPTS=%OPTS% -Dorg.jline.terminal.jansi=false"
set "OPTS=%OPTS% -Dpulsar.shell.config.default=%cd%"
set "DEFAULT_CONFIG=-Dpulsar.shell.config.default="%PULSAR_CLIENT_CONF%""
cd "%PULSAR_HOME%"
-"%JAVACMD%" %OPTS% %DEFAULT_CONFIG% org.apache.pulsar.shell.PulsarShell %*
\ No newline at end of file
+"%JAVACMD%" %OPTS% %DEFAULT_CONFIG% org.apache.pulsar.shell.PulsarShell %*
+endlocal
\ No newline at end of file
(pulsar) 02/07: [improve][build] Upgrade Lombok to 1.18.38 to support JDK 24 (#24237)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 8c1e96e65af7f4381cf75571c9f915a12197b68b
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri May 2 15:46:38 2025 +0300
[improve][build] Upgrade Lombok to 1.18.38 to support JDK 24 (#24237)
(cherry picked from commit 3be63071e69bb6733e7b03bc55cc967655e3e5a0)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fc4b2989412..c501f1cbebd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,7 +227,7 @@ flexible messaging model and an intuitive client API.</description>
<hppc.version>0.9.1</hppc.version>
<spark-streaming_2.10.version>2.1.0</spark-streaming_2.10.version>
<assertj-core.version>3.24.2</assertj-core.version>
- <lombok.version>1.18.36</lombok.version>
+ <lombok.version>1.18.38</lombok.version>
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
<jaxb-api>2.3.1</jaxb-api>
<jakarta.activation.version>1.2.2</jakarta.activation.version>
(pulsar) 05/07: [improve][build] Upgrade to jacoco 0.8.13 (#24240)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 194f6e80034c8826411060eede68ab7fe6e8253f
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Sat May 3 11:58:04 2025 +0300
[improve][build] Upgrade to jacoco 0.8.13 (#24240)
(cherry picked from commit 6f8bb846f7e5bc9cb4faa045369e272d4cd620a1)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c501f1cbebd..d69144cbe5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,7 +303,7 @@ flexible messaging model and an intuitive client API.</description>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<wagon-ssh-external.version>3.5.3</wagon-ssh-external.version>
<os-maven-plugin.version>1.7.0</os-maven-plugin.version>
- <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+ <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
<spotbugs-maven-plugin.version>4.7.3.6</spotbugs-maven-plugin.version>
<spotbugs.version>4.7.3</spotbugs.version>
<errorprone.version>2.24.0</errorprone.version>
(pulsar) 01/07: [fix][test] Fix resource leaks in PulsarBrokerStarterTest (#24235)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit de825d0efb673bdaca1cac902caa296e89db61d8
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri May 2 14:56:59 2025 +0300
[fix][test] Fix resource leaks in PulsarBrokerStarterTest (#24235)
(cherry picked from commit 3ebf91723e9b35410639c0fbb6643f66a919a4a7)
---
.../src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java
index 4c05a991b7f..7501d558509 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java
@@ -283,6 +283,7 @@ public class PulsarBrokerStarterTest {
*/
@Test
public void testMainWithNoArgument() throws Exception {
+ @Cleanup("shutdown")
BrokerStarter brokerStarter = new BrokerStarter();
@Cleanup
StringWriter err = new StringWriter();
@@ -301,6 +302,7 @@ public class PulsarBrokerStarterTest {
public void testMainRunBookieAndAutoRecoveryNoConfig() throws Exception {
File testConfigFile = createValidBrokerConfigFile();
String[] args = {"-c", testConfigFile.getAbsolutePath(), "-rb", "-ra", "-bc", ""};
+ @Cleanup("shutdown")
BrokerStarter starter = new BrokerStarter();
@Cleanup
StringWriter err = new StringWriter();
@@ -319,6 +321,7 @@ public class PulsarBrokerStarterTest {
public void testMainRunBookieRecoveryNoConfig() throws Exception {
File testConfigFile = createValidBrokerConfigFile();
String[] args = {"-c", testConfigFile.getAbsolutePath(), "-ra", "-bc", ""};
+ @Cleanup("shutdown")
BrokerStarter starter = new BrokerStarter();
@Cleanup
StringWriter err = new StringWriter();
@@ -336,6 +339,7 @@ public class PulsarBrokerStarterTest {
public void testMainRunBookieNoConfig() throws Exception {
File testConfigFile = createValidBrokerConfigFile();
String[] args = {"-c", testConfigFile.getAbsolutePath(), "-rb", "-bc", ""};
+ @Cleanup("shutdown")
BrokerStarter starter = new BrokerStarter();
@Cleanup
StringWriter err = new StringWriter();
@@ -353,6 +357,7 @@ public class PulsarBrokerStarterTest {
public void testMainEnableRunBookieThroughBrokerConfig() throws Exception {
File testConfigFile = createValidBrokerConfigFile();
String[] args = {"-c", testConfigFile.getAbsolutePath()};
+ @Cleanup("shutdown")
BrokerStarter starter = new BrokerStarter();
@Cleanup
StringWriter err = new StringWriter();
(pulsar) 04/07: [improve] Adapt startup scripts for Java 24 changes (#24236)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 04a53aa6274513111117246c2eb8b1b0d380c04e
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Sat May 3 11:06:28 2025 +0300
[improve] Adapt startup scripts for Java 24 changes (#24236)
(cherry picked from commit 7e67290a12519fb1cbb614e426687dee4d61d439)
---
bin/bookkeeper | 7 +++++++
bin/function-localrunner | 7 ++++++-
bin/pulsar | 8 ++++++++
bin/pulsar-admin-common.cmd | 6 ++++++
bin/pulsar-admin-common.sh | 5 +++++
bin/pulsar-perf | 5 +++++
conf/bkenv.sh | 2 +-
conf/pulsar_env.sh | 2 +-
src/pulsar-io-gen.sh | 5 +++++
9 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/bin/bookkeeper b/bin/bookkeeper
index 668c5d4db70..c0888b6a0c3 100755
--- a/bin/bookkeeper
+++ b/bin/bookkeeper
@@ -197,11 +197,18 @@ OPTS="$OPTS --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java
# https://github.com/netty/netty/blob/4.1/common/src/main/java/io/netty/util/internal/PlatformDependent0.java
# https://github.com/netty/netty/issues/12265
OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
+# Required by RocksDB java.lang.System::loadLibrary call
+OPTS="$OPTS --enable-native-access=ALL-UNNAMED"
OPTS="-cp $BOOKIE_CLASSPATH $OPTS"
# Disable ipv6 as it can cause issues
OPTS="$OPTS -Djava.net.preferIPv4Stack=true"
+# Required to allow sun.misc.Unsafe on JDK 24 without warnings
+# Also required for enabling unsafe memory access for Netty since 4.1.121.Final
+if [[ $JAVA_MAJOR_VERSION -ge 23 ]]; then
+ OPTS="--sun-misc-unsafe-memory-access=allow $OPTS"
+fi
OPTS="$OPTS $BOOKIE_MEM $BOOKIE_GC $BOOKIE_GC_LOG $BOOKIE_EXTRA_OPTS"
diff --git a/bin/function-localrunner b/bin/function-localrunner
index a47f3efa486..8e2f159ea37 100755
--- a/bin/function-localrunner
+++ b/bin/function-localrunner
@@ -54,7 +54,7 @@ PULSAR_MEM=${PULSAR_MEM:-"-Xmx128m -XX:MaxDirectMemorySize=128m"}
# Garbage collection options
if [ -z "$PULSAR_GC" ]; then
PULSAR_GC="-XX:+PerfDisableSharedMem -XX:+AlwaysPreTouch"
- if [[ $JAVA_MAJOR_VERSION -ge 21 ]]; then
+ if [[ $JAVA_MAJOR_VERSION -eq 21 || $JAVA_MAJOR_VERSION -eq 22 ]]; then
PULSAR_GC="-XX:+UseZGC -XX:+ZGenerational ${PULSAR_GC}"
else
PULSAR_GC="-XX:+UseZGC ${PULSAR_GC}"
@@ -132,6 +132,11 @@ fi
# rarely needed when trying to list many z-nodes under a
# directory)
OPTS="$OPTS -Djute.maxbuffer=10485760 -Djava.net.preferIPv4Stack=true"
+# Required to allow sun.misc.Unsafe on JDK 24 without warnings
+# Also required for enabling unsafe memory access for Netty since 4.1.121.Final
+if [[ $JAVA_MAJOR_VERSION -ge 23 ]]; then
+ OPTS="--sun-misc-unsafe-memory-access=allow $OPTS"
+fi
OPTS="-cp $PULSAR_CLASSPATH $OPTS"
diff --git a/bin/pulsar b/bin/pulsar
index ceea9ff26e7..5666b6b534e 100755
--- a/bin/pulsar
+++ b/bin/pulsar
@@ -274,6 +274,12 @@ OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF`"
# rarely needed when trying to list many z-nodes under a
# directory)
OPTS="$OPTS -Djute.maxbuffer=10485760 -Djava.net.preferIPv4Stack=true"
+# Required to allow sun.misc.Unsafe on JDK 24 without warnings
+# Also required for enabling unsafe memory access for Netty since 4.1.121.Final
+if [[ $JAVA_MAJOR_VERSION -ge 23 ]]; then
+ OPTS="--sun-misc-unsafe-memory-access=allow $OPTS"
+fi
+
# Enable TCP keepalive for all Zookeeper client connections
OPTS="$OPTS -Dzookeeper.clientTcpKeepAlive=true"
@@ -292,6 +298,8 @@ OPTS="$OPTS -Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true"
OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED"
# Required by LinuxInfoUtils
OPTS="$OPTS --add-opens java.base/jdk.internal.platform=ALL-UNNAMED"
+# Required by RocksDB java.lang.System::loadLibrary call
+OPTS="$OPTS --enable-native-access=ALL-UNNAMED"
OPTS="-cp $PULSAR_CLASSPATH $OPTS"
diff --git a/bin/pulsar-admin-common.cmd b/bin/pulsar-admin-common.cmd
index c45800fd7bb..17200cf38d9 100644
--- a/bin/pulsar-admin-common.cmd
+++ b/bin/pulsar-admin-common.cmd
@@ -66,6 +66,12 @@ REM Allow Netty to use reflection access
set "OPTS=%OPTS% -Dio.netty.tryReflectionSetAccessible=true"
set "OPTS=%OPTS% -Dorg.apache.pulsar.shade.io.netty.tryReflectionSetAccessible=true"
+if %JAVA_MAJOR_VERSION% GTR 23 (
+ REM Required to allow sun.misc.Unsafe on JDK 24 without warnings
+ REM Also required for enabling unsafe memory access for Netty since 4.1.121.Final
+ set "OPTS=--sun-misc-unsafe-memory-access=allow %OPTS%"
+)
+
if %JAVA_MAJOR_VERSION% GTR 8 (
set "OPTS=%OPTS% --add-opens java.base/sun.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED"
REM Required by Pulsar client optimized checksum calculation on other than Linux x86_64 platforms
diff --git a/bin/pulsar-admin-common.sh b/bin/pulsar-admin-common.sh
index 336ff43c1a8..b441e0ceb41 100755
--- a/bin/pulsar-admin-common.sh
+++ b/bin/pulsar-admin-common.sh
@@ -105,6 +105,11 @@ PULSAR_CLASSPATH="$PULSAR_JAR:$PULSAR_CLASSPATH:$PULSAR_EXTRA_CLASSPATH"
PULSAR_CLASSPATH="`dirname $PULSAR_LOG_CONF`:$PULSAR_CLASSPATH"
OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF`"
OPTS="$OPTS -Djava.net.preferIPv4Stack=true"
+# Required to allow sun.misc.Unsafe on JDK 24 without warnings
+# Also required for enabling unsafe memory access for Netty since 4.1.121.Final
+if [[ $JAVA_MAJOR_VERSION -ge 23 ]]; then
+ OPTS="--sun-misc-unsafe-memory-access=allow $OPTS"
+fi
# Allow Netty to use reflection access
OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
diff --git a/bin/pulsar-perf b/bin/pulsar-perf
index e785cc58580..409e4ae9b2d 100755
--- a/bin/pulsar-perf
+++ b/bin/pulsar-perf
@@ -102,6 +102,11 @@ fi
PULSAR_CLASSPATH="$PULSAR_JAR:$PULSAR_CLASSPATH:$PULSAR_EXTRA_CLASSPATH"
PULSAR_CLASSPATH="`dirname $PULSAR_LOG_CONF`:$PULSAR_CLASSPATH"
OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF` -Djava.net.preferIPv4Stack=true"
+# Required to allow sun.misc.Unsafe on JDK 24 without warnings
+# Also required for enabling unsafe memory access for Netty since 4.1.121.Final
+if [[ $JAVA_MAJOR_VERSION -ge 23 ]]; then
+ OPTS="--sun-misc-unsafe-memory-access=allow $OPTS"
+fi
# Allow Netty to use reflection access
OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
diff --git a/conf/bkenv.sh b/conf/bkenv.sh
index 8beea47cee3..6b7cfe6d2cb 100644
--- a/conf/bkenv.sh
+++ b/conf/bkenv.sh
@@ -61,7 +61,7 @@ done
BOOKIE_GC="${BOOKIE_GC:-${PULSAR_GC}}"
if [ -z "$BOOKIE_GC" ]; then
BOOKIE_GC="-XX:+PerfDisableSharedMem -XX:+AlwaysPreTouch"
- if [[ $JAVA_MAJOR_VERSION -ge 21 ]]; then
+ if [[ $JAVA_MAJOR_VERSION -eq 21 || $JAVA_MAJOR_VERSION -eq 22 ]]; then
BOOKIE_GC="-XX:+UseZGC -XX:+ZGenerational ${BOOKIE_GC}"
else
BOOKIE_GC="-XX:+UseZGC ${BOOKIE_GC}"
diff --git a/conf/pulsar_env.sh b/conf/pulsar_env.sh
index f95d0ac83c1..2189c887623 100755
--- a/conf/pulsar_env.sh
+++ b/conf/pulsar_env.sh
@@ -67,7 +67,7 @@ done
# Garbage collection options
if [ -z "$PULSAR_GC" ]; then
PULSAR_GC="-XX:+PerfDisableSharedMem -XX:+AlwaysPreTouch"
- if [[ $JAVA_MAJOR_VERSION -ge 21 ]]; then
+ if [[ $JAVA_MAJOR_VERSION -eq 21 || $JAVA_MAJOR_VERSION -eq 22 ]]; then
PULSAR_GC="-XX:+UseZGC -XX:+ZGenerational ${PULSAR_GC}"
else
PULSAR_GC="-XX:+UseZGC ${PULSAR_GC}"
diff --git a/src/pulsar-io-gen.sh b/src/pulsar-io-gen.sh
index a3083e8f2b5..399004c0db7 100755
--- a/src/pulsar-io-gen.sh
+++ b/src/pulsar-io-gen.sh
@@ -109,6 +109,11 @@ fi
PULSAR_CLASSPATH="$PULSAR_JAR:$PULSAR_HOME/pulsar-io/docs/target/pulsar-io-docs.jar:$PULSAR_CLASSPATH:$PULSAR_EXTRA_CLASSPATH"
PULSAR_CLASSPATH="`dirname $PULSAR_LOG_CONF`:$PULSAR_CLASSPATH"
OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF` -Djava.net.preferIPv4Stack=true"
+# Required to allow sun.misc.Unsafe on JDK 24 without warnings
+# Also required for enabling unsafe memory access for Netty since 4.1.121.Final
+if [[ $JAVA_MAJOR_VERSION -ge 23 ]]; then
+ OPTS="--sun-misc-unsafe-memory-access=allow $OPTS"
+fi
OPTS="-cp $PULSAR_CLASSPATH $OPTS"
OPTS="$OPTS $PULSAR_EXTRA_OPTS"
(pulsar) 07/07: [improve][build] Upgrade SpotBugs to 4.9.x (#24243)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 7f977d7cd0e475ddd89076864ec627b33b6c68ea
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Sat May 3 16:20:25 2025 +0300
[improve][build] Upgrade SpotBugs to 4.9.x (#24243)
(cherry picked from commit 53224ecc8e1e303728321d39c294af6dc10efd88)
---
pom.xml | 25 ++++++++++++++--------
.../data/stats/NonPersistentTopicStatsImpl.java | 2 --
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0230275df8f..e5a157f4737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,8 +304,8 @@ flexible messaging model and an intuitive client API.</description>
<wagon-ssh-external.version>3.5.3</wagon-ssh-external.version>
<os-maven-plugin.version>1.7.0</os-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
- <spotbugs-maven-plugin.version>4.7.3.6</spotbugs-maven-plugin.version>
- <spotbugs.version>4.7.3</spotbugs.version>
+ <spotbugs-maven-plugin.version>4.9.3.0</spotbugs-maven-plugin.version>
+ <spotbugs.version>4.9.3</spotbugs.version>
<errorprone.version>2.24.0</errorprone.version>
<errorprone-slf4j.version>0.1.21</errorprone-slf4j.version>
<j2objc-annotations.version>1.3</j2objc-annotations.version>
@@ -2254,13 +2254,20 @@ flexible messaging model and an intuitive client API.</description>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${spotbugs-maven-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs</artifactId>
- <version>${spotbugs.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs</artifactId>
+ <version>${spotbugs.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <!--
+ TODO: remove omitted visitors and fix issues.
+ Checks have been omitted to migrate from SpotBugs 4.7.x to 4.9.x for supporting JDK 24 builds.
+ -->
+ <omitVisitors>ConstructorThrow,FindPublicAttributes,SharedVariableAtomicityDetector,UnreadFields,MultipleInstantiationsOfSingletons,InitializeNonnullFieldsInConstructor,FindNullDeref</omitVisitors>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentTopicStatsImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentTopicStatsImpl.java
index 7710c27779b..f3107f77442 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentTopicStatsImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/stats/NonPersistentTopicStatsImpl.java
@@ -117,12 +117,10 @@ public class NonPersistentTopicStatsImpl extends TopicStatsImpl implements NonPe
}
}
- @SuppressFBWarnings(value = "MF_CLASS_MASKS_FIELD", justification = "expected to override")
public Map<String, NonPersistentSubscriptionStats> getSubscriptions() {
return (Map<String, NonPersistentSubscriptionStats>) nonPersistentSubscriptions;
}
- @SuppressFBWarnings(value = "MF_CLASS_MASKS_FIELD", justification = "expected to override")
public Map<String, NonPersistentReplicatorStats> getReplication() {
return (Map<String, NonPersistentReplicatorStats>) nonPersistentReplicators;
}