From c884966c96f87b19cc5542aaed7c31877eef51c0 Mon Sep 17 00:00:00 2001 From: Steinar Bang Date: Sun, 3 Mar 2024 09:45:10 +0100 Subject: [PATCH] Replace use of deprecated class WebIniSecurityManagerFactory with IniWebEnvironment --- .../priv/bang/sampleapp/web/api/ShiroTestBase.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sampleapp.web.api/src/test/java/no/priv/bang/sampleapp/web/api/ShiroTestBase.java b/sampleapp.web.api/src/test/java/no/priv/bang/sampleapp/web/api/ShiroTestBase.java index ade8d35..19fb060 100644 --- a/sampleapp.web.api/src/test/java/no/priv/bang/sampleapp/web/api/ShiroTestBase.java +++ b/sampleapp.web.api/src/test/java/no/priv/bang/sampleapp/web/api/ShiroTestBase.java @@ -17,21 +17,16 @@ import static org.mockito.Mockito.mock; -import java.lang.reflect.Method; -import java.util.Collection; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.shiro.authc.SimpleAccount; import org.apache.shiro.authc.UsernamePasswordToken; -import org.apache.shiro.config.Ini; import org.apache.shiro.mgt.RealmSecurityManager; -import org.apache.shiro.realm.Realm; import org.apache.shiro.realm.SimpleAccountRealm; import org.apache.shiro.util.ThreadContext; -import org.apache.shiro.web.config.WebIniSecurityManagerFactory; +import org.apache.shiro.web.env.IniWebEnvironment; import org.apache.shiro.web.mgt.WebSecurityManager; import org.apache.shiro.web.subject.WebSubject; @@ -92,8 +87,10 @@ protected WebSubject createSubjectAndBindItToThread(HttpServletRequest request, public static WebSecurityManager getSecurityManager() { if (securitymanager == null) { - var securityManagerFactory = new WebIniSecurityManagerFactory(Ini.fromResourcePath("classpath:test.shiro.ini")); - securitymanager = (WebSecurityManager) securityManagerFactory.getInstance(); + var env = new IniWebEnvironment(); + env.setConfigLocations("classpath:test.shiro.ini"); + env.init(); + securitymanager = env.getWebSecurityManager(); realm = findRealmFromSecurityManager(securitymanager); }