From e6a2521c0ce13247ff60e820ed8375e093b02be0 Mon Sep 17 00:00:00 2001 From: "DamonXue(Fibonacci)" Date: Sun, 10 Sep 2023 19:57:03 +0800 Subject: [PATCH] format details +2. --- .../concurrent/SubjectAwareExecutorTest.java | 2 +- .../shiro/cdi/AnnotatedTypeWrapper.java | 2 +- .../org/apache/shiro/cdi/AopHelperTest.java | 14 ++++---- .../shiro/guice/BeanTypeListenerTest.java | 2 +- .../apache/shiro/ee/filters/ShiroFilter.java | 2 +- .../shiro/ee/cdi/ShiroScopeContextTest.java | 34 ++++++++----------- .../web/env/EnvironmentLoaderServiceTest.java | 2 +- .../BasicHttpFilterAuthenticationTest.java | 3 +- .../filter/authz/AuthorizationFilterTest.java | 2 +- .../PathMatchingFilterChainResolverTest.java | 2 +- .../mgt/DefaultWebSecurityManagerTest.java | 2 +- .../servlet/ShiroHttpServletRequestTest.java | 2 +- 12 files changed, 30 insertions(+), 39 deletions(-) diff --git a/core/src/test/java/org/apache/shiro/concurrent/SubjectAwareExecutorTest.java b/core/src/test/java/org/apache/shiro/concurrent/SubjectAwareExecutorTest.java index e1daa052cf..7147dc48b1 100644 --- a/core/src/test/java/org/apache/shiro/concurrent/SubjectAwareExecutorTest.java +++ b/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. diff --git a/support/cdi/src/main/java/org/apache/shiro/cdi/AnnotatedTypeWrapper.java b/support/cdi/src/main/java/org/apache/shiro/cdi/AnnotatedTypeWrapper.java index 92dc175fbb..9cc5c2cb9e 100644 --- a/support/cdi/src/main/java/org/apache/shiro/cdi/AnnotatedTypeWrapper.java +++ b/support/cdi/src/main/java/org/apache/shiro/cdi/AnnotatedTypeWrapper.java @@ -59,7 +59,7 @@ public AnnotatedTypeWrapper(AnnotatedType wrapped, boolean keepOriginalAnnota @Override public boolean isAnnotationPresent(Class annotationType) { - return annotations.stream().anyMatch(annotation -> annotationType.isInstance(annotation)); + return annotations.stream().anyMatch(annotationType::isInstance); } private void addToBuilder(Stream.Builder builder, Annotation ann) { diff --git a/support/cdi/src/test/java/org/apache/shiro/cdi/AopHelperTest.java b/support/cdi/src/test/java/org/apache/shiro/cdi/AopHelperTest.java index a0751c0081..0e5affdeca 100644 --- a/support/cdi/src/test/java/org/apache/shiro/cdi/AopHelperTest.java +++ b/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 diff --git a/support/guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java b/support/guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java index 3342730d8c..00f615fae2 100644 --- a/support/guice/src/test/java/org/apache/shiro/guice/BeanTypeListenerTest.java +++ b/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; /** diff --git a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/ShiroFilter.java b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/ShiroFilter.java index 50327d7f2e..7053cda384 100644 --- a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/ShiroFilter.java +++ b/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. *

diff --git a/support/jakarta-ee/src/test/java/org/apache/shiro/ee/cdi/ShiroScopeContextTest.java b/support/jakarta-ee/src/test/java/org/apache/shiro/ee/cdi/ShiroScopeContextTest.java index 40fe7eaf81..70381115a8 100644 --- a/support/jakarta-ee/src/test/java/org/apache/shiro/ee/cdi/ShiroScopeContextTest.java +++ b/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 */ diff --git a/web/src/test/java/org/apache/shiro/web/env/EnvironmentLoaderServiceTest.java b/web/src/test/java/org/apache/shiro/web/env/EnvironmentLoaderServiceTest.java index 5559f1d3e1..164d60d509 100644 --- a/web/src/test/java/org/apache/shiro/web/env/EnvironmentLoaderServiceTest.java +++ b/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; /** diff --git a/web/src/test/java/org/apache/shiro/web/filter/authc/BasicHttpFilterAuthenticationTest.java b/web/src/test/java/org/apache/shiro/web/filter/authc/BasicHttpFilterAuthenticationTest.java index 846d0332a3..8d963c30a3 100644 --- a/web/src/test/java/org/apache/shiro/web/filter/authc/BasicHttpFilterAuthenticationTest.java +++ b/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}. * diff --git a/web/src/test/java/org/apache/shiro/web/filter/authz/AuthorizationFilterTest.java b/web/src/test/java/org/apache/shiro/web/filter/authz/AuthorizationFilterTest.java index e6eeec0d98..695285b52e 100644 --- a/web/src/test/java/org/apache/shiro/web/filter/authz/AuthorizationFilterTest.java +++ b/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; /** diff --git a/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java b/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java index 01e3ade47b..d4601267c0 100644 --- a/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java +++ b/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; /** diff --git a/web/src/test/java/org/apache/shiro/web/mgt/DefaultWebSecurityManagerTest.java b/web/src/test/java/org/apache/shiro/web/mgt/DefaultWebSecurityManagerTest.java index 906727157f..1c351dedee 100644 --- a/web/src/test/java/org/apache/shiro/web/mgt/DefaultWebSecurityManagerTest.java +++ b/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; /** diff --git a/web/src/test/java/org/apache/shiro/web/servlet/ShiroHttpServletRequestTest.java b/web/src/test/java/org/apache/shiro/web/servlet/ShiroHttpServletRequestTest.java index f4e8e4dd79..1943802a6f 100644 --- a/web/src/test/java/org/apache/shiro/web/servlet/ShiroHttpServletRequestTest.java +++ b/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 {