Browse Source

HADOOP-17599. Remove NULL checks before instanceof (#2804)

Jack Jiang 4 years ago
parent
commit
d8ec8ab965
17 changed files with 20 additions and 21 deletions
  1. 1 1
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
  2. 1 1
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java
  3. 1 1
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileChecksum.java
  4. 1 1
      hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java
  5. 1 2
      hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/MockWasbAuthorizerImpl.java
  6. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllResourceProfilesResponse.java
  7. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllResourceTypeInfoResponse.java
  8. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetResourceProfileRequest.java
  9. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetResourceProfileResponse.java
  10. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/LightWeightResource.java
  11. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Log4jWarningErrorMetricsAppender.java
  12. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/volume/csi/VolumeId.java
  13. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/PrivilegedOperation.java
  14. 2 2
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/deviceframework/AssignedDevice.java
  15. 2 2
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/AssignedGpuDevice.java
  16. 2 2
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/GpuDevice.java
  17. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntimeContext.java

+ 1 - 1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java

@@ -1353,7 +1353,7 @@ public abstract class AbstractFileSystem implements PathCapabilities {
   
   @Override //Object
   public boolean equals(Object other) {
-    if (other == null || !(other instanceof AbstractFileSystem)) {
+    if (!(other instanceof AbstractFileSystem)) {
       return false;
     }
     return myUri.equals(((AbstractFileSystem) other).myUri);

+ 1 - 1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java

@@ -97,7 +97,7 @@ public class DelegationTokenRenewer
     public boolean equals(final Object that) {
       if (this == that) {
         return true;
-      } else if (that == null || !(that instanceof RenewAction)) {
+      } else if (!(that instanceof RenewAction)) {
         return false;
       }
       return token.equals(((RenewAction<?>)that).token);

+ 1 - 1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileChecksum.java

@@ -47,7 +47,7 @@ public abstract class FileChecksum implements Writable {
     if (other == this) {
       return true;
     }
-    if (other == null || !(other instanceof FileChecksum)) {
+    if (!(other instanceof FileChecksum)) {
       return false;
     }
 

+ 1 - 1
hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java

@@ -93,7 +93,7 @@ public class RpcCallCache {
       if (this == obj) {
         return true;
       }
-      if (obj == null || !(obj instanceof ClientRequest)) {
+      if (!(obj instanceof ClientRequest)) {
         return false;
       }
       ClientRequest other = (ClientRequest) obj;

+ 1 - 2
hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/MockWasbAuthorizerImpl.java

@@ -188,8 +188,7 @@ public class MockWasbAuthorizerImpl implements WasbAuthorizerInterface {
           return true;
         }
 
-        if (obj == null
-            || !(obj instanceof AuthorizationComponent)) {
+        if (!(obj instanceof AuthorizationComponent)) {
             return false;
         }
 

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllResourceProfilesResponse.java

@@ -45,7 +45,7 @@ public abstract class GetAllResourceProfilesResponse {
     if (this == other) {
       return true;
     }
-    if (other == null || !(other instanceof GetAllResourceProfilesResponse)) {
+    if (!(other instanceof GetAllResourceProfilesResponse)) {
       return false;
     }
     return ((GetAllResourceProfilesResponse) other).getResourceProfiles()

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllResourceTypeInfoResponse.java

@@ -45,7 +45,7 @@ public abstract class GetAllResourceTypeInfoResponse {
     if (this == other) {
       return true;
     }
-    if (other == null || !(other instanceof GetAllResourceTypeInfoResponse)) {
+    if (!(other instanceof GetAllResourceTypeInfoResponse)) {
       return false;
     }
     return ((GetAllResourceTypeInfoResponse) other).getResourceTypeInfo()

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetResourceProfileRequest.java

@@ -45,7 +45,7 @@ public abstract class GetResourceProfileRequest {
     if (this == other) {
       return true;
     }
-    if (other == null || !(other instanceof GetResourceProfileRequest)) {
+    if (!(other instanceof GetResourceProfileRequest)) {
       return false;
     }
     return this.getProfileName()

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetResourceProfileResponse.java

@@ -54,7 +54,7 @@ public abstract class GetResourceProfileResponse {
       return true;
     }
 
-    if (other == null || !(other instanceof GetResourceProfileResponse)) {
+    if (!(other instanceof GetResourceProfileResponse)) {
       return false;
     }
     return this.getResource()

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/LightWeightResource.java

@@ -139,7 +139,7 @@ public class LightWeightResource extends Resource {
     if (this == obj) {
       return true;
     }
-    if (obj == null || !(obj instanceof Resource)) {
+    if (!(obj instanceof Resource)) {
       return false;
     }
     Resource other = (Resource) obj;

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Log4jWarningErrorMetricsAppender.java

@@ -68,7 +68,7 @@ public class Log4jWarningErrorMetricsAppender extends AppenderSkeleton {
 
     @Override
     public boolean equals(Object e) {
-      if (e == null || !(e instanceof PurgeElement)) {
+      if (!(e instanceof PurgeElement)) {
         return false;
       }
       if (e == this) {

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/volume/csi/VolumeId.java

@@ -43,7 +43,7 @@ public class VolumeId {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj == null || !(obj instanceof VolumeId)) {
+    if (!(obj instanceof VolumeId)) {
       return false;
     }
     return StringUtils.equalsIgnoreCase(volumeId,

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/PrivilegedOperation.java

@@ -135,7 +135,7 @@ public class PrivilegedOperation {
 
   @Override
   public boolean equals(Object other) {
-    if (other == null || !(other instanceof PrivilegedOperation)) {
+    if (!(other instanceof PrivilegedOperation)) {
       return false;
     }
 

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/deviceframework/AssignedDevice.java

@@ -49,7 +49,7 @@ public class AssignedDevice implements Serializable, Comparable {
 
   @Override
   public int compareTo(Object o) {
-    if (o == null || !(o instanceof AssignedDevice)) {
+    if (!(o instanceof AssignedDevice)) {
       return -1;
     }
     AssignedDevice other = (AssignedDevice) o;
@@ -62,7 +62,7 @@ public class AssignedDevice implements Serializable, Comparable {
 
   @Override
   public boolean equals(Object o) {
-    if (o == null || !(o instanceof AssignedDevice)) {
+    if (!(o instanceof AssignedDevice)) {
       return false;
     }
     AssignedDevice other = (AssignedDevice) o;

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/AssignedGpuDevice.java

@@ -44,7 +44,7 @@ public class AssignedGpuDevice extends GpuDevice {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj == null || !(obj instanceof AssignedGpuDevice)) {
+    if (!(obj instanceof AssignedGpuDevice)) {
       return false;
     }
     AssignedGpuDevice other = (AssignedGpuDevice) obj;
@@ -54,7 +54,7 @@ public class AssignedGpuDevice extends GpuDevice {
 
   @Override
   public int compareTo(Object obj) {
-    if (obj == null || (!(obj instanceof AssignedGpuDevice))) {
+    if ((!(obj instanceof AssignedGpuDevice))) {
       return -1;
     }
 

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/gpu/GpuDevice.java

@@ -43,7 +43,7 @@ public class GpuDevice implements Serializable, Comparable {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj == null || !(obj instanceof GpuDevice)) {
+    if (!(obj instanceof GpuDevice)) {
       return false;
     }
     GpuDevice other = (GpuDevice) obj;
@@ -52,7 +52,7 @@ public class GpuDevice implements Serializable, Comparable {
 
   @Override
   public int compareTo(Object obj) {
-    if (obj == null || (!(obj instanceof  GpuDevice))) {
+    if (!(obj instanceof  GpuDevice)) {
       return -1;
     }
 

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/runtime/ContainerRuntimeContext.java

@@ -54,7 +54,7 @@ public final class ContainerRuntimeContext {
 
     @Override
     public boolean equals(Object obj) {
-      if (obj == null || !(obj instanceof Attribute)){
+      if (!(obj instanceof Attribute)){
         return false;
       }