From caa687f97921b00a109bc0bb139887069ebf2e15 Mon Sep 17 00:00:00 2001 From: Andrea Ceccanti Date: Fri, 4 Oct 2019 13:09:07 +0200 Subject: [PATCH] Improved DI for client validator --- ...DefaultDynamicClientValidationService.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultDynamicClientValidationService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultDynamicClientValidationService.java index 3bc858c0f..6aca526cf 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultDynamicClientValidationService.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultDynamicClientValidationService.java @@ -77,21 +77,28 @@ public class DefaultDynamicClientValidationService implements DynamicClientValid public static final Logger LOG = LoggerFactory.getLogger(DefaultDynamicClientValidationService.class); - @Autowired - private SystemScopeService scopeService; + + protected final SystemScopeService scopeService; + + protected final AssertionValidator assertionValidator; + + protected final BlacklistedSiteService blacklistService; + + protected final ConfigurationPropertiesBean config; + + protected final ClientDetailsEntityService clientService; @Autowired - @Qualifier("clientAssertionValidator") - private AssertionValidator assertionValidator; - - @Autowired - private BlacklistedSiteService blacklistService; - - @Autowired - private ConfigurationPropertiesBean config; - - @Autowired - private ClientDetailsEntityService clientService; + public DefaultDynamicClientValidationService(SystemScopeService scopeService, + @Qualifier("clientAssertionValidator") AssertionValidator assertionValidator, + BlacklistedSiteService blacklistService, ConfigurationPropertiesBean config, + ClientDetailsEntityService clientService) { + this.scopeService = scopeService; + this.assertionValidator = assertionValidator; + this.blacklistService = blacklistService; + this.config = config; + this.clientService = clientService; + } public static final ImmutableSet ALLOWED_GRANT_TYPES = ImmutableSet.of("authorization_code", "implicit", "client_credentials", "refresh_token",