Replace MyBatis SqlSession by org.sonar.db.DbSession

diff --git a/sonar-db/src/main/java/org/sonar/db/permission/PermissionDao.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionDao.java
index b55d847495ce5ba3ace3b9fbdf0abb7f9f353bc0..94046785c1c55f073ef57aa43f7c00f1c86b9982 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/PermissionDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionDao.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import javax.annotation.Nullable;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.security.DefaultGroups;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
@@ -110,7 +109,7 @@ public class PermissionDao implements Dao {
       });
   }
 
-  private static PermissionMapper mapper(SqlSession session) {
+  private static PermissionMapper mapper(DbSession session) {
     return session.getMapper(PermissionMapper.class);
   }
 

diff --git a/sonar-db/src/main/java/org/sonar/db/permission/template/PermissionTemplateDao.java b/sonar-db/src/main/java/org/sonar/db/permission/template/PermissionTemplateDao.java
index 3e122f770a2b562ce334b45ec903376c43fff6d9..fbe28d7d1aeecc71f5a47baa32c6ec491871caec 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/template/PermissionTemplateDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/template/PermissionTemplateDao.java
@@ -29,7 +29,6 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.utils.System2;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
@@ -266,7 +265,7 @@ public class PermissionTemplateDao implements Dao {
   /**
    * Remove a group from all templates (used when removing a group)
    */
-  public void deleteByGroup(SqlSession session, Long groupId) {
+  public void deleteByGroup(DbSession session, Long groupId) {
     session.getMapper(PermissionTemplateMapper.class).deleteByGroupId(groupId);
   }
 
@@ -274,7 +273,7 @@ public class PermissionTemplateDao implements Dao {
     return new Date(system.now());
   }
 
-  private static PermissionTemplateMapper mapper(SqlSession session) {
+  private static PermissionTemplateMapper mapper(DbSession session) {
     return session.getMapper(PermissionTemplateMapper.class);
   }
 }

diff --git a/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java b/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java
index a8db69336d6d2fdf8bc6b82cd65d687c4e5fb33f..a3d55aa9861d9f5c04db8372205c06a1d8e50131 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
-import org.apache.ibatis.session.SqlSession;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
@@ -57,7 +56,7 @@ public class AuthorizationDao implements Dao {
   }
 
   public Collection<String> selectAuthorizedRootProjectsKeys(@Nullable Integer userId, String role) {
-    SqlSession session = mybatis.openSession(false);
+    DbSession session = mybatis.openSession(false);
     try {
       return selectAuthorizedRootProjectsKeys(userId, role, session);
 
@@ -67,7 +66,7 @@ public class AuthorizationDao implements Dao {
   }
 
   public Collection<String> selectAuthorizedRootProjectsUuids(@Nullable Integer userId, String role) {
-    SqlSession session = mybatis.openSession(false);
+    DbSession session = mybatis.openSession(false);
     try {
       return selectAuthorizedRootProjectsUuids(userId, role, session);
 
@@ -76,7 +75,7 @@ public class AuthorizationDao implements Dao {
     }
   }
 
-  private static Collection<String> selectAuthorizedRootProjectsKeys(@Nullable Integer userId, String role, SqlSession session) {
+  private static Collection<String> selectAuthorizedRootProjectsKeys(@Nullable Integer userId, String role, DbSession session) {
     String sql;
     Map<String, Object> params = newHashMap();
     sql = "selectAuthorizedRootProjectsKeys";
@@ -86,7 +85,7 @@ public class AuthorizationDao implements Dao {
     return session.selectList(sql, params);
   }
 
-  private static Collection<String> selectAuthorizedRootProjectsUuids(@Nullable Integer userId, String role, SqlSession session) {
+  private static Collection<String> selectAuthorizedRootProjectsUuids(@Nullable Integer userId, String role, DbSession session) {
     String sql;
     Map<String, Object> params = newHashMap();
     sql = "selectAuthorizedRootProjectsUuids";
@@ -97,7 +96,7 @@ public class AuthorizationDao implements Dao {
   }
 
   public List<String> selectGlobalPermissions(@Nullable String userLogin) {
-    SqlSession session = mybatis.openSession(false);
+    DbSession session = mybatis.openSession(false);
     try {
       Map<String, Object> params = newHashMap();
       params.put("userLogin", userLogin);

diff --git a/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipDao.java b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipDao.java
index 18499311cc00729bebcddf4e5b120e19910d86dc..aac7129cbcf96f7e6cd03fbcaa8a287e36ff387e 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipDao.java
@@ -27,7 +27,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.SqlSession;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
 
@@ -35,22 +34,22 @@ import static org.sonar.db.DatabaseUtils.executeLargeInputs;
 
 public class GroupMembershipDao implements Dao {
 
-  public List<GroupMembershipDto> selectGroups(SqlSession session, GroupMembershipQuery query, Long userId, int offset, int limit) {
+  public List<GroupMembershipDto> selectGroups(DbSession session, GroupMembershipQuery query, Long userId, int offset, int limit) {
     Map<String, Object> params = ImmutableMap.of("query", query, "userId", userId);
     return mapper(session).selectGroups(params, new RowBounds(offset, limit));
   }
 
-  public int countGroups(SqlSession session, GroupMembershipQuery query, Long userId) {
+  public int countGroups(DbSession session, GroupMembershipQuery query, Long userId) {
     Map<String, Object> params = ImmutableMap.of("query", query, "userId", userId);
     return mapper(session).countGroups(params);
   }
 
-  public List<UserMembershipDto> selectMembers(SqlSession session, UserMembershipQuery query, int offset, int limit) {
+  public List<UserMembershipDto> selectMembers(DbSession session, UserMembershipQuery query, int offset, int limit) {
     Map<String, Object> params = ImmutableMap.of("query", query, "groupId", query.groupId());
     return mapper(session).selectMembers(params, new RowBounds(offset, limit));
   }
 
-  public int countMembers(SqlSession session, UserMembershipQuery query) {
+  public int countMembers(DbSession session, UserMembershipQuery query) {
     Map<String, Object> params = ImmutableMap.of("query", query, "groupId", query.groupId());
     return mapper(session).countMembers(params);
   }
@@ -85,7 +84,7 @@ public class GroupMembershipDao implements Dao {
     return result;
   }
 
-  private static GroupMembershipMapper mapper(SqlSession session) {
+  private static GroupMembershipMapper mapper(DbSession session) {
     return session.getMapper(GroupMembershipMapper.class);
   }
 }

diff --git a/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java b/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java
index 53939c3613c790fe0c7260b78b9f7d421df638ed..ea0664df682a0ceb615536deae53f737fa18cf01 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java
@@ -21,7 +21,6 @@ package org.sonar.db.user;
 
 import java.util.List;
 import javax.annotation.Nullable;
-import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.security.DefaultGroups;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
@@ -48,11 +47,11 @@ public class RoleDao implements Dao {
     mapper(session).insertUserRole(userRole);
   }
 
-  public void deleteUserRole(UserPermissionDto userRole, SqlSession session) {
+  public void deleteUserRole(UserPermissionDto userRole, DbSession session) {
     mapper(session).deleteUserRole(userRole);
   }
 
-  public void deleteGroupRole(GroupRoleDto groupRole, SqlSession session) {
+  public void deleteGroupRole(GroupRoleDto groupRole, DbSession session) {
     mapper(session).deleteGroupRole(groupRole);
   }
 
@@ -89,7 +88,7 @@ public class RoleDao implements Dao {
     deleteUserRolesByResourceId(session, resourceId);
   }
 
-  private static RoleMapper mapper(SqlSession session) {
+  private static RoleMapper mapper(DbSession session) {
     return session.getMapper(RoleMapper.class);
   }
 }

diff --git a/sonar-db/src/main/java/org/sonar/db/user/UserDao.java b/sonar-db/src/main/java/org/sonar/db/user/UserDao.java
index 5bcecc2c691960e8ed363661b07e456e1538fb5e..63bd4633e10bf21441366b718a201a769299f31d 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/user/UserDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/user/UserDao.java
@@ -27,7 +27,6 @@ import java.util.List;
 import java.util.Map;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
-import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.user.UserQuery;
 import org.sonar.api.utils.System2;
 import org.sonar.db.Dao;
@@ -51,7 +50,7 @@ public class UserDao implements Dao {
   }
 
   public UserDto selectUserById(long userId) {
-    SqlSession session = mybatis.openSession(false);
+    DbSession session = mybatis.openSession(false);
     try {
       return selectUserById(session, userId);
     } finally {
@@ -59,7 +58,7 @@ public class UserDao implements Dao {
     }
   }
 
-  public UserDto selectUserById(SqlSession session, long userId) {
+  public UserDto selectUserById(DbSession session, long userId) {
     return session.getMapper(UserMapper.class).selectUser(userId);
   }
 
@@ -140,12 +139,12 @@ public class UserDao implements Dao {
     return mapper.selectUsers(query);
   }
 
-  public UserDto insert(SqlSession session, UserDto dto) {
+  public UserDto insert(DbSession session, UserDto dto) {
     session.getMapper(UserMapper.class).insert(dto);
     return dto;
   }
 
-  public UserDto update(SqlSession session, UserDto dto) {
+  public UserDto update(DbSession session, UserDto dto) {
     session.getMapper(UserMapper.class).update(dto);
     return dto;
   }