SONAR-7254 Replace usage of UserIndex.getByLogin() by UserDao.selectO…

…rFailByLogin()

server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java

@@ -27,15 +27,13 @@
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
-import org.sonar.db.MyBatis;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.measure.custom.CustomMeasureDto;
 import org.sonar.db.metric.MetricDto;
+import org.sonar.db.user.UserDto;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.user.index.UserDoc;
-import org.sonar.server.user.index.UserIndex;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.sonar.server.component.ComponentFinder.ParamNames.PROJECT_ID_AND_KEY;
@@ -57,17 +55,15 @@ public class CreateAction implements CustomMeasuresWsAction {
   private final System2 system;
   private final CustomMeasureValidator validator;
   private final CustomMeasureJsonWriter customMeasureJsonWriter;
-  private final UserIndex userIndex;
   private final ComponentFinder componentFinder;
 
   public CreateAction(DbClient dbClient, UserSession userSession, System2 system, CustomMeasureValidator validator, CustomMeasureJsonWriter customMeasureJsonWriter,
-    UserIndex userIndex, ComponentFinder componentFinder) {
+    ComponentFinder componentFinder) {
     this.dbClient = dbClient;
     this.userSession = userSession;
     this.system = system;
     this.validator = validator;
     this.customMeasureJsonWriter = customMeasureJsonWriter;
-    this.userIndex = userIndex;
     this.componentFinder = componentFinder;
   }
 
@@ -120,12 +116,12 @@ public void handle(Request request, Response response) throws Exception {
       checkPermissions(userSession, component);
       checkIsProjectOrModule(component);
       checkMeasureDoesNotExistAlready(dbSession, component, metric);
-      UserDoc user = userIndex.getByLogin(userSession.getLogin());
+      UserDto user = dbClient.userDao().selectOrFailByLogin(dbSession, userSession.getLogin());
       CustomMeasureDto measure = new CustomMeasureDto()
         .setComponentUuid(component.uuid())
         .setMetricId(metric.getId())
         .setDescription(description)
-        .setUserLogin(user.login())
+        .setUserLogin(user.getLogin())
         .setCreatedAt(now)
         .setUpdatedAt(now);
       validator.setMeasureValue(measure, valueAsString, metric);
@@ -136,7 +132,7 @@ public void handle(Request request, Response response) throws Exception {
       customMeasureJsonWriter.write(json, measure, metric, component, user, true, CustomMeasureJsonWriter.OPTIONAL_FIELDS);
       json.close();
     } finally {
-      MyBatis.closeQuietly(dbSession);
+      dbClient.closeSession(dbSession);
     }
   }
 

server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java

@@ -27,11 +27,11 @@
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.sonar.api.measures.Metric;
-import org.sonar.api.user.User;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.measure.custom.CustomMeasureDto;
 import org.sonar.db.metric.MetricDto;
+import org.sonar.db.user.UserDto;
 import org.sonar.server.metric.ws.MetricJsonWriter;
 import org.sonar.server.user.ws.UserJsonWriter;
 
@@ -59,7 +59,7 @@ public CustomMeasureJsonWriter(UserJsonWriter userJsonWriter) {
     this.userJsonWriter = userJsonWriter;
   }
 
-  public void write(JsonWriter json, CustomMeasureDto measure, MetricDto metric, ComponentDto component, User user, boolean isPending, Collection<String> fieldsToReturn) {
+  public void write(JsonWriter json, CustomMeasureDto measure, MetricDto metric, ComponentDto component, UserDto user, boolean isPending, Collection<String> fieldsToReturn) {
     json.beginObject();
     json.prop(FIELD_ID, String.valueOf(measure.getId()));
     writeIfNeeded(json, measureValue(measure, metric), FIELD_VALUE, fieldsToReturn);
@@ -109,7 +109,7 @@ private String measureValue(CustomMeasureDto measure, MetricDto metric) {
     }
   }
 
-  public void write(JsonWriter json, List<CustomMeasureDto> customMeasures, ComponentDto project, Map<Integer, MetricDto> metricsById, Map<String, User> usersByLogin,
+  public void write(JsonWriter json, List<CustomMeasureDto> customMeasures, ComponentDto project, Map<Integer, MetricDto> metricsById, Map<String, UserDto> usersByLogin,
     @Nullable Long lastAnalysisTimestamp, Collection<String> fieldsToReturn) {
     json.name("customMeasures");
     json.beginArray();

server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java

@@ -31,7 +31,6 @@
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
-import org.sonar.api.user.User;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
@@ -40,10 +39,10 @@
 import org.sonar.db.component.SnapshotDto;
 import org.sonar.db.measure.custom.CustomMeasureDto;
 import org.sonar.db.metric.MetricDto;
+import org.sonar.db.user.UserDto;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.es.SearchOptions;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.user.index.UserIndex;
 
 import static com.google.common.collect.Sets.newHashSet;
 import static org.sonar.server.component.ComponentFinder.ParamNames.PROJECT_ID_AND_KEY;
@@ -58,14 +57,12 @@ public class SearchAction implements CustomMeasuresWsAction {
   public static final String PARAM_PROJECT_KEY = "projectKey";
 
   private final DbClient dbClient;
-  private final UserIndex userIndex;
   private final CustomMeasureJsonWriter customMeasureJsonWriter;
   private final UserSession userSession;
   private final ComponentFinder componentFinder;
 
-  public SearchAction(DbClient dbClient, UserIndex userIndex, CustomMeasureJsonWriter customMeasureJsonWriter, UserSession userSession, ComponentFinder componentFinder) {
+  public SearchAction(DbClient dbClient, CustomMeasureJsonWriter customMeasureJsonWriter, UserSession userSession, ComponentFinder componentFinder) {
     this.dbClient = dbClient;
-    this.userIndex = userIndex;
     this.customMeasureJsonWriter = customMeasureJsonWriter;
     this.userSession = userSession;
     this.componentFinder = componentFinder;
@@ -107,7 +104,7 @@ public void handle(Request request, Response response) throws Exception {
       Long lastAnalysisDateMs = searchLastSnapshot(dbSession, project);
       List<CustomMeasureDto> customMeasures = searchCustomMeasures(dbSession, project, searchOptions);
       int nbCustomMeasures = countTotalOfCustomMeasures(dbSession, project);
-      Map<String, User> usersByLogin = usersByLogin(customMeasures);
+      Map<String, UserDto> usersByLogin = usersByLogin(dbSession, customMeasures);
       Map<Integer, MetricDto> metricsById = metricsById(dbSession, customMeasures);
 
       writeResponse(response, customMeasures, nbCustomMeasures, project, metricsById, usersByLogin, lastAnalysisDateMs, searchOptions, fieldsToReturn);
@@ -132,7 +129,7 @@ private List<CustomMeasureDto> searchCustomMeasures(DbSession dbSession, Compone
   }
 
   private void writeResponse(Response response, List<CustomMeasureDto> customMeasures, int nbCustomMeasures, ComponentDto project, Map<Integer, MetricDto> metricsById,
-                             Map<String, User> usersByLogin, @Nullable Long lastAnalysisDate, SearchOptions searchOptions, List<String> fieldsToReturn) {
+    Map<String, UserDto> usersByLogin, @Nullable Long lastAnalysisDate, SearchOptions searchOptions, List<String> fieldsToReturn) {
     JsonWriter json = response.newJsonWriter();
     json.beginObject();
     customMeasureJsonWriter.write(json, customMeasures, project, metricsById, usersByLogin, lastAnalysisDate, fieldsToReturn);
@@ -146,10 +143,12 @@ private Map<Integer, MetricDto> metricsById(DbSession dbSession, List<CustomMeas
     return Maps.uniqueIndex(metrics, MetricToIdFunction.INSTANCE);
   }
 
-  private Map<String, User> usersByLogin(List<CustomMeasureDto> customMeasures) {
-    return FluentIterable.from(customMeasures)
+  private Map<String, UserDto> usersByLogin(DbSession dbSession, List<CustomMeasureDto> customMeasures) {
+    List<String> logins = FluentIterable.from(customMeasures)
       .transform(CustomMeasureToUserLoginFunction.INSTANCE)
-      .toMap(new UserLoginToUserFunction());
+      .toList();
+    List<UserDto> userDtos = dbClient.userDao().selectByLogins(dbSession, logins);
+    return FluentIterable.from(userDtos).uniqueIndex(UserDtoToLogin.INSTANCE);
   }
 
   private enum CustomMeasureToUserLoginFunction implements Function<CustomMeasureDto, String> {
@@ -161,10 +160,12 @@ public String apply(@Nonnull CustomMeasureDto customMeasure) {
     }
   }
 
-  private final class UserLoginToUserFunction implements Function<String, User> {
+  private enum UserDtoToLogin implements Function<UserDto, String> {
+    INSTANCE;
+
     @Override
-    public User apply(@Nonnull String userLogin) {
-      return userIndex.getByLogin(userLogin);
+    public String apply(@Nonnull UserDto input) {
+      return input.getLogin();
     }
   }
 

server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java

@@ -23,7 +23,6 @@
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
-import org.sonar.api.user.User;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.db.DbClient;
@@ -32,8 +31,8 @@
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.measure.custom.CustomMeasureDto;
 import org.sonar.db.metric.MetricDto;
+import org.sonar.db.user.UserDto;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.user.index.UserIndex;
 
 import static org.sonar.server.measure.custom.ws.CustomMeasureValidator.checkPermissions;
 import static org.sonar.server.measure.custom.ws.CustomMeasureValueDescription.measureValueDescription;
@@ -49,16 +48,13 @@ public class UpdateAction implements CustomMeasuresWsAction {
   private final System2 system;
   private final CustomMeasureValidator validator;
   private final CustomMeasureJsonWriter customMeasureJsonWriter;
-  private final UserIndex userIndex;
 
-  public UpdateAction(DbClient dbClient, UserSession userSession, System2 system, CustomMeasureValidator validator, CustomMeasureJsonWriter customMeasureJsonWriter,
-    UserIndex userIndex) {
+  public UpdateAction(DbClient dbClient, UserSession userSession, System2 system, CustomMeasureValidator validator, CustomMeasureJsonWriter customMeasureJsonWriter) {
     this.dbClient = dbClient;
     this.userSession = userSession;
     this.system = system;
     this.validator = validator;
     this.customMeasureJsonWriter = customMeasureJsonWriter;
-    this.userIndex = userIndex;
   }
 
   @Override
@@ -96,11 +92,11 @@ public void handle(Request request, Response response) throws Exception {
       MetricDto metric = dbClient.metricDao().selectOrFailById(dbSession, customMeasure.getMetricId());
       ComponentDto component = dbClient.componentDao().selectOrFailByUuid(dbSession, customMeasure.getComponentUuid());
       checkPermissions(userSession, component);
-      User user = userIndex.getByLogin(userSession.getLogin());
+      UserDto user = dbClient.userDao().selectOrFailByLogin(dbSession, userSession.getLogin());
 
       setValue(customMeasure, value, metric);
       setDescription(customMeasure, description);
-      customMeasure.setUserLogin(user.login());
+      customMeasure.setUserLogin(user.getLogin());
       customMeasure.setUpdatedAt(system.now());
       dbClient.customMeasureDao().update(dbSession, customMeasure);
       dbSession.commit();

server/sonar-server/src/main/java/org/sonar/server/startup/FeedUsersLocalStartupTask.java

@@ -68,44 +68,44 @@ public FeedUsersLocalStartupTask(System2 system2, DbClient dbClient, Settings se
 
   @Override
   public void start() {
-    DbSession session = dbClient.openSession(false);
+    DbSession dbSession = dbClient.openSession(false);
     try {
-      if (hasAlreadyBeenExecuted(session)) {
+      if (hasAlreadyBeenExecuted(dbSession)) {
         return;
       }
-      updateUsersLocal(session);
-      markAsExecuted(session);
-      session.commit();
+      updateUsersLocal(dbSession);
+      markAsExecuted(dbSession);
+      dbSession.commit();
 
       if (settings.hasKey(LOCAL_USERS_PROPERTY)) {
         LOG.info("NOTE : The property '{}' is now no more needed, you can safely remove it.", LOCAL_USERS_PROPERTY);
       }
     } finally {
-      dbClient.closeSession(session);
+      dbClient.closeSession(dbSession);
     }
   }
 
-  private void updateUsersLocal(DbSession session) {
+  private void updateUsersLocal(DbSession dbSession) {
     long now = system2.now();
     Set<String> localUsers = new HashSet<>(asList(settings.getStringArray(LOCAL_USERS_PROPERTY)));
     boolean isRealmExist = settings.getString(CORE_AUTHENTICATOR_REALM) != null;
-    for (UserDto user : dbClient.userDao().selectUsers(session, UserQuery.ALL_ACTIVES)) {
+    for (UserDto user : dbClient.userDao().selectUsers(dbSession, UserQuery.ALL_ACTIVES)) {
       if (user.getExternalIdentityProvider().equals(UserUpdater.SQ_AUTHORITY)) {
         user.setLocal(!isRealmExist || localUsers.contains(user.getLogin()));
       } else {
         user.setLocal(false);
       }
       user.setUpdatedAt(now);
-      dbClient.userDao().update(session, user);
+      dbClient.userDao().update(dbSession, user);
     }
   }
 
-  private boolean hasAlreadyBeenExecuted(DbSession session) {
-    return dbClient.loadedTemplateDao().countByTypeAndKey(ONE_SHOT_TASK_TYPE, TEMPLATE_KEY, session) > 0;
+  private boolean hasAlreadyBeenExecuted(DbSession dbSession) {
+    return dbClient.loadedTemplateDao().countByTypeAndKey(ONE_SHOT_TASK_TYPE, TEMPLATE_KEY, dbSession) > 0;
   }
 
-  private void markAsExecuted(DbSession session) {
-    dbClient.loadedTemplateDao().insert(new LoadedTemplateDto(TEMPLATE_KEY, ONE_SHOT_TASK_TYPE), session);
+  private void markAsExecuted(DbSession dbSession) {
+    dbClient.loadedTemplateDao().insert(new LoadedTemplateDto(TEMPLATE_KEY, ONE_SHOT_TASK_TYPE), dbSession);
   }
 
   @Override

server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java

@@ -26,11 +26,12 @@
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.permission.GlobalPermissions;
+import org.sonar.db.DbClient;
+import org.sonar.db.DbSession;
+import org.sonar.db.user.UserDto;
 import org.sonar.server.user.NewUser;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.user.UserUpdater;
-import org.sonar.server.user.index.UserDoc;
-import org.sonar.server.user.index.UserIndex;
 
 public class CreateAction implements UsersWsAction {
 
@@ -41,14 +42,14 @@ public class CreateAction implements UsersWsAction {
   private static final String PARAM_SCM_ACCOUNTS = "scmAccounts";
   private static final String PARAM_SCM_ACCOUNTS_DEPRECATED = "scm_accounts";
 
-  private final UserIndex index;
+  private final DbClient dbClient;
   private final UserUpdater userUpdater;
   private final I18n i18n;
   private final UserSession userSession;
   private final UserJsonWriter userWriter;
 
-  public CreateAction(UserIndex index, UserUpdater userUpdater, I18n i18n, UserSession userSession, UserJsonWriter userWriter) {
-    this.index = index;
+  public CreateAction(DbClient dbClient, UserUpdater userUpdater, I18n i18n, UserSession userSession, UserJsonWriter userWriter) {
+    this.dbClient = dbClient;
     this.userUpdater = userUpdater;
     this.i18n = i18n;
     this.userSession = userSession;
@@ -107,7 +108,7 @@ public void handle(Request request, Response response) throws Exception {
   }
 
   private void writeResponse(Response response, String login, boolean isUserReactivated) {
-    UserDoc user = index.getByLogin(login);
+    UserDto user = loadUser(login);
     JsonWriter json = response.newJsonWriter().beginObject();
     writeUser(json, user);
     if (isUserReactivated) {
@@ -116,7 +117,7 @@ private void writeResponse(Response response, String login, boolean isUserReacti
     json.endObject().close();
   }
 
-  private void writeUser(JsonWriter json, UserDoc user) {
+  private void writeUser(JsonWriter json, UserDto user) {
     json.name("user");
     userWriter.write(json, user, ImmutableSet.<String>of(), UserJsonWriter.FIELDS);
   }
@@ -129,4 +130,13 @@ private void writeReactivationMessage(JsonWriter json, String login) {
     json.endObject();
     json.endArray();
   }
+
+  private UserDto loadUser(String login){
+    DbSession dbSession = dbClient.openSession(false);
+    try {
+      return dbClient.userDao().selectOrFailByLogin(dbSession, login);
+    } finally {
+      dbClient.closeSession(dbSession);
+    }
+  }
 }

server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java

@@ -94,6 +94,7 @@ private void writeUserDetails(JsonWriter json, Optional<UserDto> optionalUser, C
       if (!isNullOrEmpty(user.getEmail())) {
         json.prop("email", user.getEmail());
       }
+      json.prop("local", user.isLocal());
     }
 
     writeScmAccounts(json, optionalUser);