From 5d0915b8ad45719078b599234ff236e342c216dc Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 3 Jan 2022 16:44:56 -0500 Subject: [PATCH] Removes old spring-security-oauth2. See gh-1053 --- .../ResourceServerTokenRelayAutoConfiguration.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/security/ResourceServerTokenRelayAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/security/ResourceServerTokenRelayAutoConfiguration.java index 222328d3..1c30c195 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/security/ResourceServerTokenRelayAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/security/ResourceServerTokenRelayAutoConfiguration.java @@ -25,7 +25,6 @@ import java.lang.annotation.Target; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; @@ -53,7 +52,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; */ @Configuration(proxyBeanMethods = false) // @AutoConfigureAfter(OAuth2AutoConfiguration.class) -//@ResourceServerTokenRelayAutoConfiguration.ConditionalOnOAuth2ClientInResourceServer +// @ResourceServerTokenRelayAutoConfiguration.ConditionalOnOAuth2ClientInResourceServer // @ConditionalOnClass(ResourceServerConfiguration.class) @ConditionalOnWebApplication @ConditionalOnProperty(value = "spring.cloud.mvc.token-relay.enabled", matchIfMissing = true) @@ -73,8 +72,8 @@ public class ResourceServerTokenRelayAutoConfiguration { @Configuration(proxyBeanMethods = false) public static class ResourceServerTokenRelayRegistrationAutoConfiguration implements WebMvcConfigurer { - //@Autowired - //AccessTokenContextRelay accessTokenContextRelay; + // @Autowired + // AccessTokenContextRelay accessTokenContextRelay; @Override public void addInterceptors(InterceptorRegistry registry) {