Use equals instead of == to compare strings (apache#11462) (apache#11497

) Fix to use == instead of equals to compare strings in PulsarColumnMetadata and ZooKeeperUtil Fixes apache#11462
cckellogg · Aug 23, 2021 · 0db6d23 · 0db6d23
1 parent a7a3721
commit 0db6d23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java b/managed-ledger/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
@@ -26,7 +26,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
 import org.apache.bookkeeper.zookeeper.ZooKeeperClient;
@@ -116,7 +115,7 @@ public void startServer(String path) throws Exception {
         // create a zookeeper client
         LOG.debug("Instantiate ZK Client");
         zkc = ZooKeeperClient.newBuilder().connectString(getZooKeeperConnectString()).build();
-        if (path != "") {
+        if (!"".equals(path)) {
             zkc.create(path, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         }
         // initialize the zk client with values

diff --git a/...ar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java b/...ar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java
@@ -107,10 +107,10 @@ public boolean equals(Object o) {
         if (isInternal != that.isInternal) {
             return false;
         }
-        if (nameWithCase != null ? !nameWithCase.equals(that.nameWithCase) : that.nameWithCase != null) {
+        if (!Objects.equals(nameWithCase, that.nameWithCase)) {
             return false;
         }
-        if (decoderExtraInfo != null ? !decoderExtraInfo.equals(that.decoderExtraInfo) : that.decoderExtraInfo != null) {
+        if (!Objects.equals(decoderExtraInfo, that.decoderExtraInfo)) {
             return false;
         }
         return Objects.equals(handleKeyValueType, that.handleKeyValueType);
@@ -187,10 +187,10 @@ public boolean equals(Object o) {
 
             DecoderExtraInfo that = (DecoderExtraInfo) o;
 
-            if (mapping != that.mapping) {
+            if (!Objects.equals(mapping, that.mapping)) {
                 return false;
             }
-            if (dataFormat != null ? !dataFormat.equals(that.dataFormat) : that.dataFormat != null) {
+            if (!Objects.equals(dataFormat, that.dataFormat)) {
                 return false;
             }
             return Objects.equals(formatHint, that.formatHint);