3 files changed, 13 insertions, 34 deletions

diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProcess.java b/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProcess.java
index dbd823b971f..b9b33402444 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProcess.java
+++ b/server/sonar-process-monitor/src/main/java/org/sonar/application/cluster/ClusterProcess.java
@@ -21,16 +21,17 @@
 package org.sonar.application.cluster;
 
 import java.io.Serializable;
-import javax.annotation.Nonnull;
 import org.sonar.process.ProcessId;
 
+import static java.util.Objects.requireNonNull;
+
 public class ClusterProcess implements Serializable {
   private final ProcessId processId;
   private final String nodeUuid;
 
-  public ClusterProcess(@Nonnull String nodeUuid, @Nonnull ProcessId processId) {
-    this.processId = processId;
-    this.nodeUuid = nodeUuid;
+  public ClusterProcess(String nodeUuid, ProcessId processId) {
+    this.processId = requireNonNull(processId);
+    this.nodeUuid = requireNonNull(nodeUuid);
   }
 
   public ProcessId getProcessId() {
@@ -46,22 +47,20 @@ public class ClusterProcess implements Serializable {
     if (this == o) {
       return true;
     }
-    if (!(o instanceof ClusterProcess)) {
+    if (o == null || getClass() != o.getClass()) {
       return false;
     }
-
     ClusterProcess that = (ClusterProcess) o;
-
     if (processId != that.processId) {
       return false;
     }
-    return nodeUuid != null ? nodeUuid.equals(that.nodeUuid) : that.nodeUuid == null;
+    return nodeUuid.equals(that.nodeUuid);
   }
 
   @Override
   public int hashCode() {
-    int result = processId != null ? processId.hashCode() : 0;
-    result = 31 * result + (nodeUuid != null ? nodeUuid.hashCode() : 0);
+    int result = processId.hashCode();
+    result = 31 * result + nodeUuid.hashCode();
     return result;
   }
 }
diff --git a/sonar-core/src/test/java/org/sonar/classloader/MaskReader.java b/server/sonar-process-monitor/src/main/java/org/sonar/application/config/package-info.java
index d21f156c9f4..192ba670e01 100644
--- a/sonar-core/src/test/java/org/sonar/classloader/MaskReader.java
+++ b/server/sonar-process-monitor/src/main/java/org/sonar/application/config/package-info.java
@@ -17,25 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.classloader;
+@ParametersAreNonnullByDefault
+package org.sonar.application.config;
 
-import java.util.List;
-
-/**
- * Gives access to protected read methods of {@link Mask}.
- */
-public class MaskReader {
-  private final Mask mask;
-
-  public MaskReader(Mask mask) {
-    this.mask = mask;
-  }
-
-  public List<String> getInclusions() {
-    return mask.getInclusions();
-  }
-
-  public List<String> getExclusions() {
-    return mask.getExclusions();
-  }
-}
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java
index 547a144e735..7282a6f886c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java
@@ -25,13 +25,11 @@ import org.sonar.api.server.ws.WebService.NewAction;
 import org.sonar.api.server.ws.WebService.NewController;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
-import org.sonar.db.user.UserDto;
-import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.db.permission.OrganizationPermission;
+import org.sonar.db.user.UserDto;
 import org.sonar.server.user.UserSession;
 
 import static java.lang.String.format;
-import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN;
 import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_GROUP_ID;
 import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_GROUP_NAME;
 import static org.sonar.server.usergroups.ws.GroupWsSupport.PARAM_LOGIN;