Refactor ScimUserProvisioning Dependency Injection #2796
Conversation
Add qualifier for TimeService component
adrianhoelzl-sap
added
the
DO NOT MERGE
|
We have created an issue in Pivotal Tracker to manage this: https://www.pivotaltracker.com/story/show/187298342 The labels on this github issue will be updated when the story is started. |
…UserProvisioning from XML to annotation-based injection
| @@ -1,4 +1,7 @@ | |||
| package org.cloudfoundry.identity.uaa.util; | |||
|
|
|||
| import org.springframework.stereotype.Component; | |||
|
|
|||
| @Component("timeService") | |||
There was a problem hiding this comment.
I am pretty sure this is not needed because of interface
| final IdentityZoneManager identityZoneManager, | ||
| final JdbcIdentityZoneProvisioning jdbcIdentityZoneProvisioning | ||
| @Qualifier("identityZoneProvisioning") final JdbcIdentityZoneProvisioning jdbcIdentityZoneProvisioning, | ||
| @Qualifier("timeService") final TimeService timeService, |
There was a problem hiding this comment.
see other comment you can omit timeService qulifier , similar to IdentityZoneManager
| @@ -137,7 +137,7 @@ public class ScimUserEndpoints implements InitializingBean, ApplicationEventPubl | |||
| public ScimUserEndpoints( | |||
| final IdentityZoneManager identityZoneManager, | |||
| final IsSelfCheck isSelfCheck, | |||
| final ScimUserProvisioning scimUserProvisioning, | |||
| final @Qualifier("scimUserProvisioning") ScimUserProvisioning scimUserProvisioning, | |||
There was a problem hiding this comment.
using 2 time same scimUserProvisioning qualifier ?
| @@ -137,7 +137,7 @@ public class ScimUserEndpoints implements InitializingBean, ApplicationEventPubl | |||
| public ScimUserEndpoints( | |||
| final IdentityZoneManager identityZoneManager, | |||
| final IsSelfCheck isSelfCheck, | |||
| final ScimUserProvisioning scimUserProvisioning, | |||
| final @Qualifier("scimUserProvisioning") ScimUserProvisioning scimUserProvisioning, | |||
| final IdentityProviderProvisioning identityProviderProvisioning, | |||
| final @Qualifier("scimUserProvisioning") ResourceMonitor<ScimUser> scimUserResourceMonitor, | |||
There was a problem hiding this comment.
using 2 time same scimUserProvisioning qualifier ?
There was a problem hiding this comment.
The JdbcScimUserProvisioning class also implements the ResourceManager interface and is used as the implementation to this interface here.
| @@ -536,18 +529,11 @@ protected int deleteUser(String userId, int version, String zoneId) { | |||
| return updated; | |||
| } | |||
|
|
|||
| @VisibleForTesting | |||
There was a problem hiding this comment.
why not simply protected then from test class it is reachable
There was a problem hiding this comment.
fixed with commit df4592f
No description provided.