GEODE-7768: remove redundant null checks (apache#4701)

help-lixin · Feb 19, 2020 · bf3e280 · bf3e280
1 parent d6c1497
commit bf3e280
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 20 deletions.
diff --git a/...ions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java b/...ions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
@@ -191,10 +191,9 @@ public boolean equals(Object obj) {
       return true;
     }
 
-    if (obj == null || !(obj instanceof BootstrappingFunction)) {
+    if (!(obj instanceof BootstrappingFunction)) {
       return false;
     }
-
     return true;
   }
 

diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java
@@ -48,7 +48,7 @@ public RemoteApplicationVM(RemoteGfManagerAgent agent, InternalDistributedMember
 
   @Override
   public boolean equals(Object obj) {
-    if (obj == null || !(obj instanceof RemoteApplicationVM)) {
+    if (!(obj instanceof RemoteApplicationVM)) {
       return false;
     } else {
       RemoteApplicationVM vm = (RemoteApplicationVM) obj;

diff --git a/...core/src/main/java/org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl.java b/...core/src/main/java/org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl.java
@@ -103,7 +103,7 @@ public Number getValue() {
   @Override
   public boolean equals(Object object) {
 
-    if (object == null || !(object instanceof DummyStatisticInfoImpl)) {
+    if (!(object instanceof DummyStatisticInfoImpl)) {
       return false;
     }
 

diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfoImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/StatisticInfoImpl.java
@@ -96,7 +96,7 @@ public void setStatisticsTypeName(String statisticsType) {
   @Override
   public boolean equals(Object object) {
 
-    if (object == null || !(object instanceof StatisticInfoImpl)) {
+    if (!(object instanceof StatisticInfoImpl)) {
       return false;
     }
 

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
@@ -992,7 +992,7 @@ public boolean entryRequiresOldValue(Object key) {
 
   private void sendProfileOperation(Long clientID, operationType opType, Object interest,
       boolean updatesAsInvalidates) {
-    if (this.region == null || !(this.region instanceof PartitionedRegion)) {
+    if (!(this.region instanceof PartitionedRegion)) {
       return;
     }
     OperationMessage msg = new OperationMessage();

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
@@ -710,7 +710,7 @@ public static Bucket getProxyBucketRegion(Cache cache, String fullPath, boolean
     } finally {
       LocalRegion.setThreadInitLevelRequirement(oldLevel);
     }
-    if (region == null || !(region instanceof PartitionedRegion)) {
+    if (!(region instanceof PartitionedRegion)) {
       return null;
     }
 

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java
@@ -1660,7 +1660,7 @@ public int compareTo(Object o) {
 
       @Override
       public boolean equals(Object o) {
-        if (o == null || !(o instanceof FarSideEntryOp)) {
+        if (!(o instanceof FarSideEntryOp)) {
           return false;
         }
         return compareTo(o) == 0;

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
@@ -1970,7 +1970,7 @@ public int compareTo(Object o) {
 
     @Override
     public boolean equals(Object o) {
-      if (o == null || !(o instanceof TxEntryEventImpl))
+      if (!(o instanceof TxEntryEventImpl))
         return false;
       return compareTo(o) == 0;
     }

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
@@ -1008,7 +1008,7 @@ public int compareTo(Object o) {
 
     @Override
     public boolean equals(Object o) {
-      if (o == null || !(o instanceof TXEntryStateWithRegionAndKey))
+      if (!(o instanceof TXEntryStateWithRegionAndKey))
         return false;
       return compareTo(o) == 0;
     }

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
@@ -229,7 +229,7 @@ public void setHAContainer(Map container) {
    */
   @Override
   public boolean equals(Object other) {
-    if (other == null || !(other instanceof HAEventWrapper)) {
+    if (!(other instanceof HAEventWrapper)) {
       return false;
     }
 

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
@@ -756,7 +756,7 @@ public synchronized boolean sameAs(RegionVersionHolder<T> other) {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj == null || !(obj instanceof RegionVersionHolder)) {
+    if (!(obj instanceof RegionVersionHolder)) {
       return false;
     }
     return sameAs((RegionVersionHolder) obj);

diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxField.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxField.java
@@ -203,7 +203,7 @@ public boolean equals(Object other) {
     if (other == this) {
       return true;
     }
-    if (other == null || !(other instanceof PdxField)) {
+    if (!(other instanceof PdxField)) {
       return false;
     }
     PdxField otherVFT = (PdxField) other;

diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
@@ -177,7 +177,7 @@ public boolean equals(Object other) {
     if (other == this) {
       return true;
     }
-    if (other == null || !(other instanceof PdxType)) {
+    if (!(other instanceof PdxType)) {
       return false;
     }
     // Note: do not compare type id in equals

diff --git a/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/ClusterStartupRule.java b/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/ClusterStartupRule.java
@@ -83,14 +83,14 @@ public static InternalCache getCache() {
   }
 
   public static InternalLocator getLocator() {
-    if (memberStarter == null || !(memberStarter instanceof LocatorStarterRule)) {
+    if (!(memberStarter instanceof LocatorStarterRule)) {
       return null;
     }
     return ((LocatorStarterRule) memberStarter).getLocator();
   }
 
   public static CacheServer getServer() {
-    if (memberStarter == null || !(memberStarter instanceof ServerStarterRule)) {
+    if (!(memberStarter instanceof ServerStarterRule)) {
       return null;
     }
     return ((ServerStarterRule) memberStarter).getServer();

diff --git a/...rc/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java b/...rc/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java
@@ -56,7 +56,7 @@ public ResultModel describeMember(@CliOption(key = CliStrings.DESCRIBE_MEMBER__I
     ArrayList<?> output = (ArrayList<?>) rc.getResult();
     Object obj = output.get(0);
 
-    if (obj == null || !(obj instanceof MemberInformation)) {
+    if (!(obj instanceof MemberInformation)) {
       return ResultModel.createInfo(String.format(
           CliStrings.DESCRIBE_MEMBER__MSG__INFO_FOR__0__COULD_NOT_BE_RETRIEVED, memberNameOrId));
     }

diff --git a/geode-junit/src/main/java/org/apache/geode/DeltaTestImpl.java b/geode-junit/src/main/java/org/apache/geode/DeltaTestImpl.java
@@ -244,7 +244,7 @@ public String toString() {
 
   @Override
   public boolean equals(Object other) {
-    if (other == null || !(other instanceof DeltaTestImpl)) {
+    if (!(other instanceof DeltaTestImpl)) {
       return false;
     }
     DeltaTestImpl delta = (DeltaTestImpl) other;

diff --git a/geode-junit/src/main/java/org/apache/geode/cache/query/data/PortfolioData.java b/geode-junit/src/main/java/org/apache/geode/cache/query/data/PortfolioData.java
@@ -112,7 +112,7 @@ public boolean equals(Object p) {
     if (this == p) {
       return true;
     }
-    if (p == null || !(p instanceof PortfolioData)) {
+    if (!(p instanceof PortfolioData)) {
       return false;
     }
     PortfolioData pd = (PortfolioData) p;

diff --git a/...hip/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberData.java b/...hip/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberData.java
@@ -379,7 +379,7 @@ public int getVmPid() {
   @Override
   public boolean equals(Object obj) {
     // GemStone fix for 29125
-    if ((obj == null) || !(obj instanceof GMSMemberData)) {
+    if (!(obj instanceof GMSMemberData)) {
       return false;
     }
     return compareTo((GMSMemberData) obj) == 0;