From 85c76436384903c6e441201b9f2f62b3510b8caa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 26 Jun 2017 17:46:46 +0200 Subject: [PATCH] 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 --- .../client/OAuth2RestOperationsConfiguration.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java index 6e6e24e3adc..78d8afd582d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java @@ -16,8 +16,7 @@ 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.boot.autoconfigure.condition.AnyNestedCondition; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -106,9 +105,12 @@ public class OAuth2RestOperationsConfiguration { @Configuration protected static class ClientContextConfiguration { - @Resource - @Qualifier("accessTokenRequest") - protected AccessTokenRequest accessTokenRequest; + private final AccessTokenRequest accessTokenRequest; + + public ClientContextConfiguration(@Qualifier("accessTokenRequest") + ObjectProvider accessTokenRequest) { + this.accessTokenRequest = accessTokenRequest.getIfAvailable(); + } @Bean @Scope(value = "session", proxyMode = ScopedProxyMode.INTERFACES)