Clean up AAAIniWebEnvironment a bit

Use lambdas to invoke things with ClassLoader.

Change-Id: Ia00379349684eb485c813a237fbfe8f248d993c6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 e1a2cededc1eab9f4867d65f3123813f1ebaee5f..82ce2450b73a4ca394153317652956687aa4812f 100644 (file)
--- 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<SecurityManager> factory = new IniSecurityManagerFactory(ini);
         final SecurityManager securityManager = ClassLoaderUtils.getWithClassLoader(
-                AAAIniWebEnvironment.class.getClassLoader(), (Supplier<SecurityManager>) 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);
         }
     }
 }