diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-01-23 23:18:36 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-01-24 09:39:42 +0100 |
| commit | d64a58b9177703e574f4214a7354b75407f61df8 (patch) | |
| tree | 73e0031134023b224617896e130927993a18f1fc /sonar-db | |
| parent | 23b6f858b1813d4d399ba9a1808fb880f9b96ce8 (diff) | |
| download | sonarqube-d64a58b9177703e574f4214a7354b75407f61df8.tar.gz sonarqube-d64a58b9177703e574f4214a7354b75407f61df8.zip | |
Drop unused FileSourceDao#updateDateWhenUpdatedDateIsZero()
Diffstat (limited to 'sonar-db')
6 files changed, 4 insertions, 66 deletions
diff --git a/sonar-db/src/main/java/org/sonar/db/source/FileSourceDao.java b/sonar-db/src/main/java/org/sonar/db/source/FileSourceDao.java index a5df02d0e73..89a9afff183 100644 --- a/sonar-db/src/main/java/org/sonar/db/source/FileSourceDao.java +++ b/sonar-db/src/main/java/org/sonar/db/source/FileSourceDao.java @@ -19,7 +19,6 @@ */ package org.sonar.db.source; -import com.google.common.base.Function; import com.google.common.base.Splitter; import java.io.Reader; import java.sql.Connection; @@ -28,6 +27,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collections; import java.util.List; +import java.util.function.Function; import javax.annotation.CheckForNull; import org.apache.commons.dbutils.DbUtils; import org.apache.commons.io.IOUtils; @@ -137,10 +137,6 @@ public class FileSourceDao implements Dao { mapper(session).update(dto); } - public void updateDateWhenUpdatedDateIsZero(DbSession session, String projectUuid, long updateDate) { - mapper(session).updateDateWhenUpdatedDateIsZero(projectUuid, updateDate); - } - private static FileSourceMapper mapper(DbSession session) { return session.getMapper(FileSourceMapper.class); } diff --git a/sonar-db/src/main/java/org/sonar/db/source/FileSourceMapper.java b/sonar-db/src/main/java/org/sonar/db/source/FileSourceMapper.java index 31d24946b07..7e6d635d121 100644 --- a/sonar-db/src/main/java/org/sonar/db/source/FileSourceMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/source/FileSourceMapper.java @@ -33,6 +33,4 @@ public interface FileSourceMapper { void insert(FileSourceDto dto); void update(FileSourceDto dto); - - void updateDateWhenUpdatedDateIsZero(@Param("projectUuid") String projectUuid, @Param("date") Long updateDate); } diff --git a/sonar-db/src/main/resources/org/sonar/db/source/FileSourceMapper.xml b/sonar-db/src/main/resources/org/sonar/db/source/FileSourceMapper.xml index 53410f998bb..aae3d21df1d 100644 --- a/sonar-db/src/main/resources/org/sonar/db/source/FileSourceMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/source/FileSourceMapper.xml @@ -38,12 +38,5 @@ WHERE id = #{id} </update> - <update id="updateDateWhenUpdatedDateIsZero" parameterType="org.sonar.db.source.FileSourceDto" - useGeneratedKeys="false"> - UPDATE file_sources SET - updated_at = #{date,jdbcType=BIGINT} - WHERE project_uuid = #{projectUuid} - AND updated_at = 0 - </update> </mapper> diff --git a/sonar-db/src/test/java/org/sonar/db/source/FileSourceDaoTest.java b/sonar-db/src/test/java/org/sonar/db/source/FileSourceDaoTest.java index d12cc86c0c0..76b260c7914 100644 --- a/sonar-db/src/test/java/org/sonar/db/source/FileSourceDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/source/FileSourceDaoTest.java @@ -19,11 +19,9 @@ */ package org.sonar.db.source; -import com.google.common.base.Function; -import com.google.common.base.Throwables; import java.io.IOException; -import java.io.OutputStreamWriter; import java.io.Reader; +import java.util.function.Function; import javax.annotation.Nullable; import org.apache.commons.io.IOUtils; import org.junit.Rule; @@ -35,17 +33,15 @@ import org.sonar.db.source.FileSourceDto.Type; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.assertj.core.api.Assertions.in; - public class FileSourceDaoTest { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); - DbSession session = dbTester.getSession(); + private DbSession session = dbTester.getSession(); - FileSourceDao underTest = dbTester.getDbClient().fileSourceDao(); + private FileSourceDao underTest = dbTester.getDbClient().fileSourceDao(); @Test public void select() { @@ -179,17 +175,6 @@ public class FileSourceDaoTest { "project_uuid", "file_uuid", "data_hash", "line_hashes", "src_hash", "created_at", "updated_at", "data_type", "revision"); } - @Test - public void update_date_when_updated_date_is_zero() { - dbTester.prepareDbUnit(getClass(), "update_date_when_updated_date_is_zero.xml"); - - underTest.updateDateWhenUpdatedDateIsZero(dbTester.getSession(), "ABCD", 1500000000002L); - dbTester.getSession().commit(); - - dbTester.assertDbUnitTable(getClass(), "update_date_when_updated_date_is_zero-result.xml", "file_sources", - "project_uuid", "file_uuid", "data_hash", "line_hashes", "src_hash", "created_at", "updated_at", "data_type", "revision"); - } - private static class ReaderToStringFunction implements Function<Reader, String> { String result = null; diff --git a/sonar-db/src/test/resources/org/sonar/db/source/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml b/sonar-db/src/test/resources/org/sonar/db/source/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml deleted file mode 100644 index 0b8802560ef..00000000000 --- a/sonar-db/src/test/resources/org/sonar/db/source/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml +++ /dev/null @@ -1,18 +0,0 @@ -<dataset> - - <!-- Updated --> - <file_sources id="101" project_uuid="ABCD" file_uuid="FILE1_UUID" revision="123456789" - binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - created_at="1500000000000" updated_at="1500000000002" data_type="SOURCE" /> - - <!-- Not updated because updated_at is not null --> - <file_sources id="102" project_uuid="ABCD" file_uuid="FILE2_UUID" revision="123456789" - binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - created_at="1500000000000" updated_at="1500000000000" data_type="SOURCE" /> - - <!-- Not updated because on another project --> - <file_sources id="103" project_uuid="BCDE" file_uuid="FILE3_UUID" revision="123456789" - binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - created_at="1500000000000" updated_at="0" data_type="SOURCE" /> - -</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/source/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml b/sonar-db/src/test/resources/org/sonar/db/source/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml deleted file mode 100644 index 7dd4686d680..00000000000 --- a/sonar-db/src/test/resources/org/sonar/db/source/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml +++ /dev/null @@ -1,16 +0,0 @@ -<dataset> - - <!-- Only this source should be updated --> - <file_sources id="101" project_uuid="ABCD" file_uuid="FILE1_UUID" revision="123456789" - binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - created_at="1500000000000" updated_at="0" data_type="SOURCE" /> - - <file_sources id="102" project_uuid="ABCD" file_uuid="FILE2_UUID" revision="123456789" - binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - created_at="1500000000000" updated_at="1500000000000" data_type="SOURCE" /> - - <file_sources id="103" project_uuid="BCDE" file_uuid="FILE3_UUID" revision="123456789" - binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH" - created_at="1500000000000" updated_at="0" data_type="SOURCE" /> - -</dataset> |