Restrict permission ws classes visibility

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java
index 682476beac1cfbe8949c46dc3d220036dfa0e712..96c479befa17f75583e66f2326513dca3e5d1cc6 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java
@@ -40,7 +40,7 @@ import static org.sonar.server.permission.ws.Parameters.PARAM_USER_LOGIN;
 import static org.sonar.server.permission.ws.Parameters.PROJECT_PERMISSIONS_ONE_LINE;
 import static org.sonar.server.ws.WsUtils.checkRequest;
 
-public class PermissionRequest {
+class PermissionRequest {
   private final String permission;
   private final String userLogin;
   private final Long groupId;
@@ -67,7 +67,7 @@ public class PermissionRequest {
     query = builder.query;
   }
 
-  public static class Builder {
+  static class Builder {
 
     private final Request request;
 
@@ -88,11 +88,11 @@ public class PermissionRequest {
     private String selected;
     private String query;
 
-    public Builder(Request request) {
+    Builder(Request request) {
       this.request = request;
     }
 
-    public PermissionRequest build() {
+    PermissionRequest build() {
       permission = request.mandatoryParam(PARAM_PERMISSION);
       setUserLogin(request);
       setGroup(request);
@@ -105,17 +105,17 @@ public class PermissionRequest {
       return new PermissionRequest(this);
     }
 
-    public Builder withUser() {
+    Builder withUser() {
       this.withUser = true;
       return this;
     }
 
-    public Builder withGroup() {
+    Builder withGroup() {
       this.withGroup = true;
       return this;
     }
 
-    public Builder withPagination() {
+    Builder withPagination() {
       this.withPagination = true;
       return this;
     }
@@ -186,47 +186,47 @@ public class PermissionRequest {
     }
   }
 
-  public String permission() {
+  String permission() {
     return permission;
   }
 
-  public String userLogin() {
+  String userLogin() {
     return userLogin;
   }
 
-  public Long groupId() {
+  Long groupId() {
     return groupId;
   }
 
-  public String groupName() {
+  String groupName() {
     return groupName;
   }
 
-  public String projectUuid() {
+  String projectUuid() {
     return projectUuid;
   }
 
-  public String projectKey() {
+  String projectKey() {
     return projectKey;
   }
 
-  public Integer page() {
+  Integer page() {
     return page;
   }
 
-  public Integer pageSize() {
+  Integer pageSize() {
     return pageSize;
   }
 
-  public String selected() {
+  String selected() {
     return selected;
   }
 
-  public String query() {
+  String query() {
     return query;
   }
 
-  public boolean hasProject() {
+  boolean hasProject() {
     return hasProject;
   }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsCommons.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsCommons.java
index 4243a7e6d694c9aff4d4e6ae357ba95378afb5a9..c04dd1aea139de7ea779d45e87b62010386d52bd 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsCommons.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionWsCommons.java
@@ -40,7 +40,7 @@ public class PermissionWsCommons {
     this.componentFinder = componentFinder;
   }
 
-  public String searchGroupName(DbSession dbSession, @Nullable String groupNameParam, @Nullable Long groupId) {
+  String searchGroupName(DbSession dbSession, @Nullable String groupNameParam, @Nullable Long groupId) {
     if (groupNameParam != null) {
       return groupNameParam;
     }
@@ -53,7 +53,7 @@ public class PermissionWsCommons {
     return group.getName();
   }
 
-  public PermissionChange buildUserPermissionChange(DbSession dbSession, PermissionRequest request) {
+  PermissionChange buildUserPermissionChange(DbSession dbSession, PermissionRequest request) {
     PermissionChange permissionChange = new PermissionChange()
       .setPermission(request.permission())
       .setUserLogin(request.userLogin());
@@ -62,7 +62,7 @@ public class PermissionWsCommons {
     return permissionChange;
   }
 
-  public PermissionChange buildGroupPermissionChange(DbSession dbSession, PermissionRequest request) {
+  PermissionChange buildGroupPermissionChange(DbSession dbSession, PermissionRequest request) {
     String groupName = searchGroupName(dbSession, request.groupName(), request.groupId());
 
     PermissionChange permissionChange = new PermissionChange()