Remove UserSession#locale

This method was useless as it was always returning Locale#ENGLISH

diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java b/server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java
index 421b94711af252c68ec95fa0be3c6501f8f4facc..fa61a25058447c8034a6eb250641b5310b1f1f58 100644 (file)
--- a/server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java
@@ -21,7 +21,6 @@ package org.sonar.ce.user;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import org.sonar.server.user.UserSession;
 
@@ -60,11 +59,6 @@ public class CeUserSession implements UserSession {
     return notImplementedBooleanMethod();
   }
 
-  @Override
-  public Locale locale() {
-    return notImplemented();
-  }
-
   @Override
   public boolean isRoot() {
     return notImplementedBooleanMethod();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java
index 16d9da1f777cef3cf46def9b22836cee83e634d2..6a472afffe3e244a59d8602cf56d13ec5cab87a4 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java
@@ -32,11 +32,19 @@ public class BadRequestException extends ServerException {
 
   private final transient Errors errors;
 
+  /**
+   * @deprecated Bundle key should be replaced by real message as only english is returned on server side errors
+   */
+  @Deprecated
   public BadRequestException(String l10nKey, Object... l10nParams) {
     super(HTTP_BAD_REQUEST);
     this.errors = new Errors().add(Message.of(l10nKey, l10nParams));
   }
 
+  /**
+   * @deprecated Bundle key should be replaced by real message as only english is returned on server side errors
+   */
+  @Deprecated
   public BadRequestException(List<Message> messages) {
     super(HTTP_BAD_REQUEST);
     this.errors = new Errors().add(messages);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/exceptions/Errors.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/Errors.java
index c3d0e70805e5822fb819af8080a79dd74e5280b3..e253908f6b18a6d4e17ab96449efde88fe04338d 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/exceptions/Errors.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/exceptions/Errors.java
@@ -21,14 +21,14 @@ package org.sonar.server.exceptions;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Lists;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.i18n.I18n;
 import org.sonar.api.utils.text.JsonWriter;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
+import static java.util.Locale.ENGLISH;
 
 public class Errors {
 
@@ -70,20 +70,12 @@ public class Errors {
     return expression;
   }
 
-  public void writeJson(JsonWriter json, I18n i18n, Locale locale) {
-    writeJson(json, i18n, locale, "errors");
-  }
-
-  public void writeJsonAsWarnings(JsonWriter json, I18n i18n, Locale locale) {
-    writeJson(json, i18n, locale, "warnings");
-  }
-
-  private void writeJson(JsonWriter json, I18n i18n, Locale locale, String name) {
+  public void writeJson(JsonWriter json, I18n i18n) {
     if (!messages.isEmpty()) {
-      json.name(name).beginArray();
+      json.name("errors").beginArray();
       for (Message message : messages) {
         json.beginObject();
-        String text = StringUtils.defaultString(i18n.message(locale, message.getKey(), message.getKey(), message.getParams()), message.getKey());
+        String text = StringUtils.defaultString(i18n.message(ENGLISH, message.getKey(), message.getKey(), message.getParams()), message.getKey());
         json.prop("msg", text);
         json.endObject();
       }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java b/server/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java
index 8949c926d87ffe7c781df6ea79be39f11a2500e3..8a3a11c060d333e79804e2fb6055cf9579470e4c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/exceptions/Message.java
@@ -20,13 +20,15 @@
 package org.sonar.server.exceptions;
 
 import com.google.common.base.MoreObjects;
-import org.apache.commons.lang.StringUtils;
-
+import java.util.Arrays;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
+import org.apache.commons.lang.StringUtils;
 
-import java.util.Arrays;
-
+/**
+ * @deprecated Bundle key should be replaced by real message as only english is returned on server side messages
+ */
+@Deprecated
 public class Message {
 
   private final String key;

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java
index bb48610221af8c4c7844d0b35dae7ed63e855518..1a6fe5899adda764c96e610598de79f78abf1ce4 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java
@@ -30,7 +30,6 @@ import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.server.qualityprofile.BulkChangeResult;
 import org.sonar.server.qualityprofile.QProfileService;
 import org.sonar.server.rule.ws.RuleQueryFactory;
-import org.sonar.server.user.UserSession;
 
 import static org.sonar.server.rule.ws.SearchAction.defineRuleSearchParameters;
 
@@ -46,13 +45,11 @@ public class BulkRuleActivationActions {
   private final QProfileService profileService;
   private final RuleQueryFactory ruleQueryFactory;
   private final I18n i18n;
-  private final UserSession userSession;
 
-  public BulkRuleActivationActions(QProfileService profileService, RuleQueryFactory ruleQueryFactory, I18n i18n, UserSession userSession) {
+  public BulkRuleActivationActions(QProfileService profileService, RuleQueryFactory ruleQueryFactory, I18n i18n) {
     this.profileService = profileService;
     this.ruleQueryFactory = ruleQueryFactory;
     this.i18n = i18n;
-    this.userSession = userSession;
   }
 
   void define(WebService.NewController controller) {
@@ -98,7 +95,7 @@ public class BulkRuleActivationActions {
     defineProfileKeyParameter(deactivate);
   }
 
-  private void defineProfileKeyParameter(WebService.NewAction action) {
+  private static void defineProfileKeyParameter(WebService.NewAction action) {
     action.createParam(PROFILE_KEY)
       .setDescription("Quality Profile Key. To retrieve a profile key for a given language please see the api/qprofiles documentation")
       .setRequired(true)
@@ -124,7 +121,7 @@ public class BulkRuleActivationActions {
     JsonWriter json = response.newJsonWriter().beginObject();
     json.prop("succeeded", result.countSucceeded());
     json.prop("failed", result.countFailed());
-    result.getErrors().writeJsonAsWarnings(json, i18n, userSession.locale());
+    result.getErrors().writeJson(json, i18n);
     json.endObject().close();
   }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java b/server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
index 80f3699a046894913cc08058a767413766c60e81..fa1c399e547f5c26f5e3948bcd8b7879f5441b64 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/DoPrivileged.java
@@ -21,7 +21,6 @@ package org.sonar.server.user;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import org.sonar.api.security.DefaultGroups;
 import org.sonar.core.permission.GlobalPermissions;
@@ -97,11 +96,6 @@ public final class DoPrivileged {
         return false;
       }
 
-      @Override
-      public Locale locale() {
-        return Locale.getDefault();
-      }
-
       @Override
       public boolean hasPermission(String globalPermission) {
         return true;
@@ -132,7 +126,7 @@ public final class DoPrivileged {
       oldUserSession = threadLocalUserSession.hasSession() ? threadLocalUserSession.get() : null;
       threadLocalUserSession.set(new PrivilegedUserSession());
     }
-  
+
     private void stop() {
       threadLocalUserSession.unload();
       if (oldUserSession != null) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java
index 071c8ebc657f7e3453bf2f17cf9f4ca5c79256b2..ce379734db82870f590ede6982fb3cb6a10571f2 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
@@ -119,11 +118,6 @@ public class ServerUserSession extends AbstractUserSession {
     return userDto != null;
   }
 
-  @Override
-  public Locale locale() {
-    return Locale.ENGLISH;
-  }
-
   @Override
   public boolean isRoot() {
     return userDto != null && userDto.isRoot();
@@ -142,7 +136,7 @@ public class ServerUserSession extends AbstractUserSession {
       permissionsByOrganizationUuid.putAll(organizationUuid, permissions);
     }
     return permissions.contains(permission);
- }
+  }
 
   private Set<String> loadOrganizationPermissions(String organizationUuid) {
     try (DbSession dbSession = dbClient.openSession(false)) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
index deaaf1406c1529f47cb9021dd6ff4cade95d14e2..5c507d3ff1990a8ad73150d7749ed1b00dad7e57 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
@@ -21,7 +21,6 @@ package org.sonar.server.user;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import javax.annotation.CheckForNull;
 import org.sonar.server.exceptions.UnauthorizedException;
@@ -81,11 +80,6 @@ public class ThreadLocalUserSession implements UserSession {
     return get().isLoggedIn();
   }
 
-  @Override
-  public Locale locale() {
-    return get().locale();
-  }
-
   @Override
   public boolean isRoot() {
     return get().isRoot();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
index 52acb705f90fc274429abd0682048b527c7da331..a108fd10e0ad418f2190526c8422f71648e41d86 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
@@ -21,7 +21,6 @@ package org.sonar.server.user;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import javax.annotation.CheckForNull;
 
@@ -43,12 +42,6 @@ public interface UserSession {
 
   boolean isLoggedIn();
 
-  /**
-   * @deprecated Always returning {@link Locale#ENGLISH}
-   */
-  @Deprecated
-  Locale locale();
-
   boolean isRoot();
 
   /**
@@ -129,7 +122,7 @@ public interface UserSession {
 
   /**
    * Does the user have the given project permission for a component uuid ?
-
+  
    * First, check if the user has the global permission (even if the component doesn't exist)
    * If not, check is the user has the permission on the project of the component
    * If the component doesn't exist, return false

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java
index caa1ec13598faca1143543dcc2e9d44f6838b784..de8bc866750eaba4b402248b65fff22cf0562454 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java
@@ -22,7 +22,6 @@ package org.sonar.server.user.ws;
 import com.google.common.collect.ImmutableSet;
 import java.util.Collections;
 import java.util.List;
-import org.sonar.api.i18n.I18n;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
@@ -36,6 +35,7 @@ import org.sonar.server.user.UserSession;
 import org.sonar.server.user.UserUpdater;
 import org.sonarqube.ws.client.user.CreateRequest;
 
+import static java.lang.String.format;
 import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_EMAIL;
 import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_LOGIN;
 import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_NAME;
@@ -48,14 +48,12 @@ public class CreateAction implements UsersWsAction {
 
   private final DbClient dbClient;
   private final UserUpdater userUpdater;
-  private final I18n i18n;
   private final UserSession userSession;
   private final UserJsonWriter userWriter;
 
-  public CreateAction(DbClient dbClient, UserUpdater userUpdater, I18n i18n, UserSession userSession, UserJsonWriter userWriter) {
+  public CreateAction(DbClient dbClient, UserUpdater userUpdater, UserSession userSession, UserJsonWriter userWriter) {
     this.dbClient = dbClient;
     this.userUpdater = userUpdater;
-    this.i18n = i18n;
     this.userSession = userSession;
     this.userWriter = userWriter;
   }
@@ -131,10 +129,10 @@ public class CreateAction implements UsersWsAction {
     userWriter.write(json, user, ImmutableSet.of(), UserJsonWriter.FIELDS);
   }
 
-  private void writeReactivationMessage(JsonWriter json, String login) {
+  private static void writeReactivationMessage(JsonWriter json, String login) {
     json.name("infos").beginArray();
     json.beginObject();
-    String text = i18n.message(userSession.locale(), "user.reactivated", "user.reactivated", login);
+    String text = format("The user '%s' has been reactivated", login);
     json.prop("msg", text);
     json.endObject();
     json.endArray();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
index 889ba49b7f91176d95fa3cad072a3aa7daf27dd6..6c0e8ca4b03d849184cb595c41e6818b8c70e764 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
@@ -149,7 +149,7 @@ public class WebServiceEngine implements LocalConnector, Startable {
 
     try {
       json.beginObject();
-      errors.writeJson(json, i18n, userSession.locale());
+      errors.writeJson(json, i18n);
       json.endObject();
     } finally {
       // TODO if close() fails, the runtime exception should not hide the

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java
index 355912b45b21398518c44576084242205f53fa29..ddc1ec3f952e7ddb663365cb415c600299a75d83 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java
@@ -20,13 +20,11 @@
 package org.sonar.server.component.ws;
 
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.utils.System2;
 import org.sonar.api.web.UserRole;
 import org.sonar.db.DbTester;
@@ -43,6 +41,13 @@ import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.WsTester;
 
 import static org.mockito.Mockito.mock;
+import static org.sonar.api.measures.CoreMetrics.COVERAGE_KEY;
+import static org.sonar.api.measures.CoreMetrics.DUPLICATED_LINES_DENSITY_KEY;
+import static org.sonar.api.measures.CoreMetrics.LINES_KEY;
+import static org.sonar.api.measures.CoreMetrics.SQALE_DEBT_RATIO_KEY;
+import static org.sonar.api.measures.CoreMetrics.SQALE_RATING_KEY;
+import static org.sonar.api.measures.CoreMetrics.TECHNICAL_DEBT_KEY;
+import static org.sonar.api.measures.CoreMetrics.getMetric;
 
 public class AppActionTest {
 
@@ -86,17 +91,16 @@ public class AppActionTest {
   @Test
   public void file_with_measures() throws Exception {
     insertComponentsAndAnalysis();
-    insertFileMeasure(metricsByKey.get(CoreMetrics.LINES_KEY).getId(), 200d, null);
-    insertFileMeasure(metricsByKey.get(CoreMetrics.DUPLICATED_LINES_DENSITY_KEY).getId(), 7.4, null);
-    insertFileMeasure(metricsByKey.get(CoreMetrics.SQALE_RATING_KEY).getId(), null, "C");
-    insertFileMeasure(metricsByKey.get(CoreMetrics.TECHNICAL_DEBT_KEY).getId(), 182d, null);
-    insertFileMeasure(metricsByKey.get(CoreMetrics.SQALE_DEBT_RATIO_KEY).getId(), 35d, null);
-    insertFileMeasure(metricsByKey.get(CoreMetrics.COVERAGE_KEY).getId(), 95.4d, null);
+    insertFileMeasure(metricsByKey.get(LINES_KEY).getId(), 200d, null);
+    insertFileMeasure(metricsByKey.get(DUPLICATED_LINES_DENSITY_KEY).getId(), 7.4, null);
+    insertFileMeasure(metricsByKey.get(SQALE_RATING_KEY).getId(), null, "C");
+    insertFileMeasure(metricsByKey.get(TECHNICAL_DEBT_KEY).getId(), 182d, null);
+    insertFileMeasure(metricsByKey.get(SQALE_DEBT_RATIO_KEY).getId(), 35d, null);
+    insertFileMeasure(metricsByKey.get(COVERAGE_KEY).getId(), 95.4d, null);
     dbTester.commit();
 
     userSessionRule
       .login("john")
-      .setLocale(Locale.ENGLISH)
       .addComponentUuidPermission(UserRole.USER, PROJECT_UUID, FILE_UUID);
     WsTester.TestRequest request = wsTester.newGetRequest("api/components", "app").setParam("uuid", FILE_UUID);
     request.execute().assertJson(getClass(), "app_with_measures.json");
@@ -105,7 +109,7 @@ public class AppActionTest {
   @Test
   public void file_with_coverage() throws Exception {
     insertComponentsAndAnalysis();
-    insertFileMeasure(metricsByKey.get(CoreMetrics.COVERAGE_KEY).getId(), 95.4, null);
+    insertFileMeasure(metricsByKey.get(COVERAGE_KEY).getId(), 95.4, null);
     dbTester.commit();
 
     userSessionRule.login("john").addComponentUuidPermission(UserRole.USER, PROJECT_UUID, FILE_UUID);
@@ -116,7 +120,7 @@ public class AppActionTest {
   private void insertMetrics() {
     metricsByKey = new HashMap<>();
     for (String metricKey : AppAction.METRIC_KEYS) {
-      MetricDto dto = RegisterMetrics.MetricToDto.INSTANCE.apply(CoreMetrics.getMetric(metricKey));
+      MetricDto dto = RegisterMetrics.MetricToDto.INSTANCE.apply(getMetric(metricKey));
       dbTester.getDbClient().metricDao().insert(dbTester.getSession(), dto);
       metricsByKey.put(metricKey, dto);
     }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java
index bcaa5df67f787d2313a4f9a51b9e56a0d3916d92..06167e5ff7e2bbe997c562a9afc9da129d247927 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java
@@ -63,7 +63,7 @@ public class QProfilesWsTest {
 
     controller = new WsTester(new QProfilesWs(
       new RuleActivationActions(profileService),
-      new BulkRuleActivationActions(profileService, null, i18n, userSessionRule),
+      new BulkRuleActivationActions(profileService, null, i18n),
       new AddProjectAction(projectAssociationParameters, null, null, dbClient),
       new RemoveProjectAction(projectAssociationParameters, null, null, dbClient),
       new CreateAction(null, null, null, languages, importers, userSessionRule, null),
@@ -192,13 +192,6 @@ public class QProfilesWsTest {
     assertThat(restore.params()).hasSize(1);
   }
 
-  public void define_bulk_activate_rule_action() {
-    WebService.Action restoreProfiles = controller.action(BulkRuleActivationActions.BULK_ACTIVATE_ACTION);
-    assertThat(restoreProfiles).isNotNull();
-    assertThat(restoreProfiles.isPost()).isTrue();
-    assertThat(restoreProfiles.params()).hasSize(20);
-  }
-
   @Test
   public void define_bulk_deactivate_rule_action() {
     WebService.Action restoreProfiles = controller.action(BulkRuleActivationActions.BULK_DEACTIVATE_ACTION);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java b/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
index 4d93bd164f46e75ce8e9013b75d733f7fefac3bc..56261cd7e3cbe507a8442bbb3313c8cf8213c2fe 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
@@ -25,9 +25,7 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.sonar.api.security.DefaultGroups;
@@ -38,7 +36,6 @@ import static com.google.common.collect.Maps.newHashMap;
 
 public abstract class AbstractMockUserSession<T extends AbstractMockUserSession> extends AbstractUserSession {
   private final Class<T> clazz;
-  private Locale locale = Locale.ENGLISH;
   private Set<String> userGroups = Sets.newHashSet(DefaultGroups.ANYONE);
   private List<String> globalPermissions = Collections.emptyList();
   private HashMultimap<String, String> projectKeyByPermission = HashMultimap.create();
@@ -70,16 +67,6 @@ public abstract class AbstractMockUserSession<T extends AbstractMockUserSession>
     return clazz.cast(this);
   }
 
-  @Override
-  public Locale locale() {
-    return this.locale;
-  }
-
-  public T setLocale(Locale locale) {
-    this.locale = Objects.requireNonNull(locale);
-    return clazz.cast(this);
-  }
-
   /**
    * Deprecated, please use {@link #addProjectUuidPermissions}
    */

diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
index bda0e4395cb836157dff1489cfd6880c90f42f31..05ebfe0c2c3d3254af9aea5e506ec4ea29405a22 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
@@ -22,7 +22,6 @@ package org.sonar.server.tester;
 import com.google.common.base.Preconditions;
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
@@ -213,11 +212,6 @@ public class UserSessionRule implements TestRule, UserSession {
     return this;
   }
 
-  public UserSessionRule setLocale(@Nullable Locale l) {
-    ensureAbstractMockUserSession().setLocale(l);
-    return this;
-  }
-
   public UserSessionRule addComponentUuidPermission(String projectPermission, String projectUuid, String componentUuid) {
     ensureAbstractMockUserSession().addComponentUuidPermission(projectPermission, projectUuid, componentUuid);
     return this;
@@ -288,11 +282,6 @@ public class UserSessionRule implements TestRule, UserSession {
     return currentUserSession.isLoggedIn();
   }
 
-  @Override
-  public Locale locale() {
-    return currentUserSession.locale();
-  }
-
   @Override
   public boolean isRoot() {
     return currentUserSession.isRoot();

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java
index 77b27a7c7149da984370d496f727412a343c4128..38058382c472538649c5ff5e8c964c352c22f43c 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ThreadLocalUserSessionTest.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.user;
 
-import java.util.Locale;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -53,7 +52,7 @@ public class ThreadLocalUserSessionTest {
 
   @Test
   public void get_session_for_user() {
-    AbstractMockUserSession expected = new MockUserSession("karadoc").setUserId(123).setLocale(Locale.FRENCH);
+    AbstractMockUserSession expected = new MockUserSession("karadoc").setUserId(123);
     threadLocalUserSession.set(expected);
 
     UserSession session = threadLocalUserSession.get();
@@ -61,7 +60,6 @@ public class ThreadLocalUserSessionTest {
     assertThat(threadLocalUserSession.getUserId()).isEqualTo(123);
     assertThat(threadLocalUserSession.getLogin()).isEqualTo("karadoc");
     assertThat(threadLocalUserSession.isLoggedIn()).isTrue();
-    assertThat(threadLocalUserSession.locale()).isEqualTo(Locale.FRENCH);
   }
 
   @Test
@@ -74,8 +72,6 @@ public class ThreadLocalUserSessionTest {
     assertThat(threadLocalUserSession.getLogin()).isNull();
     assertThat(threadLocalUserSession.getUserId()).isNull();
     assertThat(threadLocalUserSession.isLoggedIn()).isFalse();
-    // default locale
-    assertThat(threadLocalUserSession.locale()).isEqualTo(Locale.ENGLISH);
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java
index 35dd5e673ce6e1d12d2b206af14440097b22b257..ae939e0c799658fd7e79bc8083f65edd95a4f84a 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.user.ws;
 
-import java.util.Locale;
 import java.util.Optional;
 import org.junit.Before;
 import org.junit.Rule;
@@ -51,7 +50,6 @@ import org.sonar.server.ws.WsTester;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 import static org.sonar.db.user.UserTesting.newUserDto;
 
 public class CreateActionTest {
@@ -81,9 +79,10 @@ public class CreateActionTest {
     userIndexer = new UserIndexer(system2, db.getDbClient(), esTester.client());
     index = new UserIndex(esTester.client());
     DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db);
-    tester = new WsTester(new UsersWs(new CreateAction(db.getDbClient(),
-      new UserUpdater(mock(NewUserNotifier.class), settings, db.getDbClient(), userIndexer, system2, defaultOrganizationProvider),
-      i18n, userSessionRule, new UserJsonWriter(userSessionRule))));
+    tester = new WsTester(new UsersWs(
+      new CreateAction(db.getDbClient(),
+        new UserUpdater(mock(NewUserNotifier.class), settings, db.getDbClient(), userIndexer, system2, defaultOrganizationProvider),
+        userSessionRule, new UserJsonWriter(userSessionRule))));
   }
 
   @Test
@@ -161,13 +160,12 @@ public class CreateActionTest {
 
   @Test
   public void reactivate_user() throws Exception {
-    userSessionRule.login("admin").setLocale(Locale.FRENCH).setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
+    userSessionRule.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
 
     db.users().insertUser(newUserDto("john", "John", "john@email.com"));
     db.getDbClient().userDao().deactivateUserByLogin(db.getSession(), "john");
     db.commit();
     userIndexer.index();
-    when(i18n.message(Locale.FRENCH, "user.reactivated", "user.reactivated", "john")).thenReturn("The user 'john' has been reactivated.");
 
     tester.newPostRequest("api/users", "create")
       .setParam("login", "john")

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java
index 9d7c9ed2c60759fca0ef93f661b11cfd872add8c..fff1bbdbc4529a911ea68502ed074182b10ae091 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java
@@ -22,7 +22,6 @@ package org.sonar.server.user.ws;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonar.api.i18n.I18n;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.db.DbClient;
 import org.sonar.server.tester.UserSessionRule;
@@ -42,7 +41,7 @@ public class UsersWsTest {
   @Before
   public void setUp() {
     WsTester tester = new WsTester(new UsersWs(
-      new CreateAction(mock(DbClient.class), mock(UserUpdater.class), mock(I18n.class), userSessionRule, mock(UserJsonWriter.class)),
+      new CreateAction(mock(DbClient.class), mock(UserUpdater.class), userSessionRule, mock(UserJsonWriter.class)),
       new UpdateAction(mock(UserUpdater.class), userSessionRule, mock(UserJsonWriter.class), mock(DbClient.class)),
       new CurrentAction(userSessionRule, mock(org.sonar.db.DbClient.class)),
       new ChangePasswordAction(mock(UserUpdater.class), userSessionRule),

diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java
index 675fb59c1559e2366ab802e5b64aac720cbc8a26..e0b863b396e247c8f509259bb6acd6750e3e7cc0 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java
@@ -248,7 +248,6 @@ public class WebServiceEngineTest {
 
   @Test
   public void bad_request_with_i18n_message() {
-    userSessionRule.setLocale(Locale.ENGLISH);
     ValidatingRequest request = new TestRequest().setMethod("GET").setPath("/api/system/fail_with_i18n_message").setParam("count", "3");
     DumbResponse response = new DumbResponse();
     when(i18n.message(Locale.ENGLISH, "bad.request.reason", "bad.request.reason", 0)).thenReturn("reason #0");
@@ -279,8 +278,6 @@ public class WebServiceEngineTest {
 
   @Test
   public void bad_request_with_multiple_i18n_messages() {
-    userSessionRule.setLocale(Locale.ENGLISH);
-
     ValidatingRequest request = new TestRequest().setMethod("GET").setPath("/api/system/fail_with_multiple_i18n_messages").setParam("count", "3");
     DumbResponse response = new DumbResponse();
     when(i18n.message(Locale.ENGLISH, "bad.request.reason", "bad.request.reason", 0)).thenReturn("reason #0");

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json b/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json
index b9b4bd50809b6317d18bfb10a88b920dff8f9991..caaf7e570c0d7bf1b12e084e38f546db012dc6c4 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CreateActionTest/reactivate_user.json
@@ -9,7 +9,7 @@
   },
   "infos": [
     {
-      "msg": "The user 'john' has been reactivated."
+      "msg": "The user 'john' has been reactivated"
     }
   ]
 }