SONAR-6947 api/permissions/set_default_template use SetDefaultTemplat…

…eWsRequest

server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java

@@ -32,19 +32,22 @@
 import org.sonar.db.permission.PermissionTemplateDto;
 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.platform.PersistentSettings;
 import org.sonar.server.user.UserSession;
+import org.sonarqube.ws.client.permission.SetDefaultTemplateWsRequest;
 
 import static com.google.common.collect.FluentIterable.from;
 import static com.google.common.collect.Ordering.natural;
 import static java.lang.String.format;
+import static org.sonar.server.component.ResourceTypeFunctions.RESOURCE_TYPE_TO_QUALIFIER;
 import static org.sonar.server.permission.DefaultPermissionTemplates.defaultRootQualifierTemplateProperty;
 import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser;
-import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_QUALIFIER;
-import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createTemplateParameters;
 import static org.sonar.server.permission.ws.PermissionRequestValidator.validateQualifier;
-import static org.sonar.server.component.ResourceTypeFunctions.RESOURCE_TYPE_TO_QUALIFIER;
+import static org.sonar.server.permission.ws.PermissionsWsParametersBuilder.createTemplateParameters;
+import static org.sonar.server.permission.ws.WsTemplateRef.newTemplateRef;
+import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_QUALIFIER;
+import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_ID;
+import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_TEMPLATE_NAME;
 
 public class SetDefaultTemplateAction implements PermissionsWsAction {
   private final DbClient dbClient;
@@ -82,15 +85,25 @@ public void define(WebService.NewController context) {
   }
 
   @Override
-  public void handle(Request wsRequest, Response wsResponse) throws Exception {
-    checkGlobalAdminUser(userSession);
+  public void handle(Request request, Response response) throws Exception {
+    doHandle(toSetDefaultTemplateWsRequest(request));
+    response.noContent();
+  }
 
-    String qualifier = wsRequest.mandatoryParam(PARAM_QUALIFIER);
+  private void doHandle(SetDefaultTemplateWsRequest request) {
+    checkGlobalAdminUser(userSession);
 
-    PermissionTemplateDto template = getTemplate(wsRequest);
+    String qualifier = request.getQualifier();
+    PermissionTemplateDto template = getTemplate(request);
     validateQualifier(qualifier, getRootQualifiers());
     setDefaultTemplateUuid(template.getUuid(), qualifier);
-    wsResponse.noContent();
+  }
+
+  private static SetDefaultTemplateWsRequest toSetDefaultTemplateWsRequest(Request request) {
+    return new SetDefaultTemplateWsRequest()
+      .setQualifier(request.param(PARAM_QUALIFIER))
+      .setTemplateId(request.param(PARAM_TEMPLATE_ID))
+      .setTemplateName(request.param(PARAM_TEMPLATE_NAME));
   }
 
   private Set<String> getRootQualifiers() {
@@ -116,10 +129,10 @@ private String i18n(String qualifier) {
     return i18n.message(userSession.locale(), qualifiersPropertyPrefix + qualifier, "");
   }
 
-  private PermissionTemplateDto getTemplate(Request wsRequest) {
+  private PermissionTemplateDto getTemplate(SetDefaultTemplateWsRequest request) {
     DbSession dbSession = dbClient.openSession(false);
     try {
-      return finder.getTemplate(dbSession, WsTemplateRef.fromRequest(wsRequest));
+      return finder.getTemplate(dbSession, newTemplateRef(request.getTemplateId(), request.getTemplateName()));
     } finally {
       dbClient.closeSession(dbSession);
     }

sonar-ws/src/main/java/org/sonarqube/ws/client/permission/PermissionsWsClient.java

@@ -37,6 +37,7 @@
 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_PROJECT_KEY_PATTERN;
+import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_QUALIFIER;
 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;
@@ -175,6 +176,14 @@ public SearchTemplatesWsResponse searchTemplates(SearchTemplatesWsRequest reques
       SearchTemplatesWsResponse.parser());
   }
 
+  public void setDefaultTemplate(SetDefaultTemplateWsRequest request) {
+    wsClient.execute(
+      newPostRequest("set_default_template")
+        .setParam(PARAM_QUALIFIER, request.getQualifier())
+        .setParam(PARAM_TEMPLATE_ID, request.getTemplateId())
+        .setParam(PARAM_TEMPLATE_NAME, request.getTemplateName()));
+  }
+
   private static String action(String action) {
     return PermissionsWsParameters.ENDPOINT + "/" + action;
   }

sonar-ws/src/main/java/org/sonarqube/ws/client/permission/SetDefaultTemplateWsRequest.java

@@ -0,0 +1,60 @@
+/*
+ * 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;
+
+public class SetDefaultTemplateWsRequest {
+  private String qualifier;
+  private String templateId;
+  private String templateName;
+
+  @CheckForNull
+  public String getQualifier() {
+    return qualifier;
+  }
+
+  public SetDefaultTemplateWsRequest setQualifier(@Nullable String qualifier) {
+    this.qualifier = qualifier;
+    return this;
+  }
+
+  @CheckForNull
+  public String getTemplateId() {
+    return templateId;
+  }
+
+  public SetDefaultTemplateWsRequest setTemplateId(@Nullable String templateId) {
+    this.templateId = templateId;
+    return this;
+  }
+
+  @CheckForNull
+  public String getTemplateName() {
+    return templateName;
+  }
+
+  public SetDefaultTemplateWsRequest setTemplateName(@Nullable String templateName) {
+    this.templateName = templateName;
+    return this;
+  }
+}