SONAR-12366 update endpoint ws urls (#2013)

10 files changed, 202 insertions, 63 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWs.java b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWs.java
new file mode 100644
index 00000000000..3cb959ade82
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWs.java
@@ -0,0 +1,42 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.sonar.server.newcodeperiod.ws;
+
+import org.sonar.api.server.ws.WebService;
+
+public class NewCodePeriodsWs implements WebService {
+
+  private final NewCodePeriodsWsAction[] actions;
+
+  public NewCodePeriodsWs(NewCodePeriodsWsAction... actions) {
+    this.actions = actions;
+  }
+
+  @Override
+  public void define(Context context) {
+    NewController controller = context.createController("api/new_code_periods")
+      .setDescription("Manage new code periods.")
+      .setSince("8.0");
+    for (NewCodePeriodsWsAction action : actions) {
+      action.define(controller);
+    }
+    controller.done();
+  }
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWsAction.java
new file mode 100644
index 00000000000..09b614abf72
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWsAction.java
@@ -0,0 +1,26 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.sonar.server.newcodeperiod.ws;
+
+import org.sonar.server.ws.WsAction;
+
+public interface NewCodePeriodsWsAction extends WsAction {
+  // marker interface
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWsModule.java
new file mode 100644
index 00000000000..77a400b0ed1
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWsModule.java
@@ -0,0 +1,33 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.sonar.server.newcodeperiod.ws;
+
+import org.sonar.core.platform.Module;
+
+public class NewCodePeriodsWsModule extends Module {
+  @Override
+  protected void configureModule() {
+    add(
+      NewCodePeriodsWs.class,
+      ShowAction.class,
+      SetAction.class,
+      UnsetAction.class);
+  }
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/UpdateNewCodePeriodAction.java b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/SetAction.java
index d3126956172..d540e41933f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/UpdateNewCodePeriodAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/SetAction.java
@@ -17,7 +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.server.setting.ws;
+package org.sonar.server.newcodeperiod.ws;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
@@ -50,7 +50,7 @@ import static org.sonar.db.newcodeperiod.NewCodePeriodType.PREVIOUS_VERSION;
 import static org.sonar.db.newcodeperiod.NewCodePeriodType.SPECIFIC_ANALYSIS;
 import static org.sonar.server.component.ComponentFinder.ParamNames.PROJECT_ID_AND_KEY;
 
-public class UpdateNewCodePeriodAction implements SettingsWsAction {
+public class SetAction implements NewCodePeriodsWsAction {
   private static final String PARAM_BRANCH = "branch";
   private static final String PARAM_PROJECT = "project";
   private static final String PARAM_TYPE = "type";
@@ -64,7 +64,7 @@ public class UpdateNewCodePeriodAction implements SettingsWsAction {
   private final ComponentFinder componentFinder;
   private final NewCodePeriodDao newCodePeriodDao;
 
-  public UpdateNewCodePeriodAction(DbClient dbClient, UserSession userSession, ComponentFinder componentFinder, NewCodePeriodDao newCodePeriodDao) {
+  public SetAction(DbClient dbClient, UserSession userSession, ComponentFinder componentFinder, NewCodePeriodDao newCodePeriodDao) {
     this.dbClient = dbClient;
     this.userSession = userSession;
     this.componentFinder = componentFinder;
@@ -73,8 +73,9 @@ public class UpdateNewCodePeriodAction implements SettingsWsAction {
 
   @Override
   public void define(WebService.NewController context) {
-    WebService.NewAction action = context.createAction("update_new_code_period")
-      .setDescription("Updates the setting for the New Code Period.<br>" +
+    WebService.NewAction action = context.createAction("set")
+      .setPost(true)
+      .setDescription("Sets the setting for the New Code Period.<br>" +
         "Requires one of the following permissions: " +
         "<ul>" +
         "<li>'Administer System' to change the global setting</li>" +
@@ -132,7 +133,7 @@ public class UpdateNewCodePeriodAction implements SettingsWsAction {
   }
 
   private void setValue(DbSession dbSession, NewCodePeriodDto dto, NewCodePeriodType type, @Nullable ComponentDto projectBranch,
-    @Nullable String branch, @Nullable String value) {
+                        @Nullable String branch, @Nullable String value) {
     switch (type) {
       case PREVIOUS_VERSION:
         Preconditions.checkArgument(value == null, "Unexpected value for type '%s'", type);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ShowNewCodePeriodAction.java b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/ShowAction.java
index bf03c299380..97993f401bf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ShowNewCodePeriodAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/ShowAction.java
@@ -17,7 +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.server.setting.ws;
+package org.sonar.server.newcodeperiod.ws;
 
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -36,15 +36,15 @@ import org.sonar.db.newcodeperiod.NewCodePeriodType;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.user.UserSession;
-import org.sonarqube.ws.Settings;
-import org.sonarqube.ws.Settings.ShowNewCodePeriodResponse;
+import org.sonarqube.ws.NewCodePeriods;
+import org.sonarqube.ws.NewCodePeriods.ShowWSResponse;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.String.format;
 import static org.sonar.server.component.ComponentFinder.ParamNames.PROJECT_ID_AND_KEY;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
 
-public class ShowNewCodePeriodAction implements SettingsWsAction {
+public class ShowAction implements NewCodePeriodsWsAction {
   private static final String PARAM_BRANCH = "branch";
   private static final String PARAM_PROJECT = "project";
 
@@ -53,7 +53,7 @@ public class ShowNewCodePeriodAction implements SettingsWsAction {
   private final ComponentFinder componentFinder;
   private final NewCodePeriodDao newCodePeriodDao;
 
-  public ShowNewCodePeriodAction(DbClient dbClient, UserSession userSession, ComponentFinder componentFinder, NewCodePeriodDao newCodePeriodDao) {
+  public ShowAction(DbClient dbClient, UserSession userSession, ComponentFinder componentFinder, NewCodePeriodDao newCodePeriodDao) {
     this.dbClient = dbClient;
     this.userSession = userSession;
     this.componentFinder = componentFinder;
@@ -62,7 +62,7 @@ public class ShowNewCodePeriodAction implements SettingsWsAction {
 
   @Override
   public void define(WebService.NewController context) {
-    WebService.NewAction action = context.createAction("show_new_code_period")
+    WebService.NewAction action = context.createAction("show")
       .setDescription("Shows a setting for the New Code Period.<br>" +
         "Requires one of the following permissions: " +
         "<ul>" +
@@ -104,7 +104,7 @@ public class ShowNewCodePeriodAction implements SettingsWsAction {
         projectUuid = projectBranch.getMainBranchProjectUuid() != null ? projectBranch.getMainBranchProjectUuid() : projectBranch.uuid();
       }
 
-      ShowNewCodePeriodResponse.Builder builder = get(dbSession, projectUuid, branchUuid, false);
+      ShowWSResponse.Builder builder = get(dbSession, projectUuid, branchUuid, false);
 
       if (projectStr != null) {
         builder.setProjectKey(projectStr);
@@ -116,7 +116,7 @@ public class ShowNewCodePeriodAction implements SettingsWsAction {
     }
   }
 
-  private ShowNewCodePeriodResponse.Builder get(DbSession dbSession, @Nullable String projectUuid, @Nullable String branchUuid, boolean inherited) {
+  private ShowWSResponse.Builder get(DbSession dbSession, @Nullable String projectUuid, @Nullable String branchUuid, boolean inherited) {
     if (projectUuid == null) {
       Optional<NewCodePeriodDto> dto = newCodePeriodDao.selectGlobal(dbSession);
       return dto.map(d -> build(d, inherited))
@@ -133,8 +133,8 @@ public class ShowNewCodePeriodAction implements SettingsWsAction {
       .orElseGet(() -> get(dbSession, projectUuid, null, true));
   }
 
-  private ShowNewCodePeriodResponse.Builder build(NewCodePeriodDto dto, boolean inherited) {
-    ShowNewCodePeriodResponse.Builder builder = ShowNewCodePeriodResponse.newBuilder()
+  private ShowWSResponse.Builder build(NewCodePeriodDto dto, boolean inherited) {
+    ShowWSResponse.Builder builder = ShowWSResponse.newBuilder()
       .setType(convertType(dto.getType()))
       .setInherited(inherited);
 
@@ -144,22 +144,22 @@ public class ShowNewCodePeriodAction implements SettingsWsAction {
     return builder;
   }
 
-  private ShowNewCodePeriodResponse.Builder buildDefault(boolean inherited) {
-    return ShowNewCodePeriodResponse.newBuilder()
+  private ShowWSResponse.Builder buildDefault(boolean inherited) {
+    return ShowWSResponse.newBuilder()
       .setType(convertType(NewCodePeriodType.PREVIOUS_VERSION))
       .setInherited(inherited);
   }
 
-  private Settings.NewCodePeriodType convertType(NewCodePeriodType type) {
+  private NewCodePeriods.NewCodePeriodType convertType(NewCodePeriodType type) {
     switch (type) {
       case NUMBER_OF_DAYS:
-        return Settings.NewCodePeriodType.NUMBER_OF_DAYS;
+        return NewCodePeriods.NewCodePeriodType.NUMBER_OF_DAYS;
       case DATE:
-        return Settings.NewCodePeriodType.DATE;
+        return NewCodePeriods.NewCodePeriodType.DATE;
       case PREVIOUS_VERSION:
-        return Settings.NewCodePeriodType.PREVIOUS_VERSION;
+        return NewCodePeriods.NewCodePeriodType.PREVIOUS_VERSION;
       case SPECIFIC_ANALYSIS:
-        return Settings.NewCodePeriodType.SPECIFIC_ANALYSIS;
+        return NewCodePeriods.NewCodePeriodType.SPECIFIC_ANALYSIS;
       default:
         throw new IllegalStateException("Unexpected type: " + type);
     }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/DeleteNewCodePeriodAction.java b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/UnsetAction.java
index 452be227986..2ef7d0ca728 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/setting/ws/DeleteNewCodePeriodAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/newcodeperiod/ws/UnsetAction.java
@@ -17,7 +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.server.setting.ws;
+package org.sonar.server.newcodeperiod.ws;
 
 import javax.annotation.Nullable;
 import org.sonar.api.server.ws.Request;
@@ -38,7 +38,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.String.format;
 import static org.sonar.server.component.ComponentFinder.ParamNames.PROJECT_ID_AND_KEY;
 
-public class DeleteNewCodePeriodAction implements SettingsWsAction {
+public class UnsetAction implements NewCodePeriodsWsAction {
   private static final String PARAM_BRANCH = "branch";
   private static final String PARAM_PROJECT = "project";
 
@@ -47,7 +47,7 @@ public class DeleteNewCodePeriodAction implements SettingsWsAction {
   private final ComponentFinder componentFinder;
   private final NewCodePeriodDao newCodePeriodDao;
 
-  public DeleteNewCodePeriodAction(DbClient dbClient, UserSession userSession, ComponentFinder componentFinder, NewCodePeriodDao newCodePeriodDao) {
+  public UnsetAction(DbClient dbClient, UserSession userSession, ComponentFinder componentFinder, NewCodePeriodDao newCodePeriodDao) {
     this.dbClient = dbClient;
     this.userSession = userSession;
     this.componentFinder = componentFinder;
@@ -56,8 +56,9 @@ public class DeleteNewCodePeriodAction implements SettingsWsAction {
 
   @Override
   public void define(WebService.NewController context) {
-    WebService.NewAction action = context.createAction("delete_new_code_period")
-      .setDescription("Removes the New Code Period setting for a branch, project or global.<br>" +
+    WebService.NewAction action = context.createAction("unset")
+      .setPost(true)
+      .setDescription("Unset the New Code Period setting for a branch, project or global.<br>" +
         "Requires one of the following permissions: " +
         "<ul>" +
         "<li>'Administer System' to change the global setting</li>" +
diff --git a/server/sonar-server/src/test/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWsModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWsModuleTest.java
new file mode 100644
index 00000000000..93c20e3330d
--- /dev/null
+++ b/server/sonar-server/src/test/java/org/sonar/server/newcodeperiod/ws/NewCodePeriodsWsModuleTest.java
@@ -0,0 +1,36 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.sonar.server.newcodeperiod.ws;
+
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class NewCodePeriodsWsModuleTest {
+
+  @Test
+  public void verify_count_of_added_components() {
+    ComponentContainer container = new ComponentContainer();
+    new NewCodePeriodsWsModule().configure(container);
+    assertThat(container.size()).isEqualTo(6);
+  }
+
+}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/UpdateNewCodePeriodActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/newcodeperiod/ws/SetActionTest.java
index 23ff28ab461..4fe9ee623b0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/UpdateNewCodePeriodActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/newcodeperiod/ws/SetActionTest.java
@@ -17,7 +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.server.setting.ws;
+package org.sonar.server.newcodeperiod.ws;
 
 import javax.annotation.Nullable;
 import org.junit.Rule;
@@ -46,7 +46,7 @@ import org.sonar.server.ws.WsActionTester;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
-public class UpdateNewCodePeriodActionTest {
+public class SetActionTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
   @Rule
@@ -60,17 +60,17 @@ public class UpdateNewCodePeriodActionTest {
   private ComponentFinder componentFinder = TestComponentFinder.from(db);
   private NewCodePeriodDao dao = new NewCodePeriodDao(System2.INSTANCE, UuidFactoryFast.getInstance());
 
-  private UpdateNewCodePeriodAction underTest = new UpdateNewCodePeriodAction(dbClient, userSession, componentFinder, dao);
+  private SetAction underTest = new SetAction(dbClient, userSession, componentFinder, dao);
   private WsActionTester ws = new WsActionTester(underTest);
 
   @Test
   public void test_definition() {
     WebService.Action definition = ws.getDef();
 
-    assertThat(definition.key()).isEqualTo("update_new_code_period");
+    assertThat(definition.key()).isEqualTo("set");
     assertThat(definition.isInternal()).isFalse();
     assertThat(definition.since()).isEqualTo("8.0");
-    assertThat(definition.isPost()).isFalse();
+    assertThat(definition.isPost()).isTrue();
 
     assertThat(definition.params()).extracting(WebService.Param::key).containsOnly("value", "type", "project", "branch");
     assertThat(definition.param("value").isRequired()).isFalse();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ShowNewCodePeriodActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/newcodeperiod/ws/ShowActionTest.java
index 926793a44d3..069093cdb89 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ShowNewCodePeriodActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/newcodeperiod/ws/ShowActionTest.java
@@ -17,7 +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.server.setting.ws;
+package org.sonar.server.newcodeperiod.ws;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -42,12 +42,12 @@ import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.WsActionTester;
-import org.sonarqube.ws.Settings;
-import org.sonarqube.ws.Settings.ShowNewCodePeriodResponse;
+import org.sonarqube.ws.NewCodePeriods;
+import org.sonarqube.ws.NewCodePeriods.ShowWSResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ShowNewCodePeriodActionTest {
+public class ShowActionTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
   @Rule
@@ -61,14 +61,14 @@ public class ShowNewCodePeriodActionTest {
   private ComponentFinder componentFinder = TestComponentFinder.from(db);
   private NewCodePeriodDao dao = new NewCodePeriodDao(System2.INSTANCE, UuidFactoryFast.getInstance());
   private NewCodePeriodDbTester tester = new NewCodePeriodDbTester(db);
-  private ShowNewCodePeriodAction underTest = new ShowNewCodePeriodAction(dbClient, userSession, componentFinder, dao);
+  private ShowAction underTest = new ShowAction(dbClient, userSession, componentFinder, dao);
   private WsActionTester ws = new WsActionTester(underTest);
 
   @Test
   public void test_definition() {
     WebService.Action definition = ws.getDef();
 
-    assertThat(definition.key()).isEqualTo("show_new_code_period");
+    assertThat(definition.key()).isEqualTo("show");
     assertThat(definition.isInternal()).isFalse();
     assertThat(definition.since()).isEqualTo("8.0");
     assertThat(definition.isPost()).isFalse();
@@ -140,10 +140,10 @@ public class ShowNewCodePeriodActionTest {
   public void show_global_setting() {
     tester.insert(new NewCodePeriodDto().setType(NewCodePeriodType.PREVIOUS_VERSION));
 
-    ShowNewCodePeriodResponse response = ws.newRequest()
-      .executeProtobuf(ShowNewCodePeriodResponse.class);
+    ShowWSResponse response = ws.newRequest()
+      .executeProtobuf(ShowWSResponse.class);
 
-    assertResponse(response, "", "", Settings.NewCodePeriodType.PREVIOUS_VERSION, "", false);
+    assertResponse(response, "", "", NewCodePeriods.NewCodePeriodType.PREVIOUS_VERSION, "", false);
   }
 
   @Test
@@ -156,11 +156,11 @@ public class ShowNewCodePeriodActionTest {
       .setType(NewCodePeriodType.NUMBER_OF_DAYS)
       .setValue("4"));
 
-    ShowNewCodePeriodResponse response = ws.newRequest()
+    ShowWSResponse response = ws.newRequest()
       .setParam("project", project.getKey())
-      .executeProtobuf(ShowNewCodePeriodResponse.class);
+      .executeProtobuf(ShowWSResponse.class);
 
-    assertResponse(response, project.getKey(), "", Settings.NewCodePeriodType.NUMBER_OF_DAYS, "4", false);
+    assertResponse(response, project.getKey(), "", NewCodePeriods.NewCodePeriodType.NUMBER_OF_DAYS, "4", false);
   }
 
   @Test
@@ -176,12 +176,12 @@ public class ShowNewCodePeriodActionTest {
       .setType(NewCodePeriodType.DATE)
       .setValue("2018-04-05"));
 
-    ShowNewCodePeriodResponse response = ws.newRequest()
+    ShowWSResponse response = ws.newRequest()
       .setParam("project", project.getKey())
       .setParam("branch", "branch")
-      .executeProtobuf(ShowNewCodePeriodResponse.class);
+      .executeProtobuf(ShowWSResponse.class);
 
-    assertResponse(response, project.getKey(), "branch", Settings.NewCodePeriodType.DATE, "2018-04-05", false);
+    assertResponse(response, project.getKey(), "branch", NewCodePeriods.NewCodePeriodType.DATE, "2018-04-05", false);
   }
 
   @Test
@@ -190,11 +190,11 @@ public class ShowNewCodePeriodActionTest {
     logInAsProjectAdministrator(project);
     tester.insert(new NewCodePeriodDto().setType(NewCodePeriodType.PREVIOUS_VERSION));
 
-    ShowNewCodePeriodResponse response = ws.newRequest()
+    ShowWSResponse response = ws.newRequest()
       .setParam("project", project.getKey())
-      .executeProtobuf(ShowNewCodePeriodResponse.class);
+      .executeProtobuf(ShowWSResponse.class);
 
-    assertResponse(response, project.getKey(), "", Settings.NewCodePeriodType.PREVIOUS_VERSION, "", true);
+    assertResponse(response, project.getKey(), "", NewCodePeriods.NewCodePeriodType.PREVIOUS_VERSION, "", true);
   }
 
   @Test
@@ -209,12 +209,12 @@ public class ShowNewCodePeriodActionTest {
       .setType(NewCodePeriodType.DATE)
       .setValue("2018-04-05"));
 
-    ShowNewCodePeriodResponse response = ws.newRequest()
+    ShowWSResponse response = ws.newRequest()
       .setParam("project", project.getKey())
       .setParam("branch", "branch")
-      .executeProtobuf(ShowNewCodePeriodResponse.class);
+      .executeProtobuf(ShowWSResponse.class);
 
-    assertResponse(response, project.getKey(), "branch", Settings.NewCodePeriodType.DATE, "2018-04-05", true);
+    assertResponse(response, project.getKey(), "branch", NewCodePeriods.NewCodePeriodType.DATE, "2018-04-05", true);
   }
 
   @Test
@@ -224,15 +224,15 @@ public class ShowNewCodePeriodActionTest {
     ComponentDto branch = componentDb.insertProjectBranch(project, b -> b.setKey("branch"));
     tester.insert(new NewCodePeriodDto().setType(NewCodePeriodType.NUMBER_OF_DAYS).setValue("3"));
 
-    ShowNewCodePeriodResponse response = ws.newRequest()
+    ShowWSResponse response = ws.newRequest()
       .setParam("project", project.getKey())
       .setParam("branch", "branch")
-      .executeProtobuf(ShowNewCodePeriodResponse.class);
+      .executeProtobuf(ShowWSResponse.class);
 
-    assertResponse(response, project.getKey(), "branch", Settings.NewCodePeriodType.NUMBER_OF_DAYS, "3", true);
+    assertResponse(response, project.getKey(), "branch", NewCodePeriods.NewCodePeriodType.NUMBER_OF_DAYS, "3", true);
   }
 
-  private void assertResponse(ShowNewCodePeriodResponse response, String projectKey, String branchKey, Settings.NewCodePeriodType type, String value, boolean inherited) {
+  private void assertResponse(ShowWSResponse response, String projectKey, String branchKey, NewCodePeriods.NewCodePeriodType type, String value, boolean inherited) {
     assertThat(response.getBranchKey()).isEqualTo(branchKey);
     assertThat(response.getProjectKey()).isEqualTo(projectKey);
     assertThat(response.getInherited()).isEqualTo(inherited);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/DeleteNewCodePeriodActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/newcodeperiod/ws/UnsetActionTest.java
index ace4cf9d9ae..c3391fa346f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/DeleteNewCodePeriodActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/newcodeperiod/ws/UnsetActionTest.java
@@ -17,7 +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.server.setting.ws;
+package org.sonar.server.newcodeperiod.ws;
 
 import javax.annotation.Nullable;
 import org.junit.Rule;
@@ -45,7 +45,7 @@ import org.sonar.server.ws.WsActionTester;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
-public class DeleteNewCodePeriodActionTest {
+public class UnsetActionTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
   @Rule
@@ -59,17 +59,17 @@ public class DeleteNewCodePeriodActionTest {
   private ComponentFinder componentFinder = TestComponentFinder.from(db);
   private NewCodePeriodDao dao = new NewCodePeriodDao(System2.INSTANCE, UuidFactoryFast.getInstance());
 
-  private DeleteNewCodePeriodAction underTest = new DeleteNewCodePeriodAction(dbClient, userSession, componentFinder, dao);
+  private UnsetAction underTest = new UnsetAction(dbClient, userSession, componentFinder, dao);
   private WsActionTester ws = new WsActionTester(underTest);
 
   @Test
   public void test_definition() {
     WebService.Action definition = ws.getDef();
 
-    assertThat(definition.key()).isEqualTo("delete_new_code_period");
+    assertThat(definition.key()).isEqualTo("unset");
     assertThat(definition.isInternal()).isFalse();
     assertThat(definition.since()).isEqualTo("8.0");
-    assertThat(definition.isPost()).isFalse();
+    assertThat(definition.isPost()).isTrue();
 
     assertThat(definition.params()).extracting(WebService.Param::key).containsOnly("project", "branch");
     assertThat(definition.param("project").isRequired()).isFalse();