Commit 85c76436 authored by Stephane Nicoll's avatar Stephane Nicoll

Remove use of 'javax.annotation.Resource'

This commit removes the only use of the `javax.annotation.Resource`
annotation from the codebase. This ensures that injection point are
only defined with Spring's annotation model.

Closes gh-9441
parent 58a1ed19
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
package org.springframework.boot.autoconfigure.security.oauth2.client; package org.springframework.boot.autoconfigure.security.oauth2.client;
import javax.annotation.Resource; import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.AnyNestedCondition; import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
import org.springframework.boot.autoconfigure.condition.ConditionMessage; import org.springframework.boot.autoconfigure.condition.ConditionMessage;
...@@ -106,9 +105,12 @@ public class OAuth2RestOperationsConfiguration { ...@@ -106,9 +105,12 @@ public class OAuth2RestOperationsConfiguration {
@Configuration @Configuration
protected static class ClientContextConfiguration { protected static class ClientContextConfiguration {
@Resource private final AccessTokenRequest accessTokenRequest;
@Qualifier("accessTokenRequest")
protected AccessTokenRequest accessTokenRequest; public ClientContextConfiguration(@Qualifier("accessTokenRequest")
ObjectProvider<AccessTokenRequest> accessTokenRequest) {
this.accessTokenRequest = accessTokenRequest.getIfAvailable();
}
@Bean @Bean
@Scope(value = "session", proxyMode = ScopedProxyMode.INTERFACES) @Scope(value = "session", proxyMode = ScopedProxyMode.INTERFACES)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment