diff options
author | 2017-10-17 22:43:27 +0300 | |
---|---|---|
committer | 2017-10-18 00:22:44 +0300 | |
commit | a86b5ada5b07ec18671983b0c772063815cac334 (patch) | |
tree | 80e62339b857cd699db6f1f087cf2221df655d96 /juick-server-web/src/main | |
parent | 5b6ac36436bbed6da7937f0fc83eb734ad929910 (diff) |
tests refatoring
now api and www tests uses embedded db
Diffstat (limited to 'juick-server-web/src/main')
-rw-r--r-- | juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java | 6 | ||||
-rw-r--r-- | juick-server-web/src/main/java/com/juick/server/configuration/StorageConfiguration.java | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java index abf8482c..27f4d55c 100644 --- a/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java +++ b/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java @@ -43,7 +43,6 @@ import java.util.concurrent.Executors; /** * Created by vitalyster on 28.06.2016. */ -@Import(DataConfiguration.class) @Configuration public class BaseWebConfiguration implements WebMvcConfigurer, SchedulingConfigurer { @@ -76,10 +75,7 @@ public class BaseWebConfiguration implements WebMvcConfigurer, SchedulingConfigu resolver.setMaxUploadSize(10000000); return resolver; } - @Bean - public ImagesService imagesService() { - return new ImagesServiceImpl(); - } + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { taskRegistrar.setScheduler(taskExecutor()); diff --git a/juick-server-web/src/main/java/com/juick/server/configuration/StorageConfiguration.java b/juick-server-web/src/main/java/com/juick/server/configuration/StorageConfiguration.java new file mode 100644 index 00000000..94b23037 --- /dev/null +++ b/juick-server-web/src/main/java/com/juick/server/configuration/StorageConfiguration.java @@ -0,0 +1,14 @@ +package com.juick.server.configuration; + +import com.juick.service.ImagesService; +import com.juick.service.ImagesServiceImpl; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class StorageConfiguration { + @Bean + public ImagesService imagesService() { + return new ImagesServiceImpl(); + } +} |