From e7f2e2ee0cdfc65c4c9830c12fa48f098de174f5 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 12 Feb 2025 14:33:58 -0500 Subject: [PATCH] steps to reduce bean name conflicts --- .../conf/ActivitiOotbSecurityConfigurationAdapter.java | 4 ++-- .../conf/KeycloakExtSpringComponentScanner.java | 10 +++++++++- .../activiti/{ => idm}/ActivitiAppAdminGroupFixer.java | 4 +++- .../{ => idm}/ActivitiAppAdminMembersFixer.java | 4 +++- .../{ => idm}/ActivitiAppAdminPasswordFixer.java | 4 +++- .../keycloak/KeycloakActivitiAppAuthenticator.java | 1 - .../keycloak/KeycloakSecurityConfigurationAdapter.java | 2 +- .../activiti/{ => keycloak}/TenantFinderService.java | 2 +- .../{ => security}/ActivitiSecurityConfigAdapter.java | 2 +- .../Inteligr8SecurityConfigurationRegistry.java | 3 ++- 10 files changed, 25 insertions(+), 11 deletions(-) rename src/main/java/com/inteligr8/activiti/{ => idm}/ActivitiAppAdminGroupFixer.java (97%) rename src/main/java/com/inteligr8/activiti/{ => idm}/ActivitiAppAdminMembersFixer.java (96%) rename src/main/java/com/inteligr8/activiti/{ => idm}/ActivitiAppAdminPasswordFixer.java (93%) rename src/main/java/com/inteligr8/activiti/{ => keycloak}/TenantFinderService.java (98%) rename src/main/java/com/inteligr8/activiti/{ => security}/ActivitiSecurityConfigAdapter.java (97%) rename src/main/java/com/inteligr8/activiti/{ => security}/Inteligr8SecurityConfigurationRegistry.java (94%) diff --git a/src/main/java/com/activiti/conf/ActivitiOotbSecurityConfigurationAdapter.java b/src/main/java/com/activiti/conf/ActivitiOotbSecurityConfigurationAdapter.java index 5d60b69..054d266 100644 --- a/src/main/java/com/activiti/conf/ActivitiOotbSecurityConfigurationAdapter.java +++ b/src/main/java/com/activiti/conf/ActivitiOotbSecurityConfigurationAdapter.java @@ -22,12 +22,12 @@ import org.springframework.security.config.annotation.authentication.builders.Au import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Component; -import com.inteligr8.activiti.ActivitiSecurityConfigAdapter; +import com.inteligr8.activiti.security.ActivitiSecurityConfigAdapter; /** * This class/bean executes the OOTB security configuration without the * override, so you can still use its OOTB features. This will allow you to - * enable/disable features, chain them, and uset he OOTB features as a + * enable/disable features, chain them, and unset the OOTB features as a * fallback or failsafe. * * This class must be in the com.activiti.conf package so it can use protected diff --git a/src/main/java/com/activiti/extension/conf/KeycloakExtSpringComponentScanner.java b/src/main/java/com/activiti/extension/conf/KeycloakExtSpringComponentScanner.java index df1e3d3..fc297ec 100644 --- a/src/main/java/com/activiti/extension/conf/KeycloakExtSpringComponentScanner.java +++ b/src/main/java/com/activiti/extension/conf/KeycloakExtSpringComponentScanner.java @@ -16,6 +16,7 @@ package com.activiti.extension.conf; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator; /** * A means for injecting packages to scan for the Spring context. @@ -23,7 +24,14 @@ import org.springframework.context.annotation.Configuration; * @author brian@inteligr8.com */ @Configuration -@ComponentScan(basePackages = {"com.inteligr8.activiti"}) +@ComponentScan( + basePackages = { + "com.inteligr8.activiti.idm", + "com.inteligr8.activiti.keycloak", + "com.inteligr8.activiti.security" + }, + nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class +) public class KeycloakExtSpringComponentScanner { } diff --git a/src/main/java/com/inteligr8/activiti/ActivitiAppAdminGroupFixer.java b/src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminGroupFixer.java similarity index 97% rename from src/main/java/com/inteligr8/activiti/ActivitiAppAdminGroupFixer.java rename to src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminGroupFixer.java index d033e5a..9d2b390 100644 --- a/src/main/java/com/inteligr8/activiti/ActivitiAppAdminGroupFixer.java +++ b/src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminGroupFixer.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package com.inteligr8.activiti; +package com.inteligr8.activiti.idm; import java.util.ArrayList; import java.util.Arrays; @@ -32,6 +32,8 @@ import com.activiti.domain.idm.Group; import com.activiti.domain.idm.GroupCapability; import com.activiti.domain.idm.Tenant; import com.activiti.service.api.GroupService; +import com.inteligr8.activiti.DataFixer; +import com.inteligr8.activiti.keycloak.TenantFinderService; /** * This class/bean attempts to fix the administrative group in APS. This may diff --git a/src/main/java/com/inteligr8/activiti/ActivitiAppAdminMembersFixer.java b/src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminMembersFixer.java similarity index 96% rename from src/main/java/com/inteligr8/activiti/ActivitiAppAdminMembersFixer.java rename to src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminMembersFixer.java index b8dd10a..acb8661 100644 --- a/src/main/java/com/inteligr8/activiti/ActivitiAppAdminMembersFixer.java +++ b/src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminMembersFixer.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package com.inteligr8.activiti; +package com.inteligr8.activiti.idm; import java.util.Arrays; import java.util.List; @@ -29,6 +29,8 @@ import com.activiti.domain.idm.Group; import com.activiti.domain.idm.User; import com.activiti.service.api.GroupService; import com.activiti.service.api.UserService; +import com.inteligr8.activiti.DataFixer; +import com.inteligr8.activiti.keycloak.TenantFinderService; /** * This class/bean attempts to add administrators to the administrative group diff --git a/src/main/java/com/inteligr8/activiti/ActivitiAppAdminPasswordFixer.java b/src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminPasswordFixer.java similarity index 93% rename from src/main/java/com/inteligr8/activiti/ActivitiAppAdminPasswordFixer.java rename to src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminPasswordFixer.java index 1a052ae..5ef2ec4 100644 --- a/src/main/java/com/inteligr8/activiti/ActivitiAppAdminPasswordFixer.java +++ b/src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminPasswordFixer.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package com.inteligr8.activiti; +package com.inteligr8.activiti.idm; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,6 +22,8 @@ import org.springframework.stereotype.Component; import com.activiti.domain.idm.User; import com.activiti.service.api.UserService; +import com.inteligr8.activiti.DataFixer; +import com.inteligr8.activiti.keycloak.TenantFinderService; /** * This class/bean attempts to reset the configured user's password. diff --git a/src/main/java/com/inteligr8/activiti/keycloak/KeycloakActivitiAppAuthenticator.java b/src/main/java/com/inteligr8/activiti/keycloak/KeycloakActivitiAppAuthenticator.java index 95fbf91..5bb0b04 100644 --- a/src/main/java/com/inteligr8/activiti/keycloak/KeycloakActivitiAppAuthenticator.java +++ b/src/main/java/com/inteligr8/activiti/keycloak/KeycloakActivitiAppAuthenticator.java @@ -41,7 +41,6 @@ import com.activiti.domain.idm.Group; import com.activiti.domain.idm.User; import com.activiti.service.api.GroupService; import com.activiti.service.api.UserService; -import com.inteligr8.activiti.TenantFinderService; /** * This class/bean implements an Open ID Connect authenticator for Alfresco diff --git a/src/main/java/com/inteligr8/activiti/keycloak/KeycloakSecurityConfigurationAdapter.java b/src/main/java/com/inteligr8/activiti/keycloak/KeycloakSecurityConfigurationAdapter.java index 23516ac..38d6309 100644 --- a/src/main/java/com/inteligr8/activiti/keycloak/KeycloakSecurityConfigurationAdapter.java +++ b/src/main/java/com/inteligr8/activiti/keycloak/KeycloakSecurityConfigurationAdapter.java @@ -25,9 +25,9 @@ import org.springframework.security.core.authority.mapping.SimpleAuthorityMapper import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Component; -import com.inteligr8.activiti.ActivitiSecurityConfigAdapter; import com.inteligr8.activiti.auth.Authenticator; import com.inteligr8.activiti.auth.InterceptingAuthenticationProvider; +import com.inteligr8.activiti.security.ActivitiSecurityConfigAdapter; /** * This class/bean injects a custom keycloak authentication provider into the diff --git a/src/main/java/com/inteligr8/activiti/TenantFinderService.java b/src/main/java/com/inteligr8/activiti/keycloak/TenantFinderService.java similarity index 98% rename from src/main/java/com/inteligr8/activiti/TenantFinderService.java rename to src/main/java/com/inteligr8/activiti/keycloak/TenantFinderService.java index 837131a..8210791 100644 --- a/src/main/java/com/inteligr8/activiti/TenantFinderService.java +++ b/src/main/java/com/inteligr8/activiti/keycloak/TenantFinderService.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package com.inteligr8.activiti; +package com.inteligr8.activiti.keycloak; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/com/inteligr8/activiti/ActivitiSecurityConfigAdapter.java b/src/main/java/com/inteligr8/activiti/security/ActivitiSecurityConfigAdapter.java similarity index 97% rename from src/main/java/com/inteligr8/activiti/ActivitiSecurityConfigAdapter.java rename to src/main/java/com/inteligr8/activiti/security/ActivitiSecurityConfigAdapter.java index 12f520a..ce9df8e 100644 --- a/src/main/java/com/inteligr8/activiti/ActivitiSecurityConfigAdapter.java +++ b/src/main/java/com/inteligr8/activiti/security/ActivitiSecurityConfigAdapter.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package com.inteligr8.activiti; +package com.inteligr8.activiti.security; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/com/inteligr8/activiti/Inteligr8SecurityConfigurationRegistry.java b/src/main/java/com/inteligr8/activiti/security/Inteligr8SecurityConfigurationRegistry.java similarity index 94% rename from src/main/java/com/inteligr8/activiti/Inteligr8SecurityConfigurationRegistry.java rename to src/main/java/com/inteligr8/activiti/security/Inteligr8SecurityConfigurationRegistry.java index d61211f..82a523f 100644 --- a/src/main/java/com/inteligr8/activiti/Inteligr8SecurityConfigurationRegistry.java +++ b/src/main/java/com/inteligr8/activiti/security/Inteligr8SecurityConfigurationRegistry.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -package com.inteligr8.activiti; +package com.inteligr8.activiti.security; import java.util.Collections; import java.util.List; @@ -25,6 +25,7 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Component; import com.activiti.api.security.AlfrescoSecurityConfigOverride; +import com.inteligr8.activiti.DataFixer; /** * This class/bean overrides the APS security configuration with a collection