aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-08-21 11:53:36 +0300
committerGravatar Vitaly Takmazov2018-08-21 11:53:36 +0300
commitd4a9a95f43e0b911b76d03150603d191d463550c (patch)
tree315289c380b7e424160066dfe0c8f18dc6fc9948
parent03b85ca2d8e53a13d73babd1be82ee70ac81a995 (diff)
cleanup configuration
-rw-r--r--juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java4
-rw-r--r--juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java6
2 files changed, 4 insertions, 6 deletions
diff --git a/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
index a80740e9..23a35384 100644
--- a/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
+++ b/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
@@ -17,10 +17,6 @@
package com.juick.server.configuration;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
diff --git a/juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java b/juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java
index 41689bb1..8b37ef17 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java
+++ b/juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java
@@ -25,12 +25,14 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
+import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.security.web.authentication.HttpStatusEntryPoint;
import org.springframework.security.web.authentication.RememberMeServices;
@@ -81,7 +83,7 @@ public class ApiSecurityConfig extends WebSecurityConfigurerAdapter {
}
@Bean
- public DaoAuthenticationProvider authenticationProvider() {
+ public AuthenticationProvider authenticationProvider() {
DaoAuthenticationProvider authenticationProvider = new DaoAuthenticationProvider();
authenticationProvider.setUserDetailsService(userDetailsService());
@@ -90,7 +92,7 @@ public class ApiSecurityConfig extends WebSecurityConfigurerAdapter {
}
@Bean
- public JuickUserDetailsService userDetailsService() {
+ public UserDetailsService userDetailsService() {
return new JuickUserDetailsService(userService);
}