SONAR-8055 Remove /api/emails/update_configuration WS

2 files changed, 15 insertions, 20 deletions

diff --git a/it/it-tests/src/test/java/it/settings/EmailsTest.java b/it/it-tests/src/test/java/it/settings/EmailsTest.java
index 329d17483a8..8533f89ff1b 100644
--- a/it/it-tests/src/test/java/it/settings/EmailsTest.java
+++ b/it/it-tests/src/test/java/it/settings/EmailsTest.java
@@ -41,6 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.groups.Tuple.tuple;
 import static util.ItUtils.newAdminWsClient;
 import static util.ItUtils.resetEmailSettings;
+import static util.ItUtils.setServerProperty;
 
 public class EmailsTest {
 
@@ -55,7 +56,6 @@ public class EmailsTest {
   public static void before() throws Exception {
     ADMIN_WS_CLIENT = newAdminWsClient(orchestrator);
     SETTINGS = ADMIN_WS_CLIENT.settingsService();
-    resetEmailSettings(orchestrator);
 
     SMTP_SERVER = new Wiser(0);
     SMTP_SERVER.start();
@@ -74,6 +74,7 @@ public class EmailsTest {
   public void prepare() {
     orchestrator.resetData();
     SMTP_SERVER.getMessages().clear();
+    resetEmailSettings(orchestrator);
   }
 
   @Test
@@ -118,16 +119,13 @@ public class EmailsTest {
 
   private static void updateEmailSettings(@Nullable String host, @Nullable String port, @Nullable String from, @Nullable String prefix, @Nullable String secure,
     @Nullable String username, @Nullable String password) {
-    ADMIN_WS_CLIENT.wsConnector().call(
-      new PostRequest("/api/emails/update_configuration")
-        .setParam("host", host)
-        .setParam("port", port)
-        .setParam("from", from)
-        .setParam("prefix", prefix)
-        .setParam("secure", secure)
-        .setParam("username", username)
-        .setParam("password", password))
-      .failIfNotSuccessful();
+    setServerProperty(orchestrator, "email.smtp_host.secured", host);
+    setServerProperty(orchestrator, "email.smtp_port.secured", port);
+    setServerProperty(orchestrator, "email.smtp_secure_connection.secured", secure);
+    setServerProperty(orchestrator, "email.smtp_username.secured", username);
+    setServerProperty(orchestrator, "email.smtp_password.secured", password);
+    setServerProperty(orchestrator, "email.from", from);
+    setServerProperty(orchestrator, "email.prefix", prefix);
   }
 
   private static void sendEmail(String to, String subject, String message) {
diff --git a/it/it-tests/src/test/java/util/ItUtils.java b/it/it-tests/src/test/java/util/ItUtils.java
index 61207522e0a..9d1241340b1 100644
--- a/it/it-tests/src/test/java/util/ItUtils.java
+++ b/it/it-tests/src/test/java/util/ItUtils.java
@@ -36,6 +36,7 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -53,10 +54,8 @@ import org.sonar.wsclient.issue.IssueQuery;
 import org.sonar.wsclient.services.PropertyDeleteQuery;
 import org.sonar.wsclient.services.PropertyUpdateQuery;
 import org.sonarqube.ws.client.HttpConnector;
-import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.WsClientFactories;
-import org.sonarqube.ws.client.setting.ResetRequest;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.FluentIterable.from;
@@ -227,19 +226,17 @@ public class ItUtils {
   }
 
   public static void resetSettings(Orchestrator orchestrator, @Nullable String componentKey, String... keys) {
-    newAdminWsClient(orchestrator).settingsService().reset(ResetRequest.builder().setKeys(keys).setComponentKey(componentKey).build());
+    Arrays.stream(keys).forEach(key -> setServerProperty(orchestrator, componentKey, key, null));
   }
 
   public static void resetEmailSettings(Orchestrator orchestrator) {
-    newAdminWsClient(orchestrator).wsConnector().call(new PostRequest("/api/emails/update_configuration")).failIfNotSuccessful();
+    resetSettings(orchestrator, null, "email.smtp_host.secured", "email.smtp_port.secured", "email.smtp_secure_connection.secured", "email.smtp_username.secured",
+      "email.smtp_password.secured", "email.from", "email.prefix");
   }
 
   public static void resetPeriods(Orchestrator orchestrator) {
-    setServerProperty(orchestrator, "sonar.timemachine.period1", null);
-    setServerProperty(orchestrator, "sonar.timemachine.period2", null);
-    setServerProperty(orchestrator, "sonar.timemachine.period3", null);
-    setServerProperty(orchestrator, "sonar.timemachine.period4", null);
-    setServerProperty(orchestrator, "sonar.timemachine.period5", null);
+    resetSettings(orchestrator, null, "sonar.timemachine.period1", "sonar.timemachine.period2", "sonar.timemachine.period3", "sonar.timemachine.period4",
+      "sonar.timemachine.period5");
   }
 
   /**