Bläddra i källkod

SONAR-6947 Create AddUserToTemplateWsRequest and use it

tags/5.3-RC1
Teryk Bellahsene 8 år sedan
förälder
incheckning
50f694232d
16 ändrade filer med 132 tillägg och 40 borttagningar
  1. 1
    1
      server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java
  2. 2
    2
      server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsTemplateRef.java
  3. 2
    2
      server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java
  4. 22
    9
      server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java
  5. 8
    8
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java
  6. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java
  7. 3
    3
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java
  8. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java
  9. 2
    2
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java
  10. 2
    2
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java
  11. 3
    3
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java
  12. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java
  13. 2
    2
      server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java
  14. 71
    0
      sonar-ws/src/main/java/org/sonarqube/ws/client/permission/AddUserToTemplateWsRequest.java
  15. 10
    2
      sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsClient.java
  16. 1
    1
      sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsParameters.java

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java Visa fil

@@ -100,7 +100,7 @@ public class PermissionsWsParametersBuilder {
}

private static void createTemplateIdParameter(NewAction action) {
action.createParam(org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID)
action.createParam(org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID)
.setDescription("Template id")
.setExampleValue(Uuids.UUID_EXAMPLE_01);
}

+ 2
- 2
server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsTemplateRef.java Visa fil

@@ -24,7 +24,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nullable;
import org.sonar.api.server.ws.Request;

import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
import static org.sonar.server.ws.WsUtils.checkRequest;

@@ -44,7 +44,7 @@ public class WsTemplateRef {
}

public static WsTemplateRef fromRequest(Request wsRequest) {
String uuid = wsRequest.param(PARAM_TEMPLATE_UUID);
String uuid = wsRequest.param(PARAM_TEMPLATE_ID);
String name = wsRequest.param(PARAM_TEMPLATE_NAME);

return new WsTemplateRef(uuid, name);

+ 2
- 2
server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java Visa fil

@@ -44,7 +44,7 @@ import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_G
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createGroupIdParameter;
import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createGroupNameParameter;
import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createProjectPermissionParameter;
@@ -120,7 +120,7 @@ public class AddGroupToTemplateAction implements PermissionsWsAction {
.setPermission(request.mandatoryParam(PARAM_PERMISSION))
.setGroupId(request.param(PARAM_GROUP_ID))
.setGroupName(request.param(PARAM_GROUP_NAME))
.setTemplateId(request.param(PARAM_TEMPLATE_UUID))
.setTemplateId(request.param(PARAM_TEMPLATE_ID))
.setTemplateName(request.param(PARAM_TEMPLATE_NAME));
}
}

+ 22
- 9
server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java Visa fil

@@ -33,18 +33,21 @@ import org.sonar.db.permission.UserWithPermissionDto;
import org.sonar.db.user.UserDto;
import org.sonar.server.permission.ws.PermissionDependenciesFinder;
import org.sonar.server.permission.ws.PermissionsWsAction;
import org.sonar.server.permission.ws.WsTemplateRef;
import org.sonar.server.user.UserSession;
import org.sonarqube.ws.client.permission.AddUserToTemplateWsRequest;

import static com.google.common.collect.FluentIterable.from;
import static org.sonar.db.user.GroupMembershipQuery.IN;
import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_USER_LOGIN;
import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission;
import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createProjectPermissionParameter;
import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createTemplateParameters;
import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createUserLoginParameter;
import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission;
import static org.sonar.server.permission.ws.WsTemplateRef.newTemplateRef;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_USER_LOGIN;

public class AddUserToTemplateAction implements PermissionsWsAction {
private final DbClient dbClient;
@@ -73,16 +76,20 @@ public class AddUserToTemplateAction implements PermissionsWsAction {
}

@Override
public void handle(Request wsRequest, Response wsResponse) throws Exception {
public void handle(Request request, Response response) throws Exception {
checkGlobalAdminUser(userSession);
doHandle(toAddUserToTemplateWsRequest(request));
response.noContent();
}

String permission = wsRequest.mandatoryParam(PARAM_PERMISSION);
final String userLogin = wsRequest.mandatoryParam(PARAM_USER_LOGIN);
private void doHandle(AddUserToTemplateWsRequest request) {
String permission = request.getPermission();
final String userLogin = request.getLogin();

DbSession dbSession = dbClient.openSession(false);
try {
validateProjectPermission(permission);
PermissionTemplateDto template = dependenciesFinder.getTemplate(dbSession, WsTemplateRef.fromRequest(wsRequest));
PermissionTemplateDto template = dependenciesFinder.getTemplate(dbSession, newTemplateRef(request.getTemplateId(), request.getTemplateName()));
UserDto user = dependenciesFinder.getUser(dbSession, userLogin);

if (!isUserAlreadyAdded(dbSession, template.getId(), userLogin, permission)) {
@@ -91,8 +98,14 @@ public class AddUserToTemplateAction implements PermissionsWsAction {
} finally {
dbClient.closeSession(dbSession);
}
}

wsResponse.noContent();
private static AddUserToTemplateWsRequest toAddUserToTemplateWsRequest(Request request) {
return new AddUserToTemplateWsRequest()
.setLogin(request.mandatoryParam(PARAM_USER_LOGIN))
.setPermission(request.mandatoryParam(PARAM_PERMISSION))
.setTemplateId(request.param(PARAM_TEMPLATE_ID))
.setTemplateName(request.param(PARAM_TEMPLATE_NAME));
}

private boolean isUserAlreadyAdded(DbSession dbSession, long templateId, String userLogin, String permission) {

+ 8
- 8
server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java Visa fil

@@ -64,7 +64,7 @@ import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTem
import static org.sonar.db.user.GroupTesting.newGroupDto;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonar.test.JsonAssert.assertJson;

@Category(DbTests.class)
@@ -129,7 +129,7 @@ public class TemplateGroupsActionTest {

String response = ws.newRequest()
.setParam(PARAM_PERMISSION, UserRole.ISSUE_ADMIN)
.setParam(PARAM_TEMPLATE_UUID, template1.getUuid())
.setParam(PARAM_TEMPLATE_ID, template1.getUuid())
.execute().getInput();

assertJson(response)
@@ -156,7 +156,7 @@ public class TemplateGroupsActionTest {
InputStream responseStream = ws.newRequest()
.setMediaType(MediaTypes.PROTOBUF)
.setParam(PARAM_PERMISSION, UserRole.ADMIN)
.setParam(PARAM_TEMPLATE_UUID, template1.getUuid())
.setParam(PARAM_TEMPLATE_ID, template1.getUuid())
.setParam(Param.SELECTED, SelectionMode.ALL.value())
.execute()
.getInputStream();
@@ -215,7 +215,7 @@ public class TemplateGroupsActionTest {

ws.newRequest()
.setParam(PARAM_PERMISSION, UserRole.USER)
.setParam(PARAM_TEMPLATE_UUID, template1.getUuid())
.setParam(PARAM_TEMPLATE_ID, template1.getUuid())
.execute();
}

@@ -226,7 +226,7 @@ public class TemplateGroupsActionTest {

ws.newRequest()
.setParam(PARAM_PERMISSION, UserRole.USER)
.setParam(PARAM_TEMPLATE_UUID, template1.getUuid())
.setParam(PARAM_TEMPLATE_ID, template1.getUuid())
.execute();
}

@@ -236,7 +236,7 @@ public class TemplateGroupsActionTest {

ws.newRequest()
.setParam(PARAM_PERMISSION, UserRole.USER)
.setParam(PARAM_TEMPLATE_UUID, template1.getUuid())
.setParam(PARAM_TEMPLATE_ID, template1.getUuid())
.setParam(PARAM_TEMPLATE_NAME, template1.getName())
.execute();
}
@@ -256,7 +256,7 @@ public class TemplateGroupsActionTest {

ws.newRequest()
.setParam(PARAM_PERMISSION, UserRole.USER)
.setParam(PARAM_TEMPLATE_UUID, "unknown-uuid")
.setParam(PARAM_TEMPLATE_ID, "unknown-uuid")
.execute();
}

@@ -266,7 +266,7 @@ public class TemplateGroupsActionTest {

ws.newRequest()
.setParam(PARAM_PERMISSION, GlobalPermissions.DASHBOARD_SHARING)
.setParam(PARAM_TEMPLATE_UUID, template1.getUuid())
.setParam(PARAM_TEMPLATE_ID, template1.getUuid())
.execute();
}


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java Visa fil

@@ -238,7 +238,7 @@ public class TemplateUsersActionTest {
TestRequest request = ws.newRequest();
request.setParam(org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION, permission);
if (templateUuid != null) {
request.setParam(org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID, templateUuid);
request.setParam(org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID, templateUuid);
}

return request;

+ 3
- 3
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java Visa fil

@@ -66,7 +66,7 @@ import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_G
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;

@Category(DbTests.class)
public class AddGroupToTemplateActionTest {
@@ -122,7 +122,7 @@ public class AddGroupToTemplateActionTest {
@Test
public void add_with_group_id() {
ws.newRequest()
.setParam(PARAM_TEMPLATE_UUID, permissionTemplate.getUuid())
.setParam(PARAM_TEMPLATE_ID, permissionTemplate.getUuid())
.setParam(PARAM_PERMISSION, CODEVIEWER)
.setParam(PARAM_GROUP_ID, String.valueOf(group.getId()))
.execute();
@@ -219,7 +219,7 @@ public class AddGroupToTemplateActionTest {
request.setParam(PARAM_GROUP_NAME, groupName);
}
if (templateKey != null) {
request.setParam(PARAM_TEMPLATE_UUID, templateKey);
request.setParam(PARAM_TEMPLATE_ID, templateKey);
}
if (permission != null) {
request.setParam(PARAM_PERMISSION, permission);

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java Visa fil

@@ -188,7 +188,7 @@ public class AddUserToTemplateActionTest {
request.setParam(PARAM_USER_LOGIN, userLogin);
}
if (templateKey != null) {
request.setParam(org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID, templateKey);
request.setParam(org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID, templateKey);
}
if (permission != null) {
request.setParam(PARAM_PERMISSION, permission);

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java Visa fil

@@ -74,7 +74,7 @@ import static org.sonar.db.user.GroupTesting.newGroupDto;
import static org.sonar.db.user.UserTesting.newUserDto;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_KEY;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;

@Category(DbTests.class)
@@ -238,7 +238,7 @@ public class ApplyTemplateActionTest {
private TestResponse newRequest(@Nullable String templateUuid, @Nullable String projectUuid, @Nullable String projectKey) {
TestRequest request = ws.newRequest();
if (templateUuid != null) {
request.setParam(PARAM_TEMPLATE_UUID, templateUuid);
request.setParam(PARAM_TEMPLATE_ID, templateUuid);
}
if (projectUuid != null) {
request.setParam(PARAM_PROJECT_ID, projectUuid);

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java Visa fil

@@ -57,7 +57,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.internal.util.collections.Sets.newSet;
import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;

public class DeleteTemplateActionTest {
@@ -172,7 +172,7 @@ public class DeleteTemplateActionTest {
private TestResponse newRequest(@Nullable String id) {
TestRequest request = ws.newRequest();
if (id != null) {
request.setParam(PARAM_TEMPLATE_UUID, id);
request.setParam(PARAM_TEMPLATE_ID, id);
}

TestResponse result = executeRequest(request);

+ 3
- 3
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java Visa fil

@@ -63,7 +63,7 @@ import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_G
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_GROUP_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;

@Category(DbTests.class)
public class RemoveGroupFromTemplateActionTest {
@@ -130,7 +130,7 @@ public class RemoveGroupFromTemplateActionTest {
commit();

ws.newRequest()
.setParam(PARAM_TEMPLATE_UUID, permissionTemplate.getUuid())
.setParam(PARAM_TEMPLATE_ID, permissionTemplate.getUuid())
.setParam(PARAM_PERMISSION, PERMISSION)
.setParam(PARAM_GROUP_ID, String.valueOf(group.getId()))
.execute();
@@ -222,7 +222,7 @@ public class RemoveGroupFromTemplateActionTest {
request.setParam(PARAM_GROUP_NAME, groupName);
}
if (templateKey != null) {
request.setParam(PARAM_TEMPLATE_UUID, templateKey);
request.setParam(PARAM_TEMPLATE_ID, templateKey);
}
if (permission != null) {
request.setParam(PARAM_PERMISSION, permission);

+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java Visa fil

@@ -212,7 +212,7 @@ public class RemoveUserFromTemplateActionTest {
request.setParam(PARAM_USER_LOGIN, userLogin);
}
if (templateKey != null) {
request.setParam(org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID, templateKey);
request.setParam(org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID, templateKey);
}
if (permission != null) {
request.setParam(PARAM_PERMISSION, permission);

+ 2
- 2
server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java Visa fil

@@ -63,7 +63,7 @@ import static org.sonar.api.resources.Qualifiers.VIEW;
import static org.sonar.server.permission.DefaultPermissionTemplates.DEFAULT_TEMPLATE_PROPERTY;
import static org.sonar.server.permission.DefaultPermissionTemplates.defaultRootQualifierTemplateProperty;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_QUALIFIER;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;

@Category(DbTests.class)
@@ -179,7 +179,7 @@ public class SetDefaultTemplateActionTest {
private String newRequest(@Nullable String templateUuid, @Nullable String qualifier) {
TestRequest request = ws.newRequest();
if (templateUuid != null) {
request.setParam(PARAM_TEMPLATE_UUID, templateUuid);
request.setParam(PARAM_TEMPLATE_ID, templateUuid);
}
if (qualifier != null) {
request.setParam(PARAM_QUALIFIER, qualifier);

+ 71
- 0
sonar-ws/src/main/java/org/sonarqube/ws/client/permission/AddUserToTemplateWsRequest.java Visa fil

@@ -0,0 +1,71 @@
/*
* SonarQube, open source software quality management tool.
* Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* SonarQube is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* 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.sonarqube.ws.client.permission;

import javax.annotation.CheckForNull;
import javax.annotation.Nullable;

import static java.util.Objects.requireNonNull;

public class AddUserToTemplateWsRequest {
private String login;
private String permission;
private String templateId;
private String templateName;

public String getLogin() {
return login;
}

public AddUserToTemplateWsRequest setLogin(String login) {
this.login = requireNonNull(login);
return this;
}

public String getPermission() {
return permission;
}

public AddUserToTemplateWsRequest setPermission(String permission) {
this.permission = requireNonNull(permission);
return this;
}

@CheckForNull
public String getTemplateId() {
return templateId;
}

public AddUserToTemplateWsRequest setTemplateId(@Nullable String templateId) {
this.templateId = templateId;
return this;
}

@CheckForNull
public String getTemplateName() {
return templateName;
}

public AddUserToTemplateWsRequest setTemplateName(@Nullable String templateName) {
this.templateName = templateName;
return this;
}
}

+ 10
- 2
sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsClient.java Visa fil

@@ -30,8 +30,8 @@ import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_G
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PROJECT_KEY;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_UUID;
import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_USER_LOGIN;

public class PermissionsWsClient {
@@ -67,7 +67,7 @@ public class PermissionsWsClient {
.setParam(PARAM_GROUP_ID, request.getGroupId())
.setParam(PARAM_GROUP_NAME, request.getGroupName())
.setParam(PARAM_PERMISSION, request.getPermission())
.setParam(PARAM_TEMPLATE_UUID, request.getTemplateId())
.setParam(PARAM_TEMPLATE_ID, request.getTemplateId())
.setParam(PARAM_TEMPLATE_NAME, request.getTemplateName()));
}

@@ -79,6 +79,14 @@ public class PermissionsWsClient {
.setParam(PARAM_PROJECT_KEY, request.getProjectKey()));
}

public void addUserToTemplate(AddUserToTemplateWsRequest request) {
wsClient.execute(newPostRequest(action("add_user_to_template"))
.setParam(PARAM_PERMISSION, request.getPermission())
.setParam(PARAM_USER_LOGIN, request.getLogin())
.setParam(PARAM_TEMPLATE_ID, request.getTemplateId())
.setParam(PARAM_TEMPLATE_NAME, request.getTemplateName()));
}

private static String action(String action) {
return PermissionsWsParameters.ENDPOINT + "/" + action;
}

+ 1
- 1
sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsParameters.java Visa fil

@@ -29,7 +29,7 @@ public class PermissionsWsParameters {
public static final String PARAM_PROJECT_ID = "projectId";
public static final String PARAM_PROJECT_KEY = "projectKey";
public static final String PARAM_USER_LOGIN = "login";
public static final String PARAM_TEMPLATE_UUID = "templateId";
public static final String PARAM_TEMPLATE_ID = "templateId";
public static final String PARAM_TEMPLATE_NAME = "templateName";
public static final String PARAM_ID = "id";
public static final String PARAM_NAME = "name";

Laddar…
Avbryt
Spara