Eliminate ThreadLocals

[aaa.git] / aaa-shiro / impl / src / test / java / org / opendaylight / aaa / shiro / realm / MDSALDynamicAuthorizationFilterTest.java

diff --git a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/MDSALDynamicAuthorizationFilterTest.java b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/MDSALDynamicAuthorizationFilterTest.java
index 4edb06ba7106377764fb46bce8559ac7d4f04e14..c662fa08c458b893a047c442a18f2c7f3a2cdef5 100644 (file)
--- a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/MDSALDynamicAuthorizationFilterTest.java
+++ b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/MDSALDynamicAuthorizationFilterTest.java
@@ -24,9 +24,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.shiro.subject.Subject;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.aaa.shiro.web.env.ThreadLocals;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.ReadFailedException;
@@ -42,10 +40,6 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
 public class MDSALDynamicAuthorizationFilterTest {
 
-    @Before
-    public void setup() {
-    }
-
     private static DataBroker mockDataBroker(final Object readData) {
         final ReadTransaction readOnlyTransaction = mock(ReadTransaction.class);
 
@@ -65,18 +59,12 @@ public class MDSALDynamicAuthorizationFilterTest {
 
     private static MDSALDynamicAuthorizationFilter newFilter(final Subject subject, final DataBroker dataBroker)
             throws ServletException {
-        ThreadLocals.DATABROKER_TL.set(dataBroker);
-        MDSALDynamicAuthorizationFilter ret;
-        try {
-            ret = new MDSALDynamicAuthorizationFilter() {
-                @Override
-                protected Subject getSubject(final ServletRequest request, final ServletResponse servletResponse) {
-                    return subject;
-                }
-            };
-        } finally {
-            ThreadLocals.DATABROKER_TL.remove();
-        }
+        final var ret = new MDSALDynamicAuthorizationFilter(dataBroker) {
+            @Override
+            protected Subject getSubject(final ServletRequest request, final ServletResponse servletResponse) {
+                return subject;
+            }
+        };
 
         ret.processPathConfig("test-path","test-config");
         return ret;