format details +2.

core/src/test/java/org/apache/shiro/concurrent/SubjectAwareExecutorTest.java

@@ -27,7 +27,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.mock;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test cases for the {@link SubjectAwareExecutor} implementation.

support/cdi/src/main/java/org/apache/shiro/cdi/AnnotatedTypeWrapper.java

@@ -59,7 +59,7 @@ public AnnotatedTypeWrapper(AnnotatedType<T> wrapped, boolean keepOriginalAnnota
 
     @Override
     public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
-        return annotations.stream().anyMatch(annotation -> annotationType.isInstance(annotation));
+        return annotations.stream().anyMatch(annotationType::isInstance);
     }
 
     private void addToBuilder(Stream.Builder<Annotation> builder, Annotation ann) {

support/cdi/src/test/java/org/apache/shiro/cdi/AopHelperTest.java

@@ -13,26 +13,24 @@
  */
 package org.apache.shiro.cdi;
 
-import java.lang.annotation.Annotation;
-import java.util.List;
-import javax.validation.constraints.NotNull;
-
 import lombok.SneakyThrows;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.authz.annotation.RequiresUser;
 import org.apache.shiro.authz.aop.AuthenticatedAnnotationHandler;
 import org.apache.shiro.authz.aop.UserAnnotationHandler;
 import org.apache.shiro.cdi.AopHelper.SecurityInterceptor;
+import org.junit.jupiter.api.Test;
+
+import javax.validation.constraints.NotNull;
+import java.lang.annotation.Annotation;
+import java.util.List;
 
 import static org.apache.shiro.cdi.AopHelper.autorizationAnnotationClasses;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mockConstruction;
 import static org.mockito.Mockito.times;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 
 /**
  * AOP Helper unit test

support/guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java

@@ -43,7 +43,7 @@
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**

support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/ShiroFilter.java

@@ -66,7 +66,7 @@
 
 /**
  * Stops JEE server from interpreting Shiro principal as direct EJB principal,
- * this has sideffects of trying to log in to remote EJBs with the credentials from Shiro,
+ * this has error effects of trying to log in to remote EJBs with the credentials from Shiro,
  * which isn't what this meant to do, as it's meant to just transfer Shiro credentials
  * to remote EJB call site.
  * <p>

support/jakarta-ee/src/test/java/org/apache/shiro/ee/cdi/ShiroScopeContextTest.java

@@ -13,43 +13,37 @@
  */
 package org.apache.shiro.ee.cdi;
 
-import static org.apache.shiro.ee.cdi.ShiroScopeContext.isWebContainerSessions;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.web.mgt.WebSecurityManager;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.CDI;
 import javax.faces.view.ViewScoped;
+import java.io.Serializable;
+import java.lang.annotation.Annotation;
 
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.web.mgt.WebSecurityManager;
-import org.junit.jupiter.api.AfterEach;
-
+import static org.apache.shiro.ee.cdi.ShiroScopeContext.isWebContainerSessions;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-
 import static org.mockito.ArgumentMatchers.any;
-
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.mockito.junit.jupiter.MockitoExtension;
-
 /**
  * Shiro Scope override tests
  */

web/src/test/java/org/apache/shiro/web/env/EnvironmentLoaderServiceTest.java

@@ -36,7 +36,7 @@
 import static org.hamcrest.Matchers.stringContainsInOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**

web/src/test/java/org/apache/shiro/web/filter/authc/BasicHttpFilterAuthenticationTest.java

@@ -32,10 +32,9 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-
 /**
  * Test case for {@link BasicHttpAuthenticationFilter}.
  *

web/src/test/java/org/apache/shiro/web/filter/authz/AuthorizationFilterTest.java

@@ -29,7 +29,7 @@
 
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**

web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java

@@ -37,7 +37,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**

web/src/test/java/org/apache/shiro/web/mgt/DefaultWebSecurityManagerTest.java

@@ -50,7 +50,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**

web/src/test/java/org/apache/shiro/web/servlet/ShiroHttpServletRequestTest.java

@@ -33,7 +33,7 @@
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
-import static org.easymock.EasyMock.verify;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public class ShiroHttpServletRequestTest {