This commit is contained in:
Madhura Bhave
2018-08-07 14:48:16 -07:00
parent 5cfe8dbee9
commit 319fec4be4
4 changed files with 4 additions and 4 deletions

View File

@@ -15,6 +15,6 @@
*/
/**
* Support for Spring Security's OAuth 2 resource server.
* Support for Spring Security's OAuth2 resource server.
*/
package org.springframework.boot.autoconfigure.security.oauth2.resource;

View File

@@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.security.oauth2.resource.servlet;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2ResourceServerProperties;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -35,6 +36,7 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAut
@AutoConfigureBefore(SecurityAutoConfiguration.class)
@EnableConfigurationProperties(OAuth2ResourceServerProperties.class)
@ConditionalOnClass(JwtAuthenticationToken.class)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
@Import({ OAuth2ResourceServerJwkConfiguration.class,
OAuth2ResourceServerWebSecurityConfiguration.class })
public class OAuth2ResourceServerAutoConfiguration {

View File

@@ -17,7 +17,6 @@ package org.springframework.boot.autoconfigure.security.oauth2.resource.servlet;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -30,7 +29,6 @@ import org.springframework.security.oauth2.jwt.JwtDecoder;
*/
@Configuration
@ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
class OAuth2ResourceServerWebSecurityConfiguration {
@Configuration

View File

@@ -15,6 +15,6 @@
*/
/**
* Auto-configuration for Spring Security's OAuth 2 resource server.
* Auto-configuration for Spring Security's OAuth2 resource server.
*/
package org.springframework.boot.autoconfigure.security.oauth2.resource.servlet;