From b75b5a3d1a3bf001923d49923dcebee95ba2327e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 29 Jun 2017 17:09:49 +0300
Subject: notifications and configurations refactoring

---
 .../api/configuration/ApiAppConfiguration.java     |  2 +
 .../juick/api/configuration/ApiInitializer.java    |  3 +-
 .../api/configuration/ApiMvcConfiguration.java     | 51 ----------------------
 3 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 juick-api/src/main/java/com/juick/api/configuration/ApiMvcConfiguration.java

(limited to 'juick-api/src/main/java/com/juick/api/configuration')

diff --git a/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java b/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java
index cbf7d05c..7ef1cf45 100644
--- a/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java
+++ b/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java
@@ -3,6 +3,7 @@ package com.juick.api.configuration;
 import com.juick.api.ApiServer;
 import com.juick.api.TGBot;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -19,6 +20,7 @@ import javax.inject.Inject;
 @EnableScheduling
 @EnableAsync
 @PropertySource("classpath:juick.conf")
+@ComponentScan(basePackages = "com.juick.api.controllers")
 public class ApiAppConfiguration {
     @Inject
     TGBot tgBot;
diff --git a/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java b/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java
index 965fd32b..d01df787 100644
--- a/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java
+++ b/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java
@@ -1,6 +1,7 @@
 package com.juick.api.configuration;
 
 import com.juick.configuration.DataConfiguration;
+import com.juick.server.configuration.BaseWebConfiguration;
 import org.apache.commons.codec.CharEncoding;
 import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
@@ -22,7 +23,7 @@ public class ApiInitializer extends AbstractAnnotationConfigDispatcherServletIni
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        return new Class<?>[]{ApiMvcConfiguration.class};
+        return new Class<?>[]{BaseWebConfiguration.class};
     }
 
     @Override
diff --git a/juick-api/src/main/java/com/juick/api/configuration/ApiMvcConfiguration.java b/juick-api/src/main/java/com/juick/api/configuration/ApiMvcConfiguration.java
deleted file mode 100644
index 37c07434..00000000
--- a/juick-api/src/main/java/com/juick/api/configuration/ApiMvcConfiguration.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.juick.api.configuration;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.multipart.MultipartResolver;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-
-import java.util.List;
-
-/**
- * Created by vitalyster on 28.06.2016.
- */
-@Configuration
-@ComponentScan(basePackages = {"com.juick.api.controllers"})
-public class ApiMvcConfiguration extends WebMvcConfigurationSupport {
-
-    @Override
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
-        RequestMappingHandlerMapping mapping = super.requestMappingHandlerMapping();
-        mapping.setUseSuffixPatternMatch(false);
-        return mapping;
-    }
-
-    @Override
-    protected void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder()
-                .serializationInclusion(JsonInclude.Include.NON_DEFAULT)
-                .serializationInclusion(JsonInclude.Include.NON_NULL)
-                .serializationInclusion(JsonInclude.Include.NON_ABSENT)
-                .serializationInclusion(JsonInclude.Include.NON_EMPTY);
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(builder.build());
-        converter.getObjectMapper().registerModule(new Jdk8Module());
-        converters.add(converter);
-        super.configureMessageConverters(converters);
-    }
-
-    @Bean
-    public MultipartResolver multipartResolver() {
-        CommonsMultipartResolver resolver = new CommonsMultipartResolver();
-        resolver.setMaxUploadSize(10000000);
-        return resolver;
-    }
-}
-- 
cgit v1.2.3