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

@@ -43,7 +43,6 @@ public static PropertySourcesPlaceholderConfigurer getPropertySourcesPlaceholder
 		PropertySourcesPlaceholderConfigurer configurer =
 			new PropertySourcesPlaceholderConfigurer();
 		configurer.setLocations(
-			new ClassPathResource("sql/image_dao_queries.properties"),
 			new ClassPathResource("sql/user_dao_queries.properties"),
 			new ClassPathResource("sql/users_activation_dao_queries.properties"),
 			new ClassPathResource("sql/series_dao_queries.properties"),

src/main/java/ru/mystamps/web/feature/image/ImageConfig.java

@@ -23,6 +23,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
@@ -49,8 +50,10 @@ public ImageController imageController() {
 
 	@RequiredArgsConstructor
 	@Import({ DbStrategyConfig.class, FsStrategyConfig.class })
+	@PropertySource("classpath:sql/image_dao_queries.properties")
 	public static class Services {
 
+		private final Environment env;
 		private final NamedParameterJdbcTemplate jdbcTemplate;
 		private final ImagePersistenceStrategy imagePersistenceStrategy;
 
@@ -69,7 +72,7 @@ public ImageService imageService(ImageDao imageDao) {
 
 		@Bean
 		public ImageDao imageDao() {
-			return new JdbcImageDao(jdbcTemplate);
+			return new JdbcImageDao(env, jdbcTemplate);
 		}
 
 	}

src/main/java/ru/mystamps/web/feature/image/JdbcImageDao.java

@@ -17,9 +17,8 @@
  */
 package ru.mystamps.web.feature.image;
 
-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;
@@ -32,25 +31,23 @@
 import java.util.List;
 import java.util.Map;
 
-@RequiredArgsConstructor
 public class JdbcImageDao implements ImageDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
+	private final String addImageSql;
+	private final String replaceImageSql;
+	private final String addImageToSeriesSql;
+	private final String findByIdSql;
+	private final String findBySeriesIdSql;
 
-	@Value("${image.add}")
-	private String addImageSql;
-	
-	@Value("${image.replace}")
-	private String replaceImageSql;
-	
-	@Value("${series_image.add}")
-	private String addImageToSeriesSql;
-	
-	@Value("${image.find_by_id}")
-	private String findByIdSql;
-	
-	@Value("${series_image.find_by_series_id}")
-	private String findBySeriesIdSql;
+	public JdbcImageDao(Environment env, NamedParameterJdbcTemplate jdbcTemplate) {
+		this.jdbcTemplate        = jdbcTemplate;
+		this.addImageSql         = env.getRequiredProperty("image.add");
+		this.replaceImageSql     = env.getRequiredProperty("image.replace");
+		this.addImageToSeriesSql = env.getRequiredProperty("series_image.add");
+		this.findByIdSql         = env.getRequiredProperty("image.find_by_id");
+		this.findBySeriesIdSql   = env.getRequiredProperty("series_image.find_by_series_id");
+	}
 
 	@Override
 	public Integer add(String type, String filename) {