Skip to content

Commit 5ff9e91

Browse files
authored
Remove unnecessary AbstractConfigPropertySynchronizer class (#33002)
Closes #33000 Signed-off-by: Stefan Guilhen <[email protected]>
1 parent da5fd31 commit 5ff9e91

File tree

5 files changed

+18
-53
lines changed

5 files changed

+18
-53
lines changed

server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/AbstractConfigPropertySynchronizer.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/ConfigSynchronizer.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.keycloak.broker.provider.mappersync;
1919

20+
import org.jboss.logging.Logger;
2021
import org.keycloak.models.IdentityProviderMapperModel;
2122
import org.keycloak.models.KeycloakSession;
2223
import org.keycloak.models.RealmModel;
@@ -28,7 +29,17 @@
2829
* @author <a href="mailto:[email protected]">Daniel Fesenmeyer</a>
2930
*/
3031
public interface ConfigSynchronizer<T extends ProviderEvent> {
32+
Logger LOG = Logger.getLogger(ConfigSynchronizer.class);
33+
3134
Class<T> getEventClass();
3235

3336
void handleEvent(T event);
37+
38+
default void logEventProcessed(String configPropertyName, String previousValue, String newValue, String realmName,
39+
String mapperName, String idpAlias) {
40+
LOG.infof(
41+
"Reference of type '%s' changed from '%s' to '%s' in realm '%s'. Adjusting the reference from mapper '%s' of IDP '%s'.",
42+
configPropertyName, previousValue, newValue, realmName, mapperName, idpAlias);
43+
44+
}
3445
}

server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/GroupConfigPropertyByPathSynchronizer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*
3434
* @author <a href="mailto:[email protected]">Daniel Fesenmeyer</a>
3535
*/
36-
public class GroupConfigPropertyByPathSynchronizer extends AbstractConfigPropertySynchronizer<GroupModel.GroupPathChangeEvent> {
36+
public class GroupConfigPropertyByPathSynchronizer implements ConfigSynchronizer<GroupModel.GroupPathChangeEvent> {
3737

3838
public static final GroupConfigPropertyByPathSynchronizer INSTANCE = new GroupConfigPropertyByPathSynchronizer();
3939

@@ -53,7 +53,7 @@ public void handleEvent(GroupModel.GroupPathChangeEvent event) {
5353
event.getKeycloakSession().identityProviders().getMappersStream(Map.of(ConfigConstants.GROUP, event.getPreviousPath()), null, null)
5454
.forEach(idpMapper -> {
5555
idpMapper.getConfig().put(ConfigConstants.GROUP, event.getNewPath());
56-
super.logEventProcessed(ConfigConstants.GROUP, event.getPreviousPath(), event.getNewPath(), event.getRealm().getName(),
56+
logEventProcessed(ConfigConstants.GROUP, event.getPreviousPath(), event.getNewPath(), event.getRealm().getName(),
5757
idpMapper.getName(), idpMapper.getIdentityProviderAlias());
5858
event.getKeycloakSession().identityProviders().updateMapper(idpMapper);
5959
});
@@ -65,7 +65,7 @@ public void handleEvent(GroupModel.GroupPathChangeEvent event) {
6565
String currentGroupPath = idpMapper.getConfig().get(ConfigConstants.GROUP);
6666
String newGroupPath = event.getNewPath() + currentGroupPath.substring(event.getPreviousPath().length());
6767
idpMapper.getConfig().put(ConfigConstants.GROUP, newGroupPath);
68-
super.logEventProcessed(ConfigConstants.GROUP, currentGroupPath, newGroupPath, event.getRealm().getName(),
68+
logEventProcessed(ConfigConstants.GROUP, currentGroupPath, newGroupPath, event.getRealm().getName(),
6969
idpMapper.getName(), idpMapper.getIdentityProviderAlias());
7070
event.getKeycloakSession().identityProviders().updateMapper(idpMapper);
7171
});

server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByClientIdSynchronizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*
3232
* @author <a href="mailto:[email protected]">Daniel Fesenmeyer</a>
3333
*/
34-
public class RoleConfigPropertyByClientIdSynchronizer extends AbstractConfigPropertySynchronizer<ClientModel.ClientIdChangeEvent> {
34+
public class RoleConfigPropertyByClientIdSynchronizer implements ConfigSynchronizer<ClientModel.ClientIdChangeEvent> {
3535

3636
public static final RoleConfigPropertyByClientIdSynchronizer INSTANCE =
3737
new RoleConfigPropertyByClientIdSynchronizer();
@@ -54,7 +54,7 @@ public void handleEvent(ClientModel.ClientIdChangeEvent event) {
5454
String configuredRoleName = KeycloakModelUtils.parseRole(currentRoleValue)[1];
5555
String newRoleValue = KeycloakModelUtils.buildRoleQualifier(event.getNewClientId(), configuredRoleName);
5656
idpMapper.getConfig().put(ConfigConstants.ROLE, newRoleValue);
57-
super.logEventProcessed(ConfigConstants.ROLE, currentRoleValue, newRoleValue, event.getUpdatedClient().getRealm().getName(),
57+
logEventProcessed(ConfigConstants.ROLE, currentRoleValue, newRoleValue, event.getUpdatedClient().getRealm().getName(),
5858
idpMapper.getName(), idpMapper.getIdentityProviderAlias());
5959
event.getKeycloakSession().identityProviders().updateMapper(idpMapper);
6060
});

server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByRoleNameSynchronizer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
*
3232
* @author <a href="mailto:[email protected]">Daniel Fesenmeyer</a>
3333
*/
34-
public class RoleConfigPropertyByRoleNameSynchronizer
35-
extends AbstractConfigPropertySynchronizer<RoleModel.RoleNameChangeEvent> {
34+
public class RoleConfigPropertyByRoleNameSynchronizer implements ConfigSynchronizer<RoleModel.RoleNameChangeEvent> {
3635

3736
public static final RoleConfigPropertyByRoleNameSynchronizer INSTANCE =
3837
new RoleConfigPropertyByRoleNameSynchronizer();
@@ -54,7 +53,7 @@ public void handleEvent(RoleModel.RoleNameChangeEvent event) {
5453
.forEach(idpMapper -> {
5554
String newRoleValue = KeycloakModelUtils.buildRoleQualifier(event.getClientId(), event.getNewName());
5655
idpMapper.getConfig().put(ConfigConstants.ROLE, newRoleValue);
57-
super.logEventProcessed(ConfigConstants.ROLE, currentRoleValue, newRoleValue, event.getRealm().getName(),
56+
logEventProcessed(ConfigConstants.ROLE, currentRoleValue, newRoleValue, event.getRealm().getName(),
5857
idpMapper.getName(), idpMapper.getIdentityProviderAlias());
5958
event.getKeycloakSession().identityProviders().updateMapper(idpMapper);
6059
});

0 commit comments

Comments
 (0)