You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/21 01:33:50 UTC
[pulsar] 14/18: optimize if statement (#12741)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 6b9d02cb0a488dfe84359b02785973e2e8a2f105
Author: gaozhangmin <ga...@qq.com>
AuthorDate: Tue Nov 30 03:51:54 2021 +0800
optimize if statement (#12741)
Co-authored-by: gavingaozhangmin <ga...@didiglobal.com>
(cherry picked from commit f3641a3fa89686705ebe4bf5ea9936af3003d465)
---
.../src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java | 6 +++---
.../src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java | 6 +++---
.../src/main/java/org/apache/pulsar/admin/cli/CmdSources.java | 6 +++---
.../src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java | 7 ++-----
.../java/org/apache/pulsar/client/impl/schema/ByteBufSchema.java | 6 +-----
.../java/org/apache/pulsar/common/tls/TlsHostnameVerifier.java | 4 +---
.../java/org/apache/pulsar/functions/worker/FunctionActioner.java | 7 ++-----
.../src/main/java/org/apache/pulsar/io/flume/FlumeConnector.java | 5 +----
.../main/java/org/apache/pulsar/testclient/PerformanceReader.java | 2 +-
9 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index 2efef99..90ebf68 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -711,13 +711,13 @@ public class CmdFunctions extends CmdBase {
if (isBlank(clientAuthParams) && !isBlank(DEPRECATED_clientAuthParams)) {
clientAuthParams = DEPRECATED_clientAuthParams;
}
- if (useTls == false && DEPRECATED_useTls != null) {
+ if (!useTls && DEPRECATED_useTls != null) {
useTls = DEPRECATED_useTls;
}
- if (tlsAllowInsecureConnection == false && DEPRECATED_tlsAllowInsecureConnection != null) {
+ if (!tlsAllowInsecureConnection && DEPRECATED_tlsAllowInsecureConnection != null) {
tlsAllowInsecureConnection = DEPRECATED_tlsAllowInsecureConnection;
}
- if (tlsHostNameVerificationEnabled == false && DEPRECATED_tlsHostNameVerificationEnabled != null) {
+ if (!tlsHostNameVerificationEnabled && DEPRECATED_tlsHostNameVerificationEnabled != null) {
tlsHostNameVerificationEnabled = DEPRECATED_tlsHostNameVerificationEnabled;
}
if (isBlank(tlsTrustCertFilePath) && !isBlank(DEPRECATED_tlsTrustCertFilePath)) {
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
index a4bf82e..0035ff4 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
@@ -191,13 +191,13 @@ public class CmdSinks extends CmdBase {
if (isBlank(clientAuthParams) && !isBlank(DEPRECATED_clientAuthParams)) {
clientAuthParams = DEPRECATED_clientAuthParams;
}
- if (useTls == false && DEPRECATED_useTls != null) {
+ if (!useTls && DEPRECATED_useTls != null) {
useTls = DEPRECATED_useTls;
}
- if (tlsAllowInsecureConnection == false && DEPRECATED_tlsAllowInsecureConnection != null) {
+ if (!tlsAllowInsecureConnection && DEPRECATED_tlsAllowInsecureConnection != null) {
tlsAllowInsecureConnection = DEPRECATED_tlsAllowInsecureConnection;
}
- if (tlsHostNameVerificationEnabled == false && DEPRECATED_tlsHostNameVerificationEnabled != null) {
+ if (!tlsHostNameVerificationEnabled && DEPRECATED_tlsHostNameVerificationEnabled != null) {
tlsHostNameVerificationEnabled = DEPRECATED_tlsHostNameVerificationEnabled;
}
if (isBlank(tlsTrustCertFilePath) && !isBlank(DEPRECATED_tlsTrustCertFilePath)) {
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
index 6d836e2..f78feb0 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
@@ -190,13 +190,13 @@ public class CmdSources extends CmdBase {
if (isBlank(clientAuthParams) && !isBlank(DEPRECATED_clientAuthParams)) {
clientAuthParams = DEPRECATED_clientAuthParams;
}
- if (useTls == false && DEPRECATED_useTls != null) {
+ if (!useTls && DEPRECATED_useTls != null) {
useTls = DEPRECATED_useTls;
}
- if (tlsAllowInsecureConnection == false && DEPRECATED_tlsAllowInsecureConnection != null) {
+ if (!tlsAllowInsecureConnection && DEPRECATED_tlsAllowInsecureConnection != null) {
tlsAllowInsecureConnection = DEPRECATED_tlsAllowInsecureConnection;
}
- if (tlsHostNameVerificationEnabled == false && DEPRECATED_tlsHostNameVerificationEnabled != null) {
+ if (!tlsHostNameVerificationEnabled && DEPRECATED_tlsHostNameVerificationEnabled != null) {
tlsHostNameVerificationEnabled = DEPRECATED_tlsHostNameVerificationEnabled;
}
if (isBlank(tlsTrustCertFilePath) && !isBlank(DEPRECATED_tlsTrustCertFilePath)) {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
index 9312df5..1251593 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
@@ -211,13 +211,10 @@ public abstract class ConsumerBase<T> extends HandlerState implements Consumer<T
protected CompletableFuture<Message<T>> nextPendingReceive() {
CompletableFuture<Message<T>> receivedFuture;
- while (true) {
+ do {
receivedFuture = pendingReceives.poll();
// skip done futures (cancelling a future could mark it done)
- if (receivedFuture == null || !receivedFuture.isDone()) {
- break;
- }
- }
+ } while (receivedFuture != null && receivedFuture.isDone());
return receivedFuture;
}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufSchema.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufSchema.java
index ce68298..7665d96 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufSchema.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/ByteBufSchema.java
@@ -64,11 +64,7 @@ public class ByteBufSchema extends AbstractSchema<ByteBuf> {
@Override
public ByteBuf decode(ByteBuf byteBuf) {
- if (null == byteBuf) {
- return null;
- } else {
- return byteBuf;
- }
+ return byteBuf;
}
@Override
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/TlsHostnameVerifier.java b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/TlsHostnameVerifier.java
index 3ab5b5f..0735013 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/tls/TlsHostnameVerifier.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/tls/TlsHostnameVerifier.java
@@ -206,9 +206,7 @@ public class TlsHostnameVerifier implements HostnameVerifier {
if (strict) {
final String remainder = host.substring(
prefix.length(), host.length() - suffix.length());
- if (remainder.contains(".")) {
- return false;
- }
+ return !remainder.contains(".");
}
return true;
}
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
index 6497e15..5fa5540 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
@@ -204,14 +204,11 @@ public class FunctionActioner {
}
File tempPkgFile;
- while (true) {
+ do {
tempPkgFile = new File(
pkgDir,
pkgFile.getName() + "." + instanceId + "." + UUID.randomUUID().toString());
- if (!tempPkgFile.exists() && tempPkgFile.createNewFile()) {
- break;
- }
- }
+ } while (tempPkgFile.exists() || !tempPkgFile.createNewFile());
String pkgLocationPath = functionMetaData.getPackageLocation().getPackagePath();
boolean downloadFromHttp = isPkgUrlProvided && pkgLocationPath.startsWith(HTTP);
log.info("{}/{}/{} Function package file {} will be downloaded from {}", tempPkgFile, details.getTenant(),
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConnector.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConnector.java
index 29a9847..66eb2d6 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConnector.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/FlumeConnector.java
@@ -43,10 +43,7 @@ public class FlumeConnector {
SSLUtil.initGlobalSSLParameters();
String agentName = flumeConfig.getName();
boolean reload = !flumeConfig.getNoReloadConf();
- boolean isZkConfigured = false;
- if (flumeConfig.getZkConnString().length() > 0) {
- isZkConfigured = true;
- }
+ boolean isZkConfigured = flumeConfig.getZkConnString().length() > 0;
if (isZkConfigured) {
// get options
String zkConnectionStr = flumeConfig.getZkConnString();
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
index 44e5555..d18c76a 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
@@ -199,7 +199,7 @@ public class PerformanceReader {
arguments.authParams = prop.getProperty("authParams", null);
}
- if (arguments.useTls == false) {
+ if (!arguments.useTls) {
arguments.useTls = Boolean.parseBoolean(prop.getProperty("useTls"));
}