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

Diff for: src/main/java/ru/mystamps/web/config/ApplicationContext.java

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

Diff for: src/main/java/ru/mystamps/web/feature/site/JdbcSuspiciousActivityDao.java

@@ -17,9 +17,8 @@
  */
 package ru.mystamps.web.feature.site;
 
-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;
@@ -28,22 +27,22 @@
 import java.util.List;
 import java.util.Map;
 
-@RequiredArgsConstructor
 public class JdbcSuspiciousActivityDao implements SuspiciousActivityDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
+	private final String addSuspiciousActivitySql;
+	private final String countAllSql;
+	private final String countByTypeSinceSql;
+	private final String findAllSql;
 
-	@Value("${suspicious_activity.create}")
-	private String addSuspiciousActivitySql;
-	
-	@Value("${suspicious_activity.count_all}")
-	private String countAllSql;
-	
-	@Value("${suspicious_activity.count_by_type_since}")
-	private String countByTypeSinceSql;
-	
-	@Value("${suspicious_activity.find_all}")
-	private String findAllSql;
+	@SuppressWarnings("checkstyle:linelength")
+	public JdbcSuspiciousActivityDao(Environment env, NamedParameterJdbcTemplate jdbcTemplate) {
+		this.jdbcTemplate             = jdbcTemplate;
+		this.addSuspiciousActivitySql = env.getRequiredProperty("suspicious_activity.create");
+		this.countAllSql              = env.getRequiredProperty("suspicious_activity.count_all");
+		this.countByTypeSinceSql      = env.getRequiredProperty("suspicious_activity.count_by_type_since");
+		this.findAllSql               = env.getRequiredProperty("suspicious_activity.find_all");
+	}
 
 	@Override
 	public void add(AddSuspiciousActivityDbDto activity) {

Diff for: src/main/java/ru/mystamps/web/feature/site/SiteConfig.java

@@ -23,6 +23,7 @@
 import org.springframework.context.MessageSource;
 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.core.env.Profiles;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -91,6 +92,7 @@ public CspController cspController() {
 	}
 
 	@RequiredArgsConstructor
+	@PropertySource("classpath:sql/suspicious_activity_dao_queries.properties")
 	public static class Services {
 
 		private final CategoryService categoryService;
@@ -168,7 +170,7 @@ public SuspiciousActivityService suspiciousActivityService(
 
 		@Bean
 		public SuspiciousActivityDao suspiciousActivityDao() {
-			return new JdbcSuspiciousActivityDao(jdbcTemplate);
+			return new JdbcSuspiciousActivityDao(env, jdbcTemplate);
 		}
 
 	}