refactor: inline StrategiesConfig into ImageConfig.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -32,7 +32,6 @@
 	SecurityConfig.class,
 	DaoConfig.class,
 	ServicesConfig.class,
-	StrategiesConfig.class,
 	TaskExecutorConfig.class,
 	TogglzConfig.class
 })

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

@@ -28,8 +28,6 @@
 // CheckStyle: ignore AvoidStarImportCheck for next 2 lines
 import ru.mystamps.web.dao.*; // NOPMD: UnusedImports
 import ru.mystamps.web.dao.impl.*; // NOPMD: UnusedImports
-import ru.mystamps.web.feature.image.ImageDataDao;
-import ru.mystamps.web.feature.image.JdbcImageDataDao;
 
 @Configuration
 @PropertySource("classpath:/sql/stamps_catalog_dao_queries.properties")
@@ -50,11 +48,6 @@ public StampsCatalogDao getGibbonsCatalogDao() {
 		);
 	}
 
-	@Bean
-	public ImageDataDao getImageDataDao() {
-		return new JdbcImageDataDao(jdbcTemplate);
-	}
-	
 	@Bean
 	public StampsCatalogDao getMichelCatalogDao() {
 		return new JdbcStampsCatalogDao(

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

@@ -21,12 +21,13 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.config.StrategiesConfig;
-
 /**
  * Spring configuration that is required for using images in an application.
  *
@@ -49,16 +50,17 @@ public ImageController imageController() {
 	}
 
 	@RequiredArgsConstructor
+	@Import({ DbStrategyConfig.class, FsStrategyConfig.class })
 	public static class Services {
 
 		private final NamedParameterJdbcTemplate jdbcTemplate;
-		private final StrategiesConfig strategiesConfig;
+		private final ImagePersistenceStrategy imagePersistenceStrategy;
 
 		@Bean
 		public ImageService getImageService(ImageDao imageDao) {
 			return new ImageServiceImpl(
 				LoggerFactory.getLogger(ImageServiceImpl.class),
-				strategiesConfig.getImagePersistenceStrategy(),
+				imagePersistenceStrategy,
 				new TimedImagePreviewStrategy(
 					LoggerFactory.getLogger(TimedImagePreviewStrategy.class),
 					new ThumbnailatorImagePreviewStrategy()
@@ -74,4 +76,42 @@ public ImageDao imageDao() {
 
 	}
 
+	@Profile("test")
+	@RequiredArgsConstructor
+	public static class DbStrategyConfig {
+		
+		private final NamedParameterJdbcTemplate jdbcTemplate;
+		
+		@Bean
+		public ImagePersistenceStrategy getImagePersistenceStrategy(ImageDataDao imageDataDao) {
+			return new DatabaseImagePersistenceStrategy(
+				LoggerFactory.getLogger(DatabaseImagePersistenceStrategy.class),
+				imageDataDao
+			);
+		}
+		
+		@Bean
+		public ImageDataDao imageDataDao() {
+			return new JdbcImageDataDao(jdbcTemplate);
+		}
+		
+	}
+	
+	@Profile({ "prod", "travis" })
+	@RequiredArgsConstructor
+	public static class FsStrategyConfig {
+		
+		private final Environment env;
+		
+		@Bean
+		public ImagePersistenceStrategy getImagePersistenceStrategy() {
+			return new FilesystemImagePersistenceStrategy(
+				LoggerFactory.getLogger(FilesystemImagePersistenceStrategy.class),
+				env.getRequiredProperty("app.upload.dir"),
+				env.getRequiredProperty("app.preview.dir")
+			);
+		}
+		
+	}
+	
 }