SONAR-7293 Replace Ruby WS api/issues/delete_comment by Java WS

2 files changed, 8 insertions, 13 deletions

diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java
index ff7fcaa53fa..468e4bd7cfd 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java
@@ -93,17 +93,11 @@ public class IssueChangeDao implements Dao {
     mapper(session).insert(change);
   }
 
-  public boolean delete(String key) {
-    DbSession session = mybatis.openSession(false);
-    try {
-      IssueChangeMapper mapper = mapper(session);
-      int count = mapper.delete(key);
-      session.commit();
-      return count == 1;
-
-    } finally {
-      MyBatis.closeQuietly(session);
-    }
+  public boolean delete(DbSession session, String key) {
+    IssueChangeMapper mapper = mapper(session);
+    int count = mapper.delete(key);
+    session.commit();
+    return count == 1;
   }
 
   public boolean update(DbSession dbSession, IssueChangeDto change) {
diff --git a/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeDaoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeDaoTest.java
index 7f9349356d6..fbc29109f82 100644
--- a/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeDaoTest.java
@@ -137,7 +137,8 @@ public class IssueChangeDaoTest {
   public void delete() {
     db.prepareDbUnit(getClass(), "delete.xml");
 
-    assertThat(underTest.delete("COMMENT-2")).isTrue();
+    assertThat(underTest.delete(db.getSession(), "COMMENT-2")).isTrue();
+    db.commit();
 
     db.assertDbUnit(getClass(), "delete-result.xml", "issue_changes");
   }
@@ -146,7 +147,7 @@ public class IssueChangeDaoTest {
   public void delete_unknown_key() {
     db.prepareDbUnit(getClass(), "delete.xml");
 
-    assertThat(underTest.delete("UNKNOWN")).isFalse();
+    assertThat(underTest.delete(db.getSession(), "UNKNOWN")).isFalse();
   }
 
   @Test