Skip to content

Commit cb6d1b0

Browse files
php-coderphp-coder
committed
Use single instance of NamedParameterJdbcTemplate.
No functional changes.
1 parent b4826b8 commit cb6d1b0

File tree

8 files changed

+37
-48
lines changed

8 files changed

+37
-48
lines changed

‎src/main/java/ru/mystamps/web/config/DaoConfig.java

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
*/
1818
package ru.mystamps.web.config;
1919

20+
import javax.annotation.PostConstruct;
2021
import javax.inject.Inject;
2122
import javax.sql.DataSource;
2223

2324
import org.springframework.context.annotation.Bean;
2425
import org.springframework.context.annotation.Configuration;
26+
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2527

2628
import ru.mystamps.web.dao.JdbcCategoryDao;
2729
import ru.mystamps.web.dao.JdbcCollectionDao;
@@ -44,39 +46,46 @@ public class DaoConfig {
4446
@Inject
4547
private DataSource dataSource;
4648

49+
private NamedParameterJdbcTemplate jdbcTemplate;
50+
51+
@PostConstruct
52+
protected void init() {
53+
jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
54+
}
55+
4756
@Bean
4857
public JdbcCategoryDao getJdbcCategoryDao() {
49-
return new JdbcCategoryDaoImpl(dataSource);
58+
return new JdbcCategoryDaoImpl(jdbcTemplate);
5059
}
5160

5261
@Bean
5362
public JdbcCountryDao getJdbcCountryDao() {
54-
return new JdbcCountryDaoImpl(dataSource);
63+
return new JdbcCountryDaoImpl(jdbcTemplate);
5564
}
5665

5766
@Bean
5867
public JdbcCollectionDao getJdbcCollectionDao() {
59-
return new JdbcCollectionDaoImpl(dataSource);
68+
return new JdbcCollectionDaoImpl(jdbcTemplate);
6069
}
6170

6271
@Bean
6372
public JdbcSeriesDao getJdbcSeriesDao() {
64-
return new JdbcSeriesDaoImpl(dataSource);
73+
return new JdbcSeriesDaoImpl(jdbcTemplate);
6574
}
6675

6776
@Bean
6877
public JdbcUserDao getJdbcUserDao() {
69-
return new JdbcUserDaoImpl(dataSource);
78+
return new JdbcUserDaoImpl(jdbcTemplate);
7079
}
7180

7281
@Bean
7382
public JdbcUsersActivationDao getJdbcUsersActivationDao() {
74-
return new JdbcUsersActivationDaoImpl(dataSource);
83+
return new JdbcUsersActivationDaoImpl(jdbcTemplate);
7584
}
7685

7786
@Bean
7887
public SuspiciousActivityDao getSuspiciousActivityDao() {
79-
return new JdbcSuspiciousActivityDao(dataSource);
88+
return new JdbcSuspiciousActivityDao(jdbcTemplate);
8089
}
8190

8291
}

‎src/main/java/ru/mystamps/web/dao/impl/JdbcCategoryDaoImpl.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@
2323
import java.util.List;
2424
import java.util.Map;
2525

26-
import javax.sql.DataSource;
27-
2826
import org.springframework.beans.factory.annotation.Value;
2927
import org.springframework.jdbc.core.RowMapper;
3028
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
3129

30+
import lombok.RequiredArgsConstructor;
31+
3232
import ru.mystamps.web.dao.JdbcCategoryDao;
3333
import ru.mystamps.web.service.dto.SelectEntityDto;
3434

3535
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
36+
@RequiredArgsConstructor
3637
public class JdbcCategoryDaoImpl implements JdbcCategoryDao {
3738

3839
private static final RowMapper<Pair<String, Integer>> NAME_AND_COUNTER_ROW_MAPPER =
@@ -61,10 +62,6 @@ public class JdbcCategoryDaoImpl implements JdbcCategoryDao {
6162
@Value("${category.find_all_categories_names_with_ids}")
6263
private String findCategoriesNamesWithIdsSql;
6364

64-
public JdbcCategoryDaoImpl(DataSource dataSource) {
65-
jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
66-
}
67-
6865
@Override
6966
public long countAll() {
7067
return jdbcTemplate.queryForObject(

‎src/main/java/ru/mystamps/web/dao/impl/JdbcCollectionDaoImpl.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@
2121
import java.util.HashMap;
2222
import java.util.Map;
2323

24-
import javax.sql.DataSource;
25-
2624
import org.apache.commons.lang3.Validate;
2725

2826
import org.springframework.beans.factory.annotation.Value;
2927
import org.springframework.jdbc.core.RowMapper;
3028
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
3129

30+
import lombok.RequiredArgsConstructor;
31+
3232
import ru.mystamps.web.dao.JdbcCollectionDao;
3333
import ru.mystamps.web.entity.Collection;
3434
import ru.mystamps.web.service.dto.LinkEntityDto;
3535

36+
@RequiredArgsConstructor
3637
public class JdbcCollectionDaoImpl implements JdbcCollectionDao {
3738

3839
private static final RowMapper<LinkEntityDto> LINK_ENTITY_DTO_ROW_MAPPER =
@@ -49,10 +50,6 @@ public class JdbcCollectionDaoImpl implements JdbcCollectionDao {
4950
@Value("${collection.create}")
5051
private String addCollectionSql;
5152

52-
public JdbcCollectionDaoImpl(DataSource dataSource) {
53-
jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
54-
}
55-
5653
@Override
5754
public Iterable<LinkEntityDto> findLastCreated(int quantity) {
5855
return jdbcTemplate.query(

‎src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDaoImpl.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@
2323
import java.util.List;
2424
import java.util.Map;
2525

26-
import javax.sql.DataSource;
27-
2826
import org.springframework.beans.factory.annotation.Value;
2927
import org.springframework.jdbc.core.RowMapper;
3028
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
3129

30+
import lombok.RequiredArgsConstructor;
31+
3232
import ru.mystamps.web.dao.JdbcCountryDao;
3333
import ru.mystamps.web.service.dto.SelectEntityDto;
3434

3535
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
36+
@RequiredArgsConstructor
3637
public class JdbcCountryDaoImpl implements JdbcCountryDao {
3738

3839
private static final RowMapper<Pair<String, Integer>> NAME_AND_COUNTER_ROW_MAPPER =
@@ -61,10 +62,6 @@ public class JdbcCountryDaoImpl implements JdbcCountryDao {
6162
@Value("${country.find_all_countries_names_with_ids}")
6263
private String findCountriesNamesWithIdsSql;
6364

64-
public JdbcCountryDaoImpl(DataSource dataSource) {
65-
jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
66-
}
67-
6865
@Override
6966
public long countAll() {
7067
return jdbcTemplate.queryForObject(

‎src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesDaoImpl.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@
2121
import java.util.HashMap;
2222
import java.util.Map;
2323

24-
import javax.sql.DataSource;
25-
2624
import org.springframework.beans.factory.annotation.Value;
2725
import org.springframework.jdbc.core.RowMapper;
2826
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2927

28+
import lombok.RequiredArgsConstructor;
29+
3030
import ru.mystamps.web.dao.JdbcSeriesDao;
3131
import ru.mystamps.web.service.dto.SeriesInfoDto;
3232
import ru.mystamps.web.service.dto.SitemapInfoDto;
3333

3434
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
35+
@RequiredArgsConstructor
3536
public class JdbcSeriesDaoImpl implements JdbcSeriesDao {
3637

3738
private static final RowMapper<SitemapInfoDto> SITEMAP_INFO_DTO_ROW_MAPPER =
@@ -81,10 +82,6 @@ public class JdbcSeriesDaoImpl implements JdbcSeriesDao {
8182
@Value("${series.count_stamps_by_gibbons_number}")
8283
private String countStampsByGibbonsNumberSql;
8384

84-
public JdbcSeriesDaoImpl(DataSource dataSource) {
85-
jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
86-
}
87-
8885
@Override
8986
public Iterable<SitemapInfoDto> findAllForSitemap() {
9087
return jdbcTemplate.query(

‎src/main/java/ru/mystamps/web/dao/impl/JdbcSuspiciousActivityDao.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,24 @@
2020
import java.util.HashMap;
2121
import java.util.Map;
2222

23-
import javax.sql.DataSource;
24-
2523
import org.apache.commons.lang3.Validate;
2624

2725
import org.springframework.beans.factory.annotation.Value;
2826
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2927

28+
import lombok.RequiredArgsConstructor;
29+
3030
import ru.mystamps.web.dao.SuspiciousActivityDao;
3131
import ru.mystamps.web.entity.SuspiciousActivity;
3232

33+
@RequiredArgsConstructor
3334
public class JdbcSuspiciousActivityDao implements SuspiciousActivityDao {
3435

3536
private final NamedParameterJdbcTemplate jdbcTemplate;
3637

3738
@Value("${suspicious_activity.create}")
3839
private String addSuspiciousActivitySql;
3940

40-
public JdbcSuspiciousActivityDao(DataSource dataSource) {
41-
jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
42-
}
43-
4441
@Override
4542
public void add(SuspiciousActivity activity) {
4643
Map<String, Object> params = new HashMap<>();

‎src/main/java/ru/mystamps/web/dao/impl/JdbcUserDaoImpl.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,18 @@
2121
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2222
import ru.mystamps.web.dao.JdbcUserDao;
2323

24-
import javax.sql.DataSource;
2524
import java.util.Collections;
2625

26+
import lombok.RequiredArgsConstructor;
27+
28+
@RequiredArgsConstructor
2729
public class JdbcUserDaoImpl implements JdbcUserDao {
2830

2931
private final NamedParameterJdbcTemplate jdbcTemplate;
3032

3133
@Value("${user.count_users_by_login}")
3234
private String countByLoginSql;
3335

34-
public JdbcUserDaoImpl(DataSource dataSource) {
35-
jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
36-
}
37-
3836
@Override
3937
public long countByLogin(String login) {
4038
return jdbcTemplate.queryForObject(

‎src/main/java/ru/mystamps/web/dao/impl/JdbcUsersActivationDaoImpl.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@
2121
import java.util.HashMap;
2222
import java.util.Map;
2323

24-
import javax.sql.DataSource;
25-
2624
import org.apache.commons.lang3.Validate;
2725

2826
import org.springframework.beans.factory.annotation.Value;
2927
import org.springframework.jdbc.core.RowMapper;
3028
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
3129

30+
import lombok.RequiredArgsConstructor;
31+
3232
import ru.mystamps.web.dao.JdbcUsersActivationDao;
3333
import ru.mystamps.web.entity.UsersActivation;
3434

3535
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
36+
@RequiredArgsConstructor
3637
public class JdbcUsersActivationDaoImpl implements JdbcUsersActivationDao {
3738

3839
private static final RowMapper<UsersActivation> USERS_ACTIVATION_ROW_MAPPER =
@@ -52,10 +53,6 @@ public class JdbcUsersActivationDaoImpl implements JdbcUsersActivationDao {
5253
@Value("${users_activation.create}")
5354
private String addActivationKeySql;
5455

55-
public JdbcUsersActivationDaoImpl(DataSource dataSource) {
56-
jdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
57-
}
58-
5956
@Override
6057
public UsersActivation findByActivationKey(String activationKey) {
6158
return jdbcTemplate.queryForObject(

0 commit comments

Comments
 (0)