This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4c2cded20c5b45f61711b5955d57e67c38572d50 Author: Shoothzj <[email protected]> AuthorDate: Mon Nov 30 11:39:08 2020 +0800 Fix idea warning (#8588) ### Motivation When open project in idea, it hints there are something to optimize to make clean code ### Modifications - Move the param annotation to it's origin class - The generic can be omit - Unused imports - incorrect log params (cherry picked from commit 77f7965673119ff40c929b065ee837fe2256a221) --- .../org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java | 2 +- .../java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java | 1 - .../org/apache/pulsar/broker/authentication/PulsarSaslServer.java | 1 - .../org/apache/pulsar/broker/cache/ConfigurationCacheService.java | 1 - .../main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java | 2 +- .../java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java | 4 ++-- .../java/org/apache/pulsar/common/naming/NamespaceBundles.java | 2 +- .../src/main/java/org/apache/pulsar/client/cli/CmdProduce.java | 1 - .../java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java | 1 - .../java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java | 1 - .../org/apache/pulsar/client/impl/auth/AuthenticationDataTls.java | 3 --- .../org/apache/pulsar/client/impl/auth/AuthenticationTls.java | 1 - .../apache/pulsar/client/impl/transaction/TransactionImpl.java | 2 -- .../pulsar/functions/runtime/kubernetes/KubernetesRuntime.java | 2 +- .../java/org/apache/pulsar/functions/worker/WorkerConfig.java | 1 - .../java/org/apache/pulsar/functions/utils/ValidatorUtils.java | 4 ---- .../pulsar/functions/utils/functioncache/FunctionCacheEntry.java | 3 --- .../org/apache/pulsar/functions/worker/MembershipManager.java | 7 ------- .../java/org/apache/pulsar/functions/worker/SchedulerManager.java | 2 +- .../apache/pulsar/metadata/impl/zookeeper/ZKMetadataStore.java | 1 - .../main/java/org/apache/pulsar/proxy/server/ProxyService.java | 2 +- .../java/org/apache/pulsar/zookeeper/GlobalZooKeeperCache.java | 1 - .../java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java | 2 +- .../java/org/apache/pulsar/zookeeper/LocalZooKeeperCache.java | 1 - .../apache/pulsar/zookeeper/LocalZooKeeperConnectionService.java | 5 +---- .../pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java | 6 +++--- .../src/main/java/org/apache/pulsar/zookeeper/ZkUtils.java | 8 ++++++-- .../src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java | 6 +++++- .../java/org/apache/pulsar/zookeeper/ZooKeeperChildrenCache.java | 1 - .../java/org/apache/pulsar/zookeeper/ZooKeeperSessionWatcher.java | 1 + 30 files changed, 25 insertions(+), 50 deletions(-) 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 0c69147..ba50d2b 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 @@ -466,7 +466,7 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback { } if (!ManagedLedgerImpl.this.config.isLazyCursorRecovery()) { - log.debug("[{}] Loading cursor {}", name); + log.debug("[{}] Loading cursors", name); for (final String cursorName : consumers) { log.info("[{}] Loading cursor {}", name, cursorName); diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java index 83514a9..f4064e7 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java @@ -37,7 +37,6 @@ import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.Ledge import org.apache.bookkeeper.mledger.proto.MLDataFormats.OffloadContext; import org.apache.bookkeeper.mledger.proto.MLDataFormats.OffloadDriverMetadata; import org.apache.bookkeeper.net.BookieId; -import org.apache.bookkeeper.net.BookieSocketAddress; import org.apache.bookkeeper.proto.DataFormats; @Slf4j diff --git a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/PulsarSaslServer.java b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/PulsarSaslServer.java index 517c1fd..5fc6f26 100644 --- a/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/PulsarSaslServer.java +++ b/pulsar-broker-auth-sasl/src/main/java/org/apache/pulsar/broker/authentication/PulsarSaslServer.java @@ -38,7 +38,6 @@ import javax.security.sasl.SaslServer; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.common.api.AuthData; -import org.apache.pulsar.common.sasl.KerberosName; import org.apache.pulsar.common.sasl.SaslConstants; diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/ConfigurationCacheService.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/ConfigurationCacheService.java index 6fda6cd..87dd671 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/ConfigurationCacheService.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/cache/ConfigurationCacheService.java @@ -41,7 +41,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.fasterxml.jackson.core.type.TypeReference; -import com.google.common.collect.Maps; /** * ConfigurationCacheService maintains a local in-memory cache of all the configurations and policies stored in diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java index 3dba3ee..f64e4c8 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarClusterMetadataSetup.java @@ -363,7 +363,7 @@ public class PulsarClusterMetadataSetup { Long maxVal = ((long) 1) << 32; Long segSize = maxVal / numBundles; List<String> partitions = Lists.newArrayList(); - partitions.add(String.format("0x%08x", 0l)); + partitions.add(String.format("0x%08x", 0L)); Long curPartition = segSize; for (int i = 0; i < numBundles; i++) { if (i != numBundles - 1) { 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 e091616..f06e416 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 @@ -1433,7 +1433,7 @@ public abstract class NamespacesBase extends AdminResource { protected void internalRemovePublishRate() { validateSuperUserAccess(); - log.info("[{}] Remove namespace publish-rate {}/{}", clientAppId(), namespaceName); + log.info("[{}] Remove namespace publish-rate {}/{}", clientAppId(), namespaceName, topicName); Entry<Policies, Stat> policiesNode = null; try { final String path = path(POLICIES, namespaceName.toString()); @@ -2447,7 +2447,7 @@ public abstract class NamespacesBase extends AdminResource { Long maxVal = ((long) 1) << 32; Long segSize = maxVal / numBundles; List<String> partitions = Lists.newArrayList(); - partitions.add(String.format("0x%08x", 0l)); + partitions.add(String.format("0x%08x", 0L)); Long curPartition = segSize; for (int i = 0; i < numBundles; i++) { if (i != numBundles - 1) { diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundles.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundles.java index 9e77f75..607b2cf 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundles.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundles.java @@ -81,7 +81,7 @@ public class NamespaceBundles { lowerBound = upperBound; } } else { - this.partitions = new long[] { 0l }; + this.partitions = new long[] { 0L }; bundles.add(fullBundle); } } diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdProduce.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdProduce.java index 9b67a08..e44eb9f 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdProduce.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdProduce.java @@ -44,7 +44,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.pulsar.client.api.Authentication; import org.apache.pulsar.client.api.AuthenticationDataProvider; import org.apache.pulsar.client.api.ClientBuilder; -import org.apache.pulsar.client.api.CompressionType; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.ProducerBuilder; import org.apache.pulsar.client.api.PulsarClient; diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java index dfce149..e1a9bf9 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java @@ -32,7 +32,6 @@ import java.io.Closeable; import java.util.ArrayDeque; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java index ae6f385..ba6e97d 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java @@ -37,7 +37,6 @@ import org.apache.pulsar.client.api.MessageId; import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.client.api.Schema; import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData; -import org.apache.pulsar.common.api.proto.PulsarApi.IntRange; import org.apache.pulsar.common.api.proto.PulsarApi.MessageIdData; import org.apache.pulsar.common.api.proto.PulsarApi.MessageMetadata; diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataTls.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataTls.java index f11e974..588f614 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataTls.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationDataTls.java @@ -19,8 +19,6 @@ package org.apache.pulsar.client.impl.auth; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.InputStream; import java.security.KeyManagementException; import java.security.PrivateKey; @@ -28,7 +26,6 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.function.Supplier; -import org.apache.commons.compress.utils.IOUtils; import org.apache.pulsar.client.api.AuthenticationDataProvider; import org.apache.pulsar.common.util.FileModifiedTimeUpdater; import org.apache.pulsar.common.util.SecurityUtility; diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationTls.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationTls.java index 326fa46..e5f8361 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationTls.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/AuthenticationTls.java @@ -20,7 +20,6 @@ package org.apache.pulsar.client.impl.auth; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.InputStream; import java.util.Map; import java.util.function.Supplier; diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionImpl.java index 5efb58c..a122ff7 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionImpl.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/transaction/TransactionImpl.java @@ -21,7 +21,6 @@ package org.apache.pulsar.client.impl.transaction; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -31,7 +30,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicLong; import com.google.common.collect.Lists; -import lombok.Data; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.MessageId; diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java index f8a2ec1..6741d14 100644 --- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java +++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntime.java @@ -260,7 +260,7 @@ public class KubernetesRuntime implements Runtime { authConfig, "$" + ENV_SHARD_ID, grpcPort, - -1l, + -1L, logConfigFile, secretsProviderClassName, secretsProviderConfig, 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 73acafa..32acae8 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 @@ -51,7 +51,6 @@ import org.apache.pulsar.functions.auth.KubernetesSecretsTokenAuthProvider; import org.apache.pulsar.functions.runtime.kubernetes.KubernetesRuntimeFactory; import org.apache.pulsar.functions.runtime.kubernetes.KubernetesRuntimeFactoryConfig; import org.apache.pulsar.functions.runtime.process.ProcessRuntimeFactoryConfig; -import org.apache.pulsar.functions.runtime.thread.ThreadRuntimeFactory; import org.apache.pulsar.functions.runtime.thread.ThreadRuntimeFactoryConfig; @Data diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ValidatorUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ValidatorUtils.java index 9203cba..2d6325f 100644 --- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ValidatorUtils.java +++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/ValidatorUtils.java @@ -21,7 +21,6 @@ package org.apache.pulsar.functions.utils; import lombok.extern.slf4j.Slf4j; import net.jodah.typetools.TypeResolver; -import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.pulsar.client.api.CryptoKeyReader; import org.apache.pulsar.client.api.Schema; import org.apache.pulsar.common.functions.CryptoConfig; @@ -33,14 +32,11 @@ import org.apache.pulsar.functions.proto.Function; import org.apache.pulsar.io.core.Sink; import org.apache.pulsar.io.core.Source; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.Map; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.apache.commons.lang3.StringUtils.isNotBlank; -import static org.apache.pulsar.common.util.Reflections.createInstance; @Slf4j public class ValidatorUtils { diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheEntry.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheEntry.java index 81d39d9..e9fb409 100644 --- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheEntry.java +++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/functioncache/FunctionCacheEntry.java @@ -33,9 +33,6 @@ import java.util.stream.Collectors; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import static org.apache.commons.lang3.StringUtils.isNoneBlank; -import static org.apache.pulsar.functions.utils.functioncache.FunctionCacheEntry.JAVA_INSTANCE_JAR_PROPERTY; - import org.apache.pulsar.common.nar.NarClassLoader; /** diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java index 2bb5613..bb5a2d0 100644 --- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java +++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/MembershipManager.java @@ -28,20 +28,13 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.client.api.Consumer; -import org.apache.pulsar.client.api.ConsumerEventListener; import org.apache.pulsar.client.api.PulsarClient; -import org.apache.pulsar.client.api.PulsarClientException; -import org.apache.pulsar.client.api.SubscriptionType; -import org.apache.pulsar.client.impl.ConsumerImpl; import org.apache.pulsar.common.functions.WorkerInfo; import org.apache.pulsar.common.policies.data.ConsumerStats; import org.apache.pulsar.common.policies.data.TopicStats; diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/SchedulerManager.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/SchedulerManager.java index b1ac384..05c3790 100644 --- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/SchedulerManager.java +++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/SchedulerManager.java @@ -213,7 +213,7 @@ public class SchedulerManager implements AutoCloseable { try { runnable.run(); } catch (Throwable th) { - log.error("Encountered error when invoking scheduler", errMsg); + log.error("Encountered error when invoking scheduler [{}]", errMsg); errorNotifier.triggerError(th); } } diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/zookeeper/ZKMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/zookeeper/ZKMetadataStore.java index eb03272..e35b583 100644 --- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/zookeeper/ZKMetadataStore.java +++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/zookeeper/ZKMetadataStore.java @@ -36,7 +36,6 @@ 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.pulsar.metadata.api.Stat; -import org.apache.zookeeper.AsyncCallback.StatCallback; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.Code; diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java index e45f9c6..34ec40b 100644 --- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java +++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyService.java @@ -131,7 +131,7 @@ public class ProxyService implements Closeable { new Semaphore(proxyConfig.getMaxConcurrentLookupRequests(), false)); if (proxyConfig.getProxyLogLevel().isPresent()) { - proxyLogLevel = Integer.valueOf(proxyConfig.getProxyLogLevel().get()); + proxyLogLevel = proxyConfig.getProxyLogLevel().get(); } else { proxyLogLevel = 0; } diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/GlobalZooKeeperCache.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/GlobalZooKeeperCache.java index 9788b52..0b856f1 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/GlobalZooKeeperCache.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/GlobalZooKeeperCache.java @@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory; * and invalidated by the ZNode path. For the data cache, ZNode data parsing is done at request time with the given * {@link Deserializer} argument. * - * @param <T> */ public class GlobalZooKeeperCache extends ZooKeeperCache implements Closeable { private static final Logger LOG = LoggerFactory.getLogger(GlobalZooKeeperCache.class); diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java index 925d5c6..0672c26 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java @@ -85,7 +85,7 @@ public class LocalBookkeeperEnsemble { public static final int CONNECTION_TIMEOUT = 30000; int numberOfBookies; - private boolean clearOldData = false; + private boolean clearOldData; private static class BasePortManager implements Supplier<Integer> { diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalZooKeeperCache.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalZooKeeperCache.java index b6cb6d1..b3a1520 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalZooKeeperCache.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalZooKeeperCache.java @@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory; * and invalidated by the ZNode path. For the data cache, ZNode data parsing is done at request time with the given * {@link Deserializer} argument. * - * @param <T> */ public class LocalZooKeeperCache extends ZooKeeperCache { diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalZooKeeperConnectionService.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalZooKeeperConnectionService.java index e4be27e..85ec400 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalZooKeeperConnectionService.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalZooKeeperConnectionService.java @@ -24,7 +24,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import org.apache.pulsar.zookeeper.ZooKeeperClientFactory.SessionType; -import org.apache.pulsar.zookeeper.ZooKeeperSessionWatcher.ShutdownService; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.NoNodeException; @@ -108,9 +107,7 @@ public class LocalZooKeeperConnectionService implements Closeable { // check if the node exists if (zkc.exists(path, false) == null) { - /** - * create znode - */ + //create znode try { // do create the node zkc.create(path, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java index 43d727a..efa4120 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZkIsolatedBookieEnsemblePlacementPolicy.java @@ -59,8 +59,8 @@ public class ZkIsolatedBookieEnsemblePlacementPolicy extends RackawareEnsemblePl private ZooKeeperCache bookieMappingCache = null; - private final List<String> primaryIsolationGroups = new ArrayList<String>(); - private final List<String> secondaryIsolationGroups = new ArrayList<String>(); + private final List<String> primaryIsolationGroups = new ArrayList<>(); + private final List<String> secondaryIsolationGroups = new ArrayList<>(); private final ObjectMapper jsonMapper = ObjectMapperFactory.create(); public ZkIsolatedBookieEnsemblePlacementPolicy() { @@ -194,7 +194,7 @@ public class ZkIsolatedBookieEnsemblePlacementPolicy extends RackawareEnsemblePl // if primary-isolated-bookies are not enough then add consider secondary isolated bookie group as well. if (totalAvailableBookiesInPrimaryGroup < ensembleSize) { LOG.info( - "Not found enough available-bookies from primary isolation group {} , checking secondary group", + "Not found enough available-bookies from primary isolation group [{}] , checking secondary group [{}]", primaryIsolationGroups, secondaryIsolationGroups); for (String group : secondaryIsolationGroups) { Map<String, BookieInfo> bookieGroup = allGroupsBookieMapping.get(group); diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZkUtils.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZkUtils.java index b49326b..c40a11c 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZkUtils.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZkUtils.java @@ -85,9 +85,13 @@ public final class ZkUtils { * @return the parent path or null if no parent exists */ public static String getParentForPath(final String path) { - if (path == null) return null; + if (path == null) { + return null; + } final int length = path.length(); - if (length == 0 || (length == 1 && path.charAt(0) == '/')) return null; + if (length == 0 || (length == 1 && path.charAt(0) == '/')) { + return null; + } int partStartIndex = 0; char lastChar = path.charAt(0); diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java index 390222b..8929f9b 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java @@ -62,9 +62,13 @@ import org.slf4j.LoggerFactory; * and invalidated by the ZNode path. For the data cache, ZNode data parsing is done at request time with the given * {@link Deserializer} argument. * - * @param <T> */ public abstract class ZooKeeperCache implements Watcher { + + /** + * + * @param <T> the type of zookeeper content + */ public static interface Deserializer<T> { T deserialize(String key, byte[] content) throws Exception; } diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperChildrenCache.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperChildrenCache.java index ce64480..3cc381f 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperChildrenCache.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperChildrenCache.java @@ -21,7 +21,6 @@ package org.apache.pulsar.zookeeper; import java.util.List; import java.util.Set; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.pulsar.zookeeper.ZooKeeperCache.CacheUpdater; diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperSessionWatcher.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperSessionWatcher.java index fa70c9e..7cf21ea 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperSessionWatcher.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperSessionWatcher.java @@ -180,6 +180,7 @@ public class ZooKeeperSessionWatcher implements Watcher, StatCallback, Runnable, } } + @Override public void close() { if (scheduler != null) { scheduler.shutdownNow();
