notifications and configurations refactoring

3 files changed, 3 insertions, 45 deletions

diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle
index c704cbdb..8e2ecbbf 100644
--- a/juick-crosspost/build.gradle
+++ b/juick-crosspost/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'org.akhikhl.gretty'
 
 dependencies {
     compile project(':juick-server-jdbc')
-    compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}"
+    compile project(':juick-server-web')
     compile "org.springframework:spring-websocket:${rootProject.springFrameworkVersion}"
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
 }
diff --git a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java
index 442bd1c8..8eaab803 100644
--- a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java
+++ b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java
@@ -1,6 +1,7 @@
 package com.juick.components.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;
@@ -19,7 +20,7 @@ public class CrosspostInitializer extends AbstractAnnotationConfigDispatcherServ
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        return new Class<?>[]{CrosspostMvcConfiguration.class};
+        return new Class<?>[]{BaseWebConfiguration.class};
     }
 
     @Override
diff --git a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostMvcConfiguration.java b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostMvcConfiguration.java
deleted file mode 100644
index 619c3d78..00000000
--- a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostMvcConfiguration.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.juick.components.configuration;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-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.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.components.controllers"})
-public class CrosspostMvcConfiguration 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);
-    }
-}