This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new d21b09f16a8 [improve][build] Fix Lombok, varargs, and other compile
warnings (#25415)
d21b09f16a8 is described below
commit d21b09f16a8b3a34ab58b079468902f2ecc0a9a8
Author: Matteo Merli <[email protected]>
AuthorDate: Fri Mar 27 15:12:52 2026 -0700
[improve][build] Fix Lombok, varargs, and other compile warnings (#25415)
---
.../main/java/org/apache/pulsar/broker/web/WebExecutorThreadPool.java | 2 +-
.../java/org/apache/pulsar/broker/service/AbstractReplicator.java | 1 -
.../org/apache/pulsar/broker/service/persistent/PersistentTopic.java | 3 ++-
.../src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java | 2 +-
.../java/org/apache/pulsar/client/admin/utils/ReflectionUtils.java | 4 ++--
.../src/main/java/org/apache/pulsar/common/functions/Resources.java | 3 +++
.../org/apache/pulsar/common/policies/impl/MinAvailablePolicy.java | 2 ++
.../java/org/apache/pulsar/common/policies/data/TopicPolicies.java | 1 +
.../common/policies/data/stats/NonPersistentTopicStatsImpl.java | 2 --
.../org/apache/pulsar/functions/instance/stats/SinkStatsManager.java | 3 ---
.../apache/pulsar/functions/instance/stats/SourceStatsManager.java | 3 ---
.../pulsar/functions/source/MultiConsumerPulsarSourceConfig.java | 2 ++
.../pulsar/functions/source/SingleConsumerPulsarSourceConfig.java | 2 ++
.../main/java/org/apache/pulsar/functions/worker/WorkerConfig.java | 4 ++++
.../main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java | 2 --
15 files changed, 20 insertions(+), 16 deletions(-)
diff --git
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/WebExecutorThreadPool.java
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/WebExecutorThreadPool.java
index a1d566e135c..432f9027b2d 100644
---
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/WebExecutorThreadPool.java
+++
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/WebExecutorThreadPool.java
@@ -32,7 +32,7 @@ public class WebExecutorThreadPool extends ExecutorThreadPool
{
}
public WebExecutorThreadPool(int maxThreads, String namePrefix, int
queueCapacity) {
- super(maxThreads, Math.min(8, maxThreads), new
BlockingArrayQueue<>(queueCapacity, queueCapacity));
+ super(maxThreads, Math.min(8, maxThreads), new
BlockingArrayQueue<>(queueCapacity));
this.threadFactory = new DefaultThreadFactory(namePrefix);
}
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractReplicator.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractReplicator.java
index bb1d1e08f12..656ed9a4e8a 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractReplicator.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractReplicator.java
@@ -78,7 +78,6 @@ public abstract class AbstractReplicator implements
Replicator {
protected static final AtomicReferenceFieldUpdater<AbstractReplicator,
State> STATE_UPDATER =
AtomicReferenceFieldUpdater.newUpdater(AbstractReplicator.class,
State.class, "state");
@VisibleForTesting
- @Getter
protected volatile State state = State.Disconnected;
private volatile Attributes attributes = null;
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 cb7157314c0..386e49e49de 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
@@ -243,6 +243,7 @@ public class PersistentTopic extends AbstractTopic
implements Topic, AddEntryCal
private Optional<DispatchRateLimiter> dispatchRateLimiter =
Optional.empty();
private final Object dispatchRateLimiterLock = new Object();
private Optional<SubscribeRateLimiter> subscribeRateLimiter =
Optional.empty();
+ private final Object subscribeRateLimiterLock = new Object();
@Getter
private final long backloggedCursorThresholdEntries;
public static final int MESSAGE_RATE_BACKOFF_MS = 1000;
@@ -674,7 +675,7 @@ public class PersistentTopic extends AbstractTopic
implements Topic, AddEntryCal
public void updateSubscribeRateLimiter() {
SubscribeRate subscribeRate = getSubscribeRate();
- synchronized (subscribeRateLimiter) {
+ synchronized (subscribeRateLimiterLock) {
if (isSubscribeRateEnabled(subscribeRate)) {
if (subscribeRateLimiter.isPresent()) {
this.subscribeRateLimiter.get().onSubscribeRateUpdate(subscribeRate);
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 3fe51df90f7..b702e1b4a17 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
@@ -721,7 +721,7 @@ public abstract class PulsarWebResource {
.port(webUrl.get().getPort())
.replaceQueryParam("authoritative", newAuthoritative);
if
(!ExtensibleLoadManagerImpl.isLoadManagerExtensionEnabled(pulsar)) {
-
uriBuilder.replaceQueryParam("destinationBroker", null);
+
uriBuilder.replaceQueryParam("destinationBroker", (Object[]) null);
}
URI redirect = uriBuilder.build();
log.debug("{} is not a service unit
owned", bundle);
diff --git
a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/ReflectionUtils.java
b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/ReflectionUtils.java
index 01f15de9256..c2ed14a64e7 100644
---
a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/ReflectionUtils.java
+++
b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/client/admin/utils/ReflectionUtils.java
@@ -32,8 +32,8 @@ public class ReflectionUtils {
public static <T> T newBuilder(String className) {
return catchExceptions(
() -> (T) ReflectionUtils.getStaticMethod(
- className, "builder", null)
- .invoke(null, null));
+ className, "builder", (Class<?>[]) null)
+ .invoke(null, (Object[]) null));
}
static <T> T catchExceptions(SupplierWithException<T> s) {
diff --git
a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/Resources.java
b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/Resources.java
index f3ffee4047a..bf948af66c1 100644
---
a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/Resources.java
+++
b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/functions/Resources.java
@@ -35,10 +35,13 @@ public class Resources {
private static final Resources DEFAULT = new Resources();
// Default cpu is 1 core
+ @Builder.Default
private Double cpu = 1d;
// Default memory is 1GB
+ @Builder.Default
private Long ram = 1073741824L;
// Default disk is 10GB
+ @Builder.Default
private Long disk = 10737418240L;
public static Resources getDefaultResources() {
diff --git
a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicy.java
b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicy.java
index 4a4fc26f31f..123574b1b35 100644
---
a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicy.java
+++
b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/policies/impl/MinAvailablePolicy.java
@@ -21,6 +21,7 @@ package org.apache.pulsar.common.policies.impl;
import java.util.SortedSet;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.pulsar.common.policies.AutoFailoverPolicy;
import org.apache.pulsar.common.policies.data.AutoFailoverPolicyData;
import org.apache.pulsar.common.policies.data.AutoFailoverPolicyType;
@@ -30,6 +31,7 @@ import org.apache.pulsar.common.policies.data.BrokerStatus;
* Implementation of min available policy.
*/
@Data
+@EqualsAndHashCode(callSuper = false)
@AllArgsConstructor
public class MinAvailablePolicy extends AutoFailoverPolicy {
private static final String MIN_LIMIT_KEY = "min_limit";
diff --git
a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java
b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java
index c9b5e1a3e1e..356e2a4e072 100644
---
a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java
+++
b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java
@@ -51,6 +51,7 @@ public class TopicPolicies implements Cloneable {
private List<SubType> subscriptionTypesEnabled = new ArrayList<>();
private List<String> replicationClusters;
private List<String> shadowTopics;
+ @Builder.Default
private Boolean isGlobal = false;
private PersistencePolicies persistence;
private RetentionPolicies retentionPolicies;
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 f3107f77442..73214203a8e 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
@@ -33,7 +33,6 @@ import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import lombok.Getter;
import org.apache.pulsar.common.policies.data.NonPersistentPublisherStats;
import org.apache.pulsar.common.policies.data.NonPersistentReplicatorStats;
import org.apache.pulsar.common.policies.data.NonPersistentSubscriptionStats;
@@ -51,7 +50,6 @@ public class NonPersistentTopicStatsImpl extends
TopicStatsImpl implements NonPe
* for non-persistent topic: broker drops msg if publisher publishes
messages more than configured max inflight
* messages per connection.
**/
- @Getter
public double msgDropRate;
@JsonIgnore
diff --git
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SinkStatsManager.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SinkStatsManager.java
index 4fae7f9c292..853fe5d9607 100644
---
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SinkStatsManager.java
+++
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SinkStatsManager.java
@@ -24,7 +24,6 @@ import io.prometheus.client.Counter;
import io.prometheus.client.Gauge;
import java.util.Arrays;
import java.util.concurrent.ScheduledExecutorService;
-import lombok.Getter;
import org.apache.pulsar.functions.proto.InstanceCommunication;
public class SinkStatsManager extends ComponentStatsManager {
@@ -82,10 +81,8 @@ public class SinkStatsManager extends ComponentStatsManager {
private Counter.Child statTotalSinkExceptionsChild1min;
private Counter.Child statTotalWrittenChild1min;
- @Getter
private
EvictingQueue<InstanceCommunication.FunctionStatus.ExceptionInformation>
latestSystemExceptions =
EvictingQueue.create(10);
- @Getter
private
EvictingQueue<InstanceCommunication.FunctionStatus.ExceptionInformation>
latestSinkExceptions =
EvictingQueue.create(10);
diff --git
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SourceStatsManager.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SourceStatsManager.java
index b68e1d610f7..b21bb2e943c 100644
---
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SourceStatsManager.java
+++
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/stats/SourceStatsManager.java
@@ -24,7 +24,6 @@ import io.prometheus.client.Counter;
import io.prometheus.client.Gauge;
import java.util.Arrays;
import java.util.concurrent.ScheduledExecutorService;
-import lombok.Getter;
import org.apache.pulsar.functions.proto.InstanceCommunication;
public class SourceStatsManager extends ComponentStatsManager {
@@ -82,10 +81,8 @@ public class SourceStatsManager extends
ComponentStatsManager {
private Counter.Child statTotalSourceExceptionsChild1min;
private Counter.Child statTotalWrittenChild1min;
- @Getter
private
EvictingQueue<InstanceCommunication.FunctionStatus.ExceptionInformation>
latestSystemExceptions =
EvictingQueue.create(10);
- @Getter
private
EvictingQueue<InstanceCommunication.FunctionStatus.ExceptionInformation>
latestSourceExceptions =
EvictingQueue.create(10);
diff --git
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSourceConfig.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSourceConfig.java
index e9125e18fa8..ce6e977cb9c 100644
---
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSourceConfig.java
+++
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/MultiConsumerPulsarSourceConfig.java
@@ -23,10 +23,12 @@ import java.io.IOException;
import java.util.Map;
import java.util.TreeMap;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.pulsar.common.functions.ConsumerConfig;
import org.apache.pulsar.common.util.ObjectMapperFactory;
@Data
+@EqualsAndHashCode(callSuper = false)
public class MultiConsumerPulsarSourceConfig extends PulsarSourceConfig {
private Map<String, ConsumerConfig> topicSchema = new TreeMap<>();
diff --git
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSourceConfig.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSourceConfig.java
index b6b0c3b2e31..7aefbe61ad4 100644
---
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSourceConfig.java
+++
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/SingleConsumerPulsarSourceConfig.java
@@ -22,10 +22,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.util.Map;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.pulsar.common.functions.ConsumerConfig;
import org.apache.pulsar.common.util.ObjectMapperFactory;
@Data
+@EqualsAndHashCode(callSuper = false)
public class SingleConsumerPulsarSourceConfig extends PulsarSourceConfig {
private String topic;
diff --git
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
index 036311ea132..ec217cee271 100644
---
a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
+++
b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
@@ -38,6 +38,7 @@ import java.util.Set;
import java.util.TreeSet;
import lombok.AccessLevel;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import lombok.experimental.Accessors;
@@ -908,6 +909,7 @@ public class WorkerConfig implements Serializable,
PulsarConfiguration {
@Deprecated
@Data
+ @EqualsAndHashCode(callSuper = false)
/**
* @Deprecated in favor for using functionRuntimeFactoryClassName and
functionRuntimeFactoryConfigs
* for specifying the function runtime and configs to use
@@ -924,6 +926,7 @@ public class WorkerConfig implements Serializable,
PulsarConfiguration {
@Deprecated
@Data
+ @EqualsAndHashCode(callSuper = false)
/**
* @Deprecated in favor for using functionRuntimeFactoryClassName and
functionRuntimeFactoryConfigs
* for specifying the function runtime and configs to use
@@ -940,6 +943,7 @@ public class WorkerConfig implements Serializable,
PulsarConfiguration {
@Deprecated
@Data
+ @EqualsAndHashCode(callSuper = false)
/**
* @Deprecated in favor for using functionRuntimeFactoryClassName and
functionRuntimeFactoryConfigs
* for specifying the function runtime and configs to use
diff --git
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java
index 011508567e5..c1bac2f76f5 100644
---
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java
+++
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java
@@ -124,13 +124,11 @@ public class ZKMetadataStore extends
AbstractBatchedMetadataStore
}
@VisibleForTesting
- @SneakyThrows
public ZKMetadataStore(ZooKeeper zkc) {
this(zkc, MetadataStoreConfig.builder().build());
}
@VisibleForTesting
- @SneakyThrows
public ZKMetadataStore(ZooKeeper zkc, MetadataStoreConfig config) {
this(zkc, config, false);
}
