From d6eb1c29a8221e1ac79fcc363dee7622a8c1552a Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Wed, 19 Feb 2020 17:49:06 +0900
Subject: [PATCH] Remove redundant null checks used with "instanceof"

SonarLint reports:

Null checks should not be used with "instanceof" (squid:S4201)

There's no need to null test in conjunction with an instanceof test.
null is not an instanceof anything, so a null check is redundant.

Change-Id: I29506aebfe337c8c300b46179e43b3057d9ae370
---
 .../com/google/gerrit/client/admin/ProjectBranchesScreen.java | 2 +-
 .../com/google/gerrit/client/admin/ProjectTagsScreen.java     | 2 +-
 .../main/java/com/google/gerrit/client/api/PluginLoader.java  | 2 +-
 .../google/gerrit/server/query/change/AndChangeSource.java    | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
index c6a391b59f..e9a6499388 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
@@ -572,7 +572,7 @@ public class ProjectBranchesScreen extends PaginatedProjectScreen {
       boolean on = false;
       for (int row = 1; row < table.getRowCount(); row++) {
         Widget w = table.getWidget(row, 1);
-        if (w != null && w instanceof CheckBox) {
+        if (w instanceof CheckBox) {
           CheckBox sel = (CheckBox) w;
           if (sel.getValue()) {
             on = true;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java
index 22c331d6f3..320f9564c4 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectTagsScreen.java
@@ -470,7 +470,7 @@ public class ProjectTagsScreen extends PaginatedProjectScreen {
       boolean on = false;
       for (int row = 1; row < table.getRowCount(); row++) {
         Widget w = table.getWidget(row, 1);
-        if (w != null && w instanceof CheckBox) {
+        if (w instanceof CheckBox) {
           CheckBox sel = (CheckBox) w;
           if (sel.getValue()) {
             on = true;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/PluginLoader.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/PluginLoader.java
index de25ef0814..c1f4e16efc 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/PluginLoader.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/PluginLoader.java
@@ -163,7 +163,7 @@ public class PluginLoader extends DialogBox {
 
         Exception e = plugin.failure();
         String msg;
-        if (e != null && e instanceof CodeDownloadException) {
+        if (e instanceof CodeDownloadException) {
           msg = Gerrit.M.cannotDownloadPlugin(plugin.url());
         } else {
           msg = Gerrit.M.pluginFailed(plugin.name());
diff --git a/java/com/google/gerrit/server/query/change/AndChangeSource.java b/java/com/google/gerrit/server/query/change/AndChangeSource.java
index ff1ab23c89..13ace045ad 100644
--- a/java/com/google/gerrit/server/query/change/AndChangeSource.java
+++ b/java/com/google/gerrit/server/query/change/AndChangeSource.java
@@ -37,9 +37,7 @@ public class AndChangeSource extends AndSource<ChangeData> implements ChangeData
 
   @Override
   public boolean hasChange() {
-    return source != null
-        && source instanceof ChangeDataSource
-        && ((ChangeDataSource) source).hasChange();
+    return source instanceof ChangeDataSource && ((ChangeDataSource) source).hasChange();
   }
 
   @Override