]> source.dussan.org Git - sonarqube.git/commitdiff
remove several hardcoded classpath in dao classes 310/head
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>
Wed, 13 May 2015 13:55:11 +0000 (15:55 +0200)
committerTeryk Bellahsene <teryk.bellahsene@sonarsource.com>
Fri, 15 May 2015 13:21:24 +0000 (15:21 +0200)
sonar-core/src/main/java/org/sonar/core/permission/PermissionDao.java
sonar-core/src/main/java/org/sonar/core/permission/PermissionMapper.java [new file with mode: 0644]
sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateDao.java
sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateMapper.java
sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationDao.java
sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationMapper.java
sonar-core/src/main/java/org/sonar/core/user/GroupMembershipDao.java
sonar-core/src/main/java/org/sonar/core/user/GroupMembershipMapper.java
sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml

index 7899d000524ad0807e0aa34ccda829b245a217bf..a6c83bd1744ed2a42ca1542a6b25b872ca474da7 100644 (file)
@@ -55,7 +55,8 @@ public class PermissionDao {
       Map<String, Object> params = newHashMap();
       params.put(QUERY_PARAMETER, query);
       params.put(COMPONENT_ID_PARAMETER, componentId);
-      return session.selectList("org.sonar.core.permission.PermissionMapper.selectUsers", params, new RowBounds(offset, limit));
+
+      return mapper(session).selectUsers(params, new RowBounds(offset, limit));
     } finally {
       MyBatis.closeQuietly(session);
     }
@@ -78,10 +79,15 @@ public class PermissionDao {
       params.put(QUERY_PARAMETER, query);
       params.put(COMPONENT_ID_PARAMETER, componentId);
       params.put("anyoneGroup", DefaultGroups.ANYONE);
-      return session.selectList("org.sonar.core.permission.PermissionMapper.selectGroups", params);
+
+      return mapper(session).selectGroups(params);
     } finally {
       MyBatis.closeQuietly(session);
     }
   }
 
+  private PermissionMapper mapper(SqlSession session) {
+    return session.getMapper(PermissionMapper.class);
+  }
+
 }
diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionMapper.java b/sonar-core/src/main/java/org/sonar/core/permission/PermissionMapper.java
new file mode 100644 (file)
index 0000000..59a2c85
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube 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.
+ *
+ * SonarQube 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.core.permission;
+
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.List;
+import java.util.Map;
+
+public interface PermissionMapper {
+
+  List<UserWithPermissionDto> selectUsers(Map<String, Object> parameters, RowBounds rowBounds);
+
+  List<GroupWithPermissionDto> selectGroups(Map<String, Object> parameters);
+}
index adbc3ae25280d984a45db9d1b2c31335aa55ca67..d6d5d5c77ba4973a0511f11e00df65578db0eaa9 100644 (file)
@@ -64,7 +64,7 @@ public class PermissionTemplateDao {
       Map<String, Object> params = newHashMap();
       params.put(QUERY_PARAMETER, query);
       params.put(TEMPLATE_ID_PARAMETER, templateId);
-      return session.selectList("org.sonar.core.permission.PermissionTemplateMapper.selectUsers", params, new RowBounds(offset, limit));
+      return mapper(session).selectUsers(params, new RowBounds(offset, limit));
     } finally {
       MyBatis.closeQuietly(session);
     }
@@ -87,7 +87,7 @@ public class PermissionTemplateDao {
       params.put(QUERY_PARAMETER, query);
       params.put(TEMPLATE_ID_PARAMETER, templateId);
       params.put("anyoneGroup", DefaultGroups.ANYONE);
-      return session.selectList("org.sonar.core.permission.PermissionTemplateMapper.selectGroups", params);
+      return mapper(session).selectGroups(params);
     } finally {
       MyBatis.closeQuietly(session);
     }
@@ -95,7 +95,7 @@ public class PermissionTemplateDao {
 
   @CheckForNull
   public PermissionTemplateDto selectTemplateByKey(DbSession session, String templateKey) {
-    return session.getMapper(PermissionTemplateMapper.class).selectByKey(templateKey);
+    return mapper(session).selectByKey(templateKey);
   }
 
   @CheckForNull
@@ -111,7 +111,7 @@ public class PermissionTemplateDao {
   @CheckForNull
   public PermissionTemplateDto selectPermissionTemplate(DbSession session, String templateKey) {
     PermissionTemplateDto permissionTemplate = null;
-    PermissionTemplateMapper mapper = session.getMapper(PermissionTemplateMapper.class);
+    PermissionTemplateMapper mapper = mapper(session);
     permissionTemplate = mapper.selectByKey(templateKey);
     PermissionTemplateDto templateUsersPermissions = mapper.selectTemplateUsersPermissions(templateKey);
     if (templateUsersPermissions != null) {
@@ -158,8 +158,7 @@ public class PermissionTemplateDao {
       .setUpdatedAt(creationDate);
     SqlSession session = myBatis.openSession(false);
     try {
-      PermissionTemplateMapper mapper = session.getMapper(PermissionTemplateMapper.class);
-      mapper.insert(permissionTemplate);
+      mapper(session).insert(permissionTemplate);
       session.commit();
     } finally {
       MyBatis.closeQuietly(session);
@@ -170,7 +169,7 @@ public class PermissionTemplateDao {
   public void deletePermissionTemplate(Long templateId) {
     SqlSession session = myBatis.openSession(false);
     try {
-      PermissionTemplateMapper mapper = session.getMapper(PermissionTemplateMapper.class);
+      PermissionTemplateMapper mapper = mapper(session);
       mapper.deleteUsersPermissions(templateId);
       mapper.deleteGroupsPermissions(templateId);
       mapper.delete(templateId);
@@ -189,8 +188,7 @@ public class PermissionTemplateDao {
       .setUpdatedAt(now());
     SqlSession session = myBatis.openSession(false);
     try {
-      PermissionTemplateMapper mapper = session.getMapper(PermissionTemplateMapper.class);
-      mapper.update(permissionTemplate);
+      mapper(session).update(permissionTemplate);
       session.commit();
     } finally {
       MyBatis.closeQuietly(session);
@@ -206,8 +204,7 @@ public class PermissionTemplateDao {
       .setUpdatedAt(now());
     SqlSession session = myBatis.openSession(false);
     try {
-      PermissionTemplateMapper mapper = session.getMapper(PermissionTemplateMapper.class);
-      mapper.insertUserPermission(permissionTemplateUser);
+      mapper(session).insertUserPermission(permissionTemplateUser);
       session.commit();
     } finally {
       MyBatis.closeQuietly(session);
@@ -221,8 +218,7 @@ public class PermissionTemplateDao {
       .setUserId(userId);
     SqlSession session = myBatis.openSession(false);
     try {
-      PermissionTemplateMapper mapper = session.getMapper(PermissionTemplateMapper.class);
-      mapper.deleteUserPermission(permissionTemplateUser);
+      mapper(session).deleteUserPermission(permissionTemplateUser);
       session.commit();
     } finally {
       MyBatis.closeQuietly(session);
@@ -238,8 +234,7 @@ public class PermissionTemplateDao {
       .setUpdatedAt(now());
     SqlSession session = myBatis.openSession(false);
     try {
-      PermissionTemplateMapper mapper = session.getMapper(PermissionTemplateMapper.class);
-      mapper.insertGroupPermission(permissionTemplateGroup);
+      mapper(session).insertGroupPermission(permissionTemplateGroup);
       session.commit();
     } finally {
       MyBatis.closeQuietly(session);
@@ -253,8 +248,7 @@ public class PermissionTemplateDao {
       .setGroupId(groupId);
     SqlSession session = myBatis.openSession(false);
     try {
-      PermissionTemplateMapper mapper = session.getMapper(PermissionTemplateMapper.class);
-      mapper.deleteGroupPermission(permissionTemplateGroup);
+      mapper(session).deleteGroupPermission(permissionTemplateGroup);
       session.commit();
     } finally {
       MyBatis.closeQuietly(session);
@@ -279,4 +273,8 @@ public class PermissionTemplateDao {
   private Date now() {
     return new Date(system.now());
   }
+
+  private PermissionTemplateMapper mapper(SqlSession session) {
+    return session.getMapper(PermissionTemplateMapper.class);
+  }
 }
index 79e50415ffd5a85eb6a988c28c1045a60dc270c3..732ced344a9ff960d4a579027ff0a65926861288 100644 (file)
 
 package org.sonar.core.permission;
 
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * @since 3.7
  */
@@ -50,4 +55,8 @@ public interface PermissionTemplateMapper {
   void deleteGroupPermission(PermissionTemplateGroupDto permissionTemplateGroup);
 
   void deleteByGroupId(long groupId);
+
+  List<GroupWithPermissionDto> selectGroups(Map<String, Object> params);
+
+  List<UserWithPermissionDto> selectUsers(Map<String, Object> params, RowBounds rowBounds);
 }
index f8e64eb715c6d277a0d37e8e2a00051582144cd0..24e70bac628b4175fcb4646146729d4b9e40c985 100644 (file)
@@ -41,7 +41,7 @@ public class ProjectQgateAssociationDao {
     SqlSession session = mybatis.openSession(false);
     try {
       Map<String, Object> params = ImmutableMap.of("query", query, "gateId", gateId.toString());
-      return session.selectList("org.sonar.core.qualitygate.db.ProjectQgateAssociationMapper.selectProjects", params, new RowBounds(offset, limit));
+      return mapper(session).selectProjects(params, new RowBounds(offset, limit));
     } finally {
       MyBatis.closeQuietly(session);
     }
@@ -52,4 +52,8 @@ public class ProjectQgateAssociationDao {
     return selectProjects(query, gateId, 0, Integer.MAX_VALUE);
   }
 
+  private ProjectQgateAssociationMapper mapper(SqlSession session) {
+    return session.getMapper(ProjectQgateAssociationMapper.class);
+  }
+
 }
index 76b4181b0d9f1247080cdf5f881ff04ebe9f3661..4caa0a7a755c88d03348b847a5cc572586778427 100644 (file)
  */
 package org.sonar.core.qualitygate.db;
 
+import org.apache.ibatis.session.RowBounds;
+
 import java.util.List;
+import java.util.Map;
 
 public interface ProjectQgateAssociationMapper {
 
   List<ProjectQgateAssociationDto> selectProjects(ProjectQgateAssociationQuery query);
 
+  List<ProjectQgateAssociationDto> selectProjects(Map<String, Object> params, RowBounds rowBounds);
 }
index 145bef37faa0309e91544ce3feb1d714eccc2c67..8338a3d070b8bdec3adb15fdc8b56cc28ff74273 100644 (file)
@@ -50,12 +50,12 @@ public class GroupMembershipDao implements DaoComponent {
 
   public List<GroupMembershipDto> selectGroups(SqlSession session, GroupMembershipQuery query, Long userId, int offset, int limit) {
     Map<String, Object> params = ImmutableMap.of("query", query, "userId", userId);
-    return session.selectList("org.sonar.core.user.GroupMembershipMapper.selectGroups", params, new RowBounds(offset, limit));
+    return mapper(session).selectGroups(params, new RowBounds(offset, limit));
   }
 
   public int countGroups(SqlSession session, GroupMembershipQuery query, Long userId) {
     Map<String, Object> params = ImmutableMap.of("query", query, "userId", userId);
-    return session.selectOne("org.sonar.core.user.GroupMembershipMapper.countGroups", params);
+    return mapper(session).countGroups(params);
   }
 
   @VisibleForTesting
@@ -63,4 +63,8 @@ public class GroupMembershipDao implements DaoComponent {
     return selectGroups(query, userId, 0, Integer.MAX_VALUE);
   }
 
+  private GroupMembershipMapper mapper(SqlSession session) {
+    return session.getMapper(GroupMembershipMapper.class);
+  }
+
 }
index 763baf13e549ec8945f55c492deb53ab9be0f16f..22efebd01acf08e9649009dfabcfbcb9f1d02eae 100644 (file)
  */
 package org.sonar.core.user;
 
+import org.apache.ibatis.session.RowBounds;
+
 import java.util.List;
+import java.util.Map;
 
 public interface GroupMembershipMapper {
 
   List<GroupMembershipDto> selectGroups(GroupMembershipQuery query);
 
+  List<GroupMembershipDto> selectGroups(Map<String, Object> params, RowBounds rowBounds);
+
+  int countGroups(Map<String, Object> params);
 }
index 8c5c6abcbd7504eaa4f468960bb06ac45738df4b..92d5d1180dcc6faab9dcee01f453f7ec4ffeae96 100644 (file)
     and p.enabled=${_true}
     and p.qualifier=#{qualifier}
     and p.copy_resource_id is null
+    <if test="query!=null">
       and (
       UPPER(p.name) like #{query}
       or UPPER(p.kee) like #{query}
       )
+    </if>
   </sql>
 
   <select id="selectGhostProjects" parameterType="map" resultType="Component">
       s2.id is null
       and p.qualifier=#{qualifier}
       and p.copy_resource_id is null
+      <if test="query!=null">
         and (
         UPPER(p.name) like #{query}
         or UPPER(p.kee) like #{query}
         )
+      </if>
   </sql>
 </mapper>