Skip to content

Commit 7a871e7

Browse files
committed
refactor(JdbcUtils): move to ru.mystamps.web.common package.
Addressed to #927 No functional changes.
1 parent bf0e860 commit 7a871e7

File tree

15 files changed

+16
-17
lines changed

15 files changed

+16
-17
lines changed

src/main/config/spotbugs-filter.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@
172172
<!--
173173
No one should assign a value returned from this method to primitive boolean type.
174174
-->
175-
<Class name="ru.mystamps.web.support.jdbc.JdbcUtils" />
175+
<Class name="ru.mystamps.web.common.JdbcUtils" />
176176
<Method name="getBoolean" />
177177
<Bug pattern="NP_BOOLEAN_RETURN_NULL" />
178178
</Match>
179179
<Match>
180180
<!-- I hope that JdbcTemplate.update() method won't modify the list of generated keys -->
181-
<Class name="ru.mystamps.web.support.jdbc.JdbcUtils" />
181+
<Class name="ru.mystamps.web.common.JdbcUtils" />
182182
<Bug pattern="MS_MUTABLE_ARRAY" />
183183
</Match>
184184
<Match>

src/main/java/ru/mystamps/web/support/jdbc/JdbcUtils.java renamed to src/main/java/ru/mystamps/web/common/JdbcUtils.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1717
*/
18-
package ru.mystamps.web.support.jdbc;
19-
20-
import ru.mystamps.web.common.Currency;
18+
package ru.mystamps.web.common;
2119

2220
import java.sql.ResultSet;
2321
import java.sql.SQLException;

src/main/java/ru/mystamps/web/feature/account/JdbcUserDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
28-
import ru.mystamps.web.support.jdbc.JdbcUtils;
28+
import ru.mystamps.web.common.JdbcUtils;
2929

3030
import java.util.Collections;
3131
import java.util.Date;

src/main/java/ru/mystamps/web/feature/category/JdbcCategoryDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
2828
import ru.mystamps.web.common.EntityWithParentDto;
29+
import ru.mystamps.web.common.JdbcUtils;
2930
import ru.mystamps.web.common.LinkEntityDto;
30-
import ru.mystamps.web.support.jdbc.JdbcUtils;
3131
import ru.mystamps.web.support.jdbc.RowMappers;
3232

3333
import java.util.Collections;

src/main/java/ru/mystamps/web/feature/collection/JdbcCollectionDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2828
import org.springframework.jdbc.support.GeneratedKeyHolder;
2929
import org.springframework.jdbc.support.KeyHolder;
30+
import ru.mystamps.web.common.JdbcUtils;
3031
import ru.mystamps.web.common.LinkEntityDto;
31-
import ru.mystamps.web.support.jdbc.JdbcUtils;
3232

3333
import java.util.Collections;
3434
import java.util.Date;

src/main/java/ru/mystamps/web/feature/collection/RowMappers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package ru.mystamps.web.feature.collection;
1919

2020
import ru.mystamps.web.common.Currency;
21-
import ru.mystamps.web.support.jdbc.JdbcUtils;
21+
import ru.mystamps.web.common.JdbcUtils;
2222

2323
import java.math.BigDecimal;
2424
import java.sql.ResultSet;

src/main/java/ru/mystamps/web/feature/country/JdbcCountryDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
28+
import ru.mystamps.web.common.JdbcUtils;
2829
import ru.mystamps.web.common.LinkEntityDto;
29-
import ru.mystamps.web.support.jdbc.JdbcUtils;
3030
import ru.mystamps.web.support.jdbc.RowMappers;
3131

3232
import java.util.Collections;

src/main/java/ru/mystamps/web/feature/image/JdbcImageDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
28-
import ru.mystamps.web.support.jdbc.JdbcUtils;
28+
import ru.mystamps.web.common.JdbcUtils;
2929

3030
import java.util.Collections;
3131
import java.util.HashMap;

src/main/java/ru/mystamps/web/feature/image/JdbcImageDataDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
28-
import ru.mystamps.web.support.jdbc.JdbcUtils;
28+
import ru.mystamps.web.common.JdbcUtils;
2929

3030
import java.util.HashMap;
3131
import java.util.Map;

src/main/java/ru/mystamps/web/feature/participant/JdbcParticipantDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
2828
import ru.mystamps.web.common.EntityWithParentDto;
29-
import ru.mystamps.web.support.jdbc.JdbcUtils;
29+
import ru.mystamps.web.common.JdbcUtils;
3030
import ru.mystamps.web.support.jdbc.RowMappers;
3131

3232
import java.util.Collections;

src/main/java/ru/mystamps/web/feature/series/JdbcSeriesDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
28-
import ru.mystamps.web.support.jdbc.JdbcUtils;
28+
import ru.mystamps.web.common.JdbcUtils;
2929
import ru.mystamps.web.support.jdbc.RowMappers;
3030

3131
import java.util.Collections;

src/main/java/ru/mystamps/web/feature/series/importing/JdbcSeriesImportDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
28-
import ru.mystamps.web.support.jdbc.JdbcUtils;
28+
import ru.mystamps.web.common.JdbcUtils;
2929

3030
import java.util.Collections;
3131
import java.util.Date;

src/main/java/ru/mystamps/web/feature/series/importing/RowMappers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
package ru.mystamps.web.feature.series.importing;
1919

20+
import ru.mystamps.web.common.JdbcUtils;
2021
import ru.mystamps.web.common.LinkEntityDto;
21-
import ru.mystamps.web.support.jdbc.JdbcUtils;
2222

2323
import java.sql.ResultSet;
2424
import java.sql.SQLException;

src/main/java/ru/mystamps/web/feature/series/importing/sale/RowMappers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package ru.mystamps.web.feature.series.importing.sale;
1919

2020
import ru.mystamps.web.common.Currency;
21-
import ru.mystamps.web.support.jdbc.JdbcUtils;
21+
import ru.mystamps.web.common.JdbcUtils;
2222

2323
import java.math.BigDecimal;
2424
import java.sql.ResultSet;

src/main/java/ru/mystamps/web/support/jdbc/RowMappers.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import ru.mystamps.web.common.Currency;
2121
import ru.mystamps.web.common.EntityWithParentDto;
22+
import ru.mystamps.web.common.JdbcUtils;
2223
import ru.mystamps.web.common.LinkEntityDto;
2324
import ru.mystamps.web.feature.participant.EntityWithIdDto;
2425
import ru.mystamps.web.feature.series.PurchaseAndSaleDto;

0 commit comments

Comments
 (0)