From 922a96fe67d96b069c794eb7b16b216664ca3f75 Mon Sep 17 00:00:00 2001 From: Krzysztof Golebiowski Date: Fri, 15 Dec 2023 22:25:51 +0100 Subject: [PATCH] Replaced UserImporter with LDAPUserImporter to fix unresolved runtime references --- .../cas/internal/auto/login/CASAutoLogin.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/auto/login/CASAutoLogin.java b/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/auto/login/CASAutoLogin.java index 1d3cc39..5e7a398 100644 --- a/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/auto/login/CASAutoLogin.java +++ b/modules/portal-security-sso-cas-impl/src/main/java/com/liferay/portal/security/sso/cas/internal/auto/login/CASAutoLogin.java @@ -30,21 +30,18 @@ import com.liferay.portal.kernel.util.PrefsPropsUtil; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.security.exportimport.UserImporter; +import com.liferay.portal.security.ldap.exportimport.LDAPUserImporter; import com.liferay.portal.security.sso.cas.configuration.CASConfiguration; import com.liferay.portal.security.sso.cas.constants.CASConstants; import com.liferay.portal.security.sso.cas.internal.constants.CASWebKeys; import com.liferay.portal.util.PropsValues; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Reference; -import org.osgi.service.component.annotations.ReferencePolicy; -import org.osgi.service.component.annotations.ReferencePolicyOption; - /** * Participates in every unauthenticated HTTP request to Liferay Portal. * @@ -200,11 +197,8 @@ protected void setUserLocalService(UserLocalService userLocalService) { @Reference private Portal _portal; - @Reference( - policy = ReferencePolicy.DYNAMIC, - policyOption = ReferencePolicyOption.GREEDY - ) - private volatile UserImporter _userImporter; + @Reference + private LDAPUserImporter _userImporter; private UserLocalService _userLocalService;