refactor: move inclusion of series_sales_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

@@ -44,7 +44,6 @@ public static PropertySourcesPlaceholderConfigurer getPropertySourcesPlaceholder
 			new PropertySourcesPlaceholderConfigurer();
 		configurer.setLocations(
 			new ClassPathResource("sql/series_dao_queries.properties"),
-			new ClassPathResource("sql/series_sales_dao_queries.properties"),
 			new ClassPathResource("sql/transaction_participants_dao_queries.properties")
 		);
 		return configurer;

src/main/java/ru/mystamps/web/feature/series/sale/JdbcSeriesSalesDao.java

@@ -17,26 +17,27 @@
  */
 package ru.mystamps.web.feature.series.sale;
 
-import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.Validate;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@RequiredArgsConstructor
 public class JdbcSeriesSalesDao implements SeriesSalesDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
+	private final String addSeriesSaleSql;
+	private final String findSeriesSalesBySeriesIdSql;
 
-	@Value("${series_sales.add}")
-	private String addSeriesSaleSql;
-	
-	@Value("${series_sales.find_sales_by_series_id}")
-	private String findSeriesSalesBySeriesIdSql;
+	@SuppressWarnings("checkstyle:linelength")
+	public JdbcSeriesSalesDao(Environment env, NamedParameterJdbcTemplate jdbcTemplate) {
+		this.jdbcTemplate                 = jdbcTemplate;
+		this.addSeriesSaleSql             = env.getRequiredProperty("series_sales.add");
+		this.findSeriesSalesBySeriesIdSql = env.getRequiredProperty("series_sales.find_sales_by_series_id");
+	}
 
 	@Override
 	public void add(AddSeriesSalesDbDto sale) {

src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesConfig.java

@@ -21,6 +21,8 @@
 import org.slf4j.LoggerFactory;
 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;
 
 /**
@@ -30,8 +32,10 @@
 public class SeriesSalesConfig {
 
 	@RequiredArgsConstructor
+	@PropertySource("classpath:sql/series_sales_dao_queries.properties")
 	public static class Services {
 
+		private final Environment env;
 		private final NamedParameterJdbcTemplate jdbcTemplate;
 
 		@Bean
@@ -44,7 +48,7 @@ public SeriesSalesService seriesSalesService(SeriesSalesDao seriesSalesDao) {
 
 		@Bean
 		public SeriesSalesDao seriesSalesDao() {
-			return new JdbcSeriesSalesDao(jdbcTemplate);
+			return new JdbcSeriesSalesDao(env, jdbcTemplate);
 		}
 
 	}