Skip to content

Commit 56701e3

Browse files
committed
minor cleanup
1 parent 91a63c4 commit 56701e3

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

spring-security-oauth/spring-security-oauth-resource/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,28 @@
88
import org.springframework.context.annotation.PropertySource;
99
import org.springframework.core.env.Environment;
1010
import org.springframework.jdbc.datasource.DriverManagerDataSource;
11+
import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
12+
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
13+
import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
1114
import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
15+
import org.springframework.security.oauth2.provider.expression.OAuth2MethodSecurityExpressionHandler;
1216
import org.springframework.security.oauth2.provider.token.TokenStore;
1317
import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore;
1418

1519
@Configuration
1620
@PropertySource({ "classpath:persistence.properties" })
1721
@EnableResourceServer
18-
public class OAuth2ResourceServerConfig {
22+
@EnableGlobalMethodSecurity(prePostEnabled = true)
23+
public class OAuth2ResourceServerConfig extends GlobalMethodSecurityConfiguration {
1924

2025
@Autowired
2126
private Environment env;
2227

28+
@Override
29+
protected MethodSecurityExpressionHandler createExpressionHandler() {
30+
return new OAuth2MethodSecurityExpressionHandler();
31+
}
32+
2333
@Bean
2434
public DataSource dataSource() {
2535
final DriverManagerDataSource dataSource = new DriverManagerDataSource();

spring-security-oauth/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceSecurityConfig.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

spring-security-oauth/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceApplication.java renamed to spring-security-oauth/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import org.springframework.boot.context.web.SpringBootServletInitializer;
66

77
@SpringBootApplication
8-
public class ResourceApplication extends SpringBootServletInitializer {
8+
public class ResourceServerApplication extends SpringBootServletInitializer {
99

1010
public static void main(String[] args) {
11-
SpringApplication.run(ResourceApplication.class, args);
11+
SpringApplication.run(ResourceServerApplication.class, args);
1212
}
1313

1414
}

spring-security-oauth/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceWebConfig.java renamed to spring-security-oauth/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
@Configuration
99
@EnableWebMvc
1010
@ComponentScan({ "org.baeldung.web.controller" })
11-
public class ResourceWebConfig extends WebMvcConfigurerAdapter {
11+
public class ResourceServerWebConfig extends WebMvcConfigurerAdapter {
1212

1313
}

0 commit comments

Comments
 (0)