refactor: move inclusion of site_parser_dao_queries.properties to the appropriate package config

We also switched to using Environment.getRequiredProperty() because @value doesn't work
without PropertySourcesPlaceholderConfigurer bean (that we are going to remove soon).

Relate to #927

Author: php-coder

src/main/java/ru/mystamps/web/config/ApplicationContext.java

@@ -52,7 +52,6 @@ public static PropertySourcesPlaceholderConfigurer getPropertySourcesPlaceholder
 			new ClassPathResource("sql/series_dao_queries.properties"),
 			new ClassPathResource("sql/series_import_request_dao_queries.properties"),
 			new ClassPathResource("sql/series_sales_dao_queries.properties"),
-			new ClassPathResource("sql/site_parser_dao_queries.properties"),
 			new ClassPathResource("sql/suspicious_activity_dao_queries.properties"),
 			new ClassPathResource("sql/transaction_participants_dao_queries.properties")
 		);

src/main/java/ru/mystamps/web/feature/series/importing/event/EventsConfig.java

@@ -23,6 +23,8 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import ru.mystamps.web.config.ServicesConfig;
 import ru.mystamps.web.feature.category.CategoryService;
@@ -39,6 +41,7 @@
 
 @Configuration
 @RequiredArgsConstructor
+@PropertySource("classpath:sql/site_parser_dao_queries.properties")
 public class EventsConfig {
 
 	private final CategoryService categoryService;
@@ -48,6 +51,7 @@ public class EventsConfig {
 	private final ServicesConfig servicesConfig;
 	private final ApplicationEventPublisher eventPublisher;
 	private final NamedParameterJdbcTemplate jdbcTemplate;
+	private final Environment env;
 
 	@Bean
 	public SiteParserService siteParserService(SiteParserDao siteParserDao) {
@@ -72,7 +76,7 @@ public SeriesInfoExtractorService seriesInfoExtractorService() {
 
 	@Bean
 	public SiteParserDao siteParserDao() {
-		return new JdbcSiteParserDao(jdbcTemplate);
+		return new JdbcSiteParserDao(env, jdbcTemplate);
 	}
 
 	@Bean

src/main/java/ru/mystamps/web/feature/series/importing/extractor/JdbcSiteParserDao.java

@@ -17,8 +17,7 @@
  */
 package ru.mystamps.web.feature.series.importing.extractor;
 
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -28,23 +27,24 @@
 import java.util.List;
 import java.util.Map;
 
-@RequiredArgsConstructor
 public class JdbcSiteParserDao implements SiteParserDao {
 
 	private static final ResultSetExtractor<Map<String, String>> PARAMS_EXTRACTOR =
 		new MapStringStringResultSetExtractor("name", "value");
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
-	
-	@Value("${site_parser.find_like_matched_url}")
-	private String findParserIdByMatchedUrlSql;
-	
-	@Value("${site_parser.find_names}")
-	private String findParserNamesSql;
-	
+	private final String findParserIdByMatchedUrlSql;
+	private final String findParserNamesSql;
 	@SuppressWarnings("PMD.LongVariable")
-	@Value("${site_parser_param.find_all_with_parser_name}")
-	private String findParametersWithParserNameSql;
+	private final String findParametersWithParserNameSql;
+	
+	@SuppressWarnings("checkstyle:linelength")
+	public JdbcSiteParserDao(Environment env, NamedParameterJdbcTemplate jdbcTemplate) {
+		this.jdbcTemplate                    = jdbcTemplate;
+		this.findParserIdByMatchedUrlSql     = env.getRequiredProperty("site_parser.find_like_matched_url");
+		this.findParserNamesSql              = env.getRequiredProperty("site_parser.find_names");
+		this.findParametersWithParserNameSql = env.getRequiredProperty("site_parser_param.find_all_with_parser_name");
+	}
 
 	@Override
 	public Integer findParserIdForUrl(String url) {