Replace DbClient#closeSession(DbSession) by try-with-resources

5 files changed, 15 insertions, 50 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java b/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java
index 24dc5dfea8b..0102d58ac2f 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java
@@ -21,7 +21,6 @@ package org.sonar.db;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
-import javax.annotation.Nullable;
 import org.sonar.db.ce.CeActivityDao;
 import org.sonar.db.ce.CeQueueDao;
 import org.sonar.db.ce.CeScannerContextDao;
@@ -177,10 +176,6 @@ public class DbClient {
     return myBatis.openSession(batch);
   }
 
-  public void closeSession(@Nullable DbSession session) {
-    MyBatis.closeQuietly(session);
-  }
-
   public Database getDatabase() {
     return database;
   }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentKeyUpdaterDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentKeyUpdaterDao.java
index 5ca05d074cd..4f1606aa633 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentKeyUpdaterDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentKeyUpdaterDao.java
@@ -30,7 +30,6 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.apache.commons.lang.StringUtils;
-import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
@@ -55,9 +54,8 @@ public class ComponentKeyUpdaterDao implements Dao {
   }
 
   public void updateKey(String projectUuid, String newKey) {
-    DbSession session = mybatis.openSession(true);
-    ComponentKeyUpdaterMapper mapper = session.getMapper(ComponentKeyUpdaterMapper.class);
-    try {
+    try (DbSession session = mybatis.openSession(true)) {
+      ComponentKeyUpdaterMapper mapper = session.getMapper(ComponentKeyUpdaterMapper.class);
       if (mapper.countResourceByKey(newKey) > 0) {
         throw new IllegalArgumentException("Impossible to update key: a component with key \"" + newKey + "\" already exists.");
       }
@@ -72,16 +70,13 @@ public class ComponentKeyUpdaterDao implements Dao {
       runBatchUpdateForAllResources(resources, projectOldKey, newKey, mapper);
 
       session.commit();
-    } finally {
-      MyBatis.closeQuietly(session);
     }
   }
 
   public Map<String, String> checkModuleKeysBeforeRenaming(String projectUuid, String stringToReplace, String replacementString) {
-    SqlSession session = mybatis.openSession(false);
-    ComponentKeyUpdaterMapper mapper = session.getMapper(ComponentKeyUpdaterMapper.class);
-    Map<String, String> result = Maps.newHashMap();
-    try {
+    try (DbSession session = mybatis.openSession(false)) {
+      ComponentKeyUpdaterMapper mapper = session.getMapper(ComponentKeyUpdaterMapper.class);
+      Map<String, String> result = Maps.newHashMap();
       Set<ResourceDto> modules = collectAllModules(projectUuid, stringToReplace, mapper);
       for (ResourceDto module : modules) {
         String newKey = computeNewKey(module.getKey(), stringToReplace, replacementString);
@@ -91,10 +86,8 @@ public class ComponentKeyUpdaterDao implements Dao {
           result.put(module.getKey(), newKey);
         }
       }
-    } finally {
-      MyBatis.closeQuietly(session);
+      return result;
     }
-    return result;
   }
 
   public static void checkIsProjectOrModule(ComponentDto component) {
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueChangeDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueChangeDao.java
index 79423e9f79d..e62dc9a014c 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueChangeDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueChangeDao.java
@@ -47,13 +47,9 @@ public class IssueChangeDao implements Dao {
   }
 
   public List<IssueChangeDto> selectChangelogOfNonClosedIssuesByComponent(String componentUuid) {
-    DbSession session = mybatis.openSession(false);
-    try {
+    try (DbSession session = mybatis.openSession(false)) {
       IssueChangeMapper mapper = mapper(session);
       return mapper.selectChangelogOfNonClosedIssuesByComponent(componentUuid, IssueChangeDto.TYPE_FIELD_CHANGE);
-
-    } finally {
-      MyBatis.closeQuietly(session);
     }
   }
 
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateDao.java
index d72b5507918..90c70291d7d 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateDao.java
@@ -33,11 +33,8 @@ public class LoadedTemplateDao implements Dao {
   }
 
   public int countByTypeAndKey(String type, String key) {
-    SqlSession session = mybatis.openSession(false);
-    try {
+    try (DbSession session = mybatis.openSession(false)) {
       return countByTypeAndKey(type, key, session);
-    } finally {
-      MyBatis.closeQuietly(session);
     }
   }
 
@@ -46,12 +43,9 @@ public class LoadedTemplateDao implements Dao {
   }
 
   public void insert(LoadedTemplateDto loadedTemplateDto) {
-    SqlSession session = mybatis.openSession(false);
-    try {
+    try (DbSession session = mybatis.openSession(false)) {
       insert(loadedTemplateDto, session);
       session.commit();
-    } finally {
-      MyBatis.closeQuietly(session);
     }
   }
 
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/notification/NotificationQueueDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/notification/NotificationQueueDao.java
index be390291444..ab56cd0c704 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/notification/NotificationQueueDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/notification/NotificationQueueDao.java
@@ -21,7 +21,6 @@ package org.sonar.db.notification;
 
 import java.util.Collections;
 import java.util.List;
-import org.apache.ibatis.session.SqlSession;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
@@ -35,28 +34,22 @@ public class NotificationQueueDao implements Dao {
   }
 
   public void insert(List<NotificationQueueDto> dtos) {
-    DbSession session = mybatis.openSession(true);
-    NotificationQueueMapper mapper = session.getMapper(NotificationQueueMapper.class);
-    try {
+    try (DbSession session = mybatis.openSession(true)) {
+      NotificationQueueMapper mapper = session.getMapper(NotificationQueueMapper.class);
       for (NotificationQueueDto dto : dtos) {
         mapper.insert(dto);
       }
       session.commit();
-    } finally {
-      MyBatis.closeQuietly(session);
     }
   }
 
   public void delete(List<NotificationQueueDto> dtos) {
-    DbSession session = mybatis.openSession(true);
-    NotificationQueueMapper mapper = session.getMapper(NotificationQueueMapper.class);
-    try {
+    try (DbSession session = mybatis.openSession(true)) {
+      NotificationQueueMapper mapper = session.getMapper(NotificationQueueMapper.class);
       for (NotificationQueueDto dto : dtos) {
         mapper.delete(dto.getId());
       }
       session.commit();
-    } finally {
-      MyBatis.closeQuietly(session);
     }
   }
 
@@ -64,20 +57,14 @@ public class NotificationQueueDao implements Dao {
     if (count < 1) {
       return Collections.emptyList();
     }
-    SqlSession session = mybatis.openSession(false);
-    try {
+    try (DbSession session = mybatis.openSession(false)) {
       return session.getMapper(NotificationQueueMapper.class).findOldest(count);
-    } finally {
-      MyBatis.closeQuietly(session);
     }
   }
 
   public long count() {
-    SqlSession session = mybatis.openSession(false);
-    try {
+    try (DbSession session = mybatis.openSession(false)) {
       return session.getMapper(NotificationQueueMapper.class).count();
-    } finally {
-      MyBatis.closeQuietly(session);
     }
   }
 }