From 0900a27beb48c0ce000f8513123e61020418c57e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 6 Jul 2022 18:45:31 +0200 Subject: [PATCH] Clean up AAAIniWebEnvironment a bit Use lambdas to invoke things with ClassLoader. Change-Id: Ia00379349684eb485c813a237fbfe8f248d993c6 Signed-off-by: Robert Varga --- .../aaa/shiro/web/env/AAAIniWebEnvironment.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/AAAIniWebEnvironment.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/AAAIniWebEnvironment.java index e1a2ceded..82ce2450b 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/AAAIniWebEnvironment.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/AAAIniWebEnvironment.java @@ -7,7 +7,6 @@ */ package org.opendaylight.aaa.shiro.web.env; -import java.util.function.Supplier; import org.apache.shiro.SecurityUtils; import org.apache.shiro.config.Ini; import org.apache.shiro.config.IniSecurityManagerFactory; @@ -88,7 +87,7 @@ class AAAIniWebEnvironment extends IniWebEnvironment { final Factory factory = new IniSecurityManagerFactory(ini); final SecurityManager securityManager = ClassLoaderUtils.getWithClassLoader( - AAAIniWebEnvironment.class.getClassLoader(), (Supplier) factory::getInstance); + AAAIniWebEnvironment.class.getClassLoader(), factory::getInstance); SecurityUtils.setSecurityManager(securityManager); return ini; @@ -105,10 +104,7 @@ class AAAIniWebEnvironment extends IniWebEnvironment { // Initialize the Shiro environment from clustered-app-config final Ini ini = createIniFromClusteredAppConfig(shiroConfiguration); setIni(ini); - ClassLoaderUtils.getWithClassLoader(AAAIniWebEnvironment.class.getClassLoader(), () -> { - super.init(); - return null; - }); + ClassLoaderUtils.runWithClassLoader(AAAIniWebEnvironment.class.getClassLoader(), super::init); } } } -- 2.36.6