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

@@ -17,11 +17,8 @@
  */
 package ru.mystamps.web.config;
 
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import ru.mystamps.web.support.spring.security.SecurityConfig;
 import ru.mystamps.web.support.togglz.TogglzConfig;
@@ -37,15 +34,4 @@
 @EnableTransactionManagement
 @SuppressWarnings({ "checkstyle:hideutilityclassconstructor", "PMD.UseUtilityClass" })
 public class ApplicationContext {
-	
-	@Bean
-	public static PropertySourcesPlaceholderConfigurer getPropertySourcesPlaceholderConfigurer() {
-		PropertySourcesPlaceholderConfigurer configurer =
-			new PropertySourcesPlaceholderConfigurer();
-		configurer.setLocations(
-			new ClassPathResource("sql/transaction_participants_dao_queries.properties")
-		);
-		return configurer;
-	}
-	
 }

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

@@ -17,9 +17,8 @@
  */
 package ru.mystamps.web.feature.participant;
 
-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.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -35,31 +34,28 @@
 
 // The String literal "name" appears 4 times in this file
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
-@RequiredArgsConstructor
 public class JdbcParticipantDao implements ParticipantDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
-	
-	@Value("${transaction_participant.create}")
-	private String addParticipantSql;
-	
-	@Value("${transaction_participant.find_buyers_with_parent_names}")
-	private String findBuyersWithParentNamesSql;
-	
-	@Value("${transaction_participant.find_sellers_with_parent_names}")
-	private String findSellersWithParentNamesSql;
-	
-	@Value("${transaction_participant.find_seller_id_by_name}")
-	private String findSellerIdByNameSql;
-	
-	@Value("${transaction_participant.find_seller_id_by_name_and_url}")
-	private String findSellerIdByNameAndUrlSql;
-	
-	@Value("${transaction_participant_group.find_all}")
-	private String findAllGroupsSql;
-	
-	@Value("${transaction_participant_group.find_id_by_name}")
-	private String findGroupIdByNameSql;
+	private final String addParticipantSql;
+	private final String findBuyersWithParentNamesSql;
+	private final String findSellersWithParentNamesSql;
+	private final String findSellerIdByNameSql;
+	private final String findSellerIdByNameAndUrlSql;
+	private final String findAllGroupsSql;
+	private final String findGroupIdByNameSql;
+	
+	@SuppressWarnings("checkstyle:linelength")
+	public JdbcParticipantDao(Environment env, NamedParameterJdbcTemplate jdbcTemplate) {
+		this.jdbcTemplate                  = jdbcTemplate;
+		this.addParticipantSql             = env.getRequiredProperty("transaction_participant.create");
+		this.findBuyersWithParentNamesSql  = env.getRequiredProperty("transaction_participant.find_buyers_with_parent_names");
+		this.findSellersWithParentNamesSql = env.getRequiredProperty("transaction_participant.find_sellers_with_parent_names");
+		this.findSellerIdByNameSql         = env.getRequiredProperty("transaction_participant.find_seller_id_by_name");
+		this.findSellerIdByNameAndUrlSql   = env.getRequiredProperty("transaction_participant.find_seller_id_by_name_and_url");
+		this.findAllGroupsSql              = env.getRequiredProperty("transaction_participant_group.find_all");
+		this.findGroupIdByNameSql          = env.getRequiredProperty("transaction_participant_group.find_id_by_name");
+	}
 
 	@Override
 	public Integer add(AddParticipantDbDto participant) {

src/main/java/ru/mystamps/web/feature/participant/ParticipantConfig.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;
 
 /**
@@ -45,8 +47,10 @@ public ParticipantController participantController() {
 	}
 
 	@RequiredArgsConstructor
+	@PropertySource("classpath:sql/transaction_participants_dao_queries.properties")
 	public static class Services {
 
+		private final Environment env;
 		private final NamedParameterJdbcTemplate jdbcTemplate;
 
 		@Bean
@@ -59,7 +63,7 @@ public ParticipantService participantService(ParticipantDao participantDao) {
 
 		@Bean
 		public ParticipantDao participantDao() {
-			return new JdbcParticipantDao(jdbcTemplate);
+			return new JdbcParticipantDao(env, jdbcTemplate);
 		}
 
 	}