This is an automated email from the ASF dual-hosted git repository. zhaijia pushed a commit to branch branch-2.5 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit df8dd6210ce9eec8dcfa0561a2ad8040643148f2 Author: Yijie Shen <[email protected]> AuthorDate: Mon Feb 24 12:26:37 2020 +0800 [Minor] Fix java code errors reported by lgtm. (#6398) Four kinds of errors are fixed in this PR: - Array index out of bounds - Inconsistent equals and hashCode - Missing format argument - Reference equality test of boxed types According to https://lgtm.com/projects/g/apache/pulsar/alerts/?mode=tree&severity=error&id=&lang=java (cherry picked from commit 7fb9affa3615ade8edddabce849437df02f89500) --- .../bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java | 2 +- .../java/org/apache/bookkeeper/mledger/util/CallbackMutex.java | 2 +- .../java/org/apache/pulsar/broker/admin/impl/BrokersBase.java | 2 +- .../org/apache/pulsar/client/admin/internal/BaseResource.java | 2 +- .../main/java/org/apache/pulsar/client/impl/ConsumerImpl.java | 10 +++++++++- .../org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java | 2 +- .../java/org/apache/pulsar/common/policies/data/Policies.java | 2 +- .../main/java/org/apache/pulsar/common/sasl/KerberosName.java | 2 +- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java index 382f457..67babbd 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java @@ -194,7 +194,7 @@ public class ManagedLedgerOfflineBacklog { @Override public void operationFailed(ManagedLedgerException.MetaStoreException e) { - log.warn("[{}] Unable to obtain managed ledger metadata - {}", e); + log.warn("[{}] Unable to obtain managed ledger metadata - {}", managedLedgerName, e); mlMetaCounter.countDown(); } }); diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/CallbackMutex.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/CallbackMutex.java index 9e934bf..e5f07c2 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/CallbackMutex.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/CallbackMutex.java @@ -62,7 +62,7 @@ public class CallbackMutex { if (log.isDebugEnabled()) { owner = null; position = null; - log.debug(">>> Lock {} released token={} at {}", this.hashCode(), + log.debug(">>> Lock {} released at {}", this.hashCode(), Thread.currentThread().getStackTrace()[2]); } diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java index 92c8620..bab92be 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java @@ -358,7 +358,7 @@ public class BrokersBase extends AdminResource { LOG.info("[{}] Deleted Service configuration {}", clientAppId(), configName); } else { if (LOG.isDebugEnabled()) { - LOG.debug("[{}] Can't update non-dynamic configuration {}/{}", clientAppId(), configName); + LOG.debug("[{}] Can't update non-dynamic configuration {}", clientAppId(), configName); } throw new RestException(Status.PRECONDITION_FAILED, " Can't update non-dynamic configuration"); } diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BaseResource.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BaseResource.java index c654717..2cbe87d 100644 --- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BaseResource.java +++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BaseResource.java @@ -87,7 +87,7 @@ public abstract class BaseResource { // auth complete, return a new Builder authFuture.whenComplete((respHeaders, ex) -> { if (ex != null) { - log.warn("[{}] Failed to perform http request at authn stage: {}", + log.warn("[{}] Failed to perform http request at auth stage: {}", target.getUri(), ex.getMessage()); builderFuture.completeExceptionally(new PulsarClientException(ex)); return; diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java index 5b62248..08049a7 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java @@ -1528,7 +1528,7 @@ public class ConsumerImpl<T> extends ConsumerBase<T> implements ConnectionHandle log.error("[{}][{}] Failed to reset subscription: {}", topic, subscription, e.getCause().getMessage()); seekFuture.completeExceptionally( PulsarClientException.wrap(e.getCause(), - String.format("[%s][%s] Failed to seek the subscription %s of the topic %s to the message %s", + String.format("Failed to seek the subscription %s of the topic %s to the message %s", subscription, topicName.toString(), messageId.toString()))); return null; }); @@ -1756,6 +1756,14 @@ public class ConsumerImpl<T> extends ConsumerBase<T> implements ConnectionHandle return Objects.hash(topic, subscription, consumerName); } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ConsumerImpl)) return false; + ConsumerImpl<?> consumer = (ConsumerImpl<?>) o; + return consumerId == consumer.consumerId; + } + // wrapper for connection methods ClientCnx cnx() { return this.connectionHandler.cnx(); diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java index 3e9e69a..5c26095 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 @@ -1163,7 +1163,7 @@ public class MultiTopicsConsumerImpl<T> extends ConsumerBase<T> { } if (log.isDebugEnabled()) { - log.debug("[{}] run partitionsAutoUpdateTimerTask for multiTopicsConsumer: {}", topic); + log.debug("[{}] run partitionsAutoUpdateTimerTask", topic); } // if last auto update not completed yet, do nothing. diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/Policies.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/Policies.java index 12e5594..eb63415 100644 --- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/Policies.java +++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/Policies.java @@ -142,7 +142,7 @@ public class Policies { && max_consumers_per_subscription == other.max_consumers_per_subscription && compaction_threshold == other.compaction_threshold && offload_threshold == other.offload_threshold - && offload_deletion_lag_ms == other.offload_deletion_lag_ms + && Objects.equals(offload_deletion_lag_ms, other.offload_deletion_lag_ms) && schema_auto_update_compatibility_strategy == other.schema_auto_update_compatibility_strategy && schema_validation_enforced == other.schema_validation_enforced && schema_compatibility_strategy == other.schema_compatibility_strategy diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/KerberosName.java b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/KerberosName.java index 6771a23..c70c776 100644 --- a/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/KerberosName.java +++ b/pulsar-common/src/main/java/org/apache/pulsar/common/sasl/KerberosName.java @@ -271,7 +271,7 @@ public class KerberosName { if (paramNum != null) { try { int num = Integer.parseInt(paramNum); - if (num < 0 || num > params.length) { + if (num < 0 || num >= params.length) { throw new BadFormatString("index " + num + " from " + format + " is outside of the valid range 0 to " + (params.length - 1)); }
