spring config for java 8

This commit is contained in:
anhefti 2019-02-04 17:02:48 +01:00
parent de93ebf913
commit c1aff280d9
2 changed files with 2 additions and 5 deletions

View file

@ -10,18 +10,13 @@ package ch.ethz.seb.sebserver;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration; import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@SpringBootApplication(exclude = { @SpringBootApplication(exclude = {
// OAuth2ResourceServerAutoConfiguration.class, // OAuth2ResourceServerAutoConfiguration.class,
UserDetailsServiceAutoConfiguration.class, UserDetailsServiceAutoConfiguration.class,
//DataSourceAutoConfiguration.class //DataSourceAutoConfiguration.class
}) })
@Configuration
@Import(DataSourceAutoConfiguration.class)
public class SEBServer { public class SEBServer {
public static void main(final String[] args) { public static void main(final String[] args) {

View file

@ -16,6 +16,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
@ -75,6 +76,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
clients.withClientDetails(this.webServiceClientDetails); clients.withClientDetails(this.webServiceClientDetails);
} }
@Lazy
@Bean @Bean
public TokenStore tokenStore() { public TokenStore tokenStore() {
System.out.println("************************* this.dataSource:" + this.dataSource); System.out.println("************************* this.dataSource:" + this.dataSource);