[#6272] fix: Remove the unnecessary null checks (#6296)

**What changes were proposed in this pull request?** Remove the unnecessary null checks. **Why are the changes needed?** [#6272] Unnecessary because instanceof returns null **Does this PR introduce _any_ user-facing change?** N/A **How was this patch tested?** N/A Co-authored-by: SEO G S <[email protected]>
apache · Jan 16, 2025 · 1edfab3 · 1edfab3
1 parent f025777
commit 1edfab3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/apache/gravitino/credential/CatalogCredentialContext.java b/core/src/main/java/org/apache/gravitino/credential/CatalogCredentialContext.java
@@ -47,7 +47,7 @@ public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
-    if (o == null || !(o instanceof CatalogCredentialContext)) {
+    if (!(o instanceof CatalogCredentialContext)) {
       return false;
     }
     return Objects.equal(userName, ((CatalogCredentialContext) o).userName);

diff --git a/core/src/main/java/org/apache/gravitino/credential/CredentialCacheKey.java b/core/src/main/java/org/apache/gravitino/credential/CredentialCacheKey.java
@@ -43,7 +43,7 @@ public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
-    if (o == null || !(o instanceof CredentialCacheKey)) {
+    if (!(o instanceof CredentialCacheKey)) {
       return false;
     }
     CredentialCacheKey that = (CredentialCacheKey) o;

diff --git a/core/src/main/java/org/apache/gravitino/credential/PathBasedCredentialContext.java b/core/src/main/java/org/apache/gravitino/credential/PathBasedCredentialContext.java
@@ -67,7 +67,7 @@ public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
-    if (o == null || !(o instanceof PathBasedCredentialContext)) {
+    if (!(o instanceof PathBasedCredentialContext)) {
       return false;
     }
     PathBasedCredentialContext that = (PathBasedCredentialContext) o;

diff --git a/.../src/main/java/org/apache/gravitino/iceberg/common/utils/IcebergHiveCachedClientPool.java b/.../src/main/java/org/apache/gravitino/iceberg/common/utils/IcebergHiveCachedClientPool.java
@@ -238,7 +238,7 @@ public boolean equals(Object o) {
       if (this == o) {
         return true;
       }
-      if (o == null || !(o instanceof Key)) {
+      if (!(o instanceof Key)) {
         return false;
       }
       Key key = (Key) o;