This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to branch 3.x in repository https://gitbox.apache.org/repos/asf/shiro.git
commit b65b28dc068c6982251af332eb403694b96439c4 Merge: 95ce2a3d3 78838bea1 Author: lprimak <[email protected]> AuthorDate: Mon Feb 9 10:56:37 2026 -0600 Merge branch 'main' into 3.x .github/labeler.yml | 19 +++++++++++++++++++ .github/linters/.markdown-lint.yml | 6 ++---- .github/linters/.yaml-lint.yml | 13 ++++++++++--- .github/linters/codespell.txt | 1 - .github/linters/mlc_config.json | 7 +++++++ .github/workflows/codeql.yml | 2 ++ .github/workflows/dependency-review.yml | 2 ++ .github/workflows/maven.yml | 4 ++++ .github/workflows/pre-commit.yml | 2 ++ .pre-commit-config.yaml | 12 ++++++++++++ .github/linters/.yaml-lint.yml => CITATION.cff | 19 ++++++++----------- CONTRIBUTING.md | 8 +++++--- README.md | 5 +++-- .../src/main/java/org/apache/shiro/SecurityUtils.java | 2 +- .../java/org/apache/shiro/authc/package-info.java | 2 +- .../apache/shiro/authz/annotation/RequiresRoles.java | 2 +- .../org/apache/shiro/mgt/SessionsSecurityManager.java | 2 +- core/src/main/java/org/apache/shiro/realm/Realm.java | 4 ++-- .../shiro/testing/cdi/ComponentInjectionBean.java | 2 +- .../shiro/testing/cdi/ComponentInjectionIT.java | 4 ++-- samples/spring-mvc/README.md | 3 ++- samples/spring/README.md | 3 ++- .../apache/shiro/cdi/AnnotatedTypeWrapperTest.java | 6 +++--- .../additional-spring-configuration-metadata.json | 1 - 24 files changed, 92 insertions(+), 39 deletions(-) diff --cc integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/cdi/ComponentInjectionIT.java index 7b0d8a0ac,9ebc1cb46..ed0a40981 --- a/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/cdi/ComponentInjectionIT.java +++ b/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/cdi/ComponentInjectionIT.java @@@ -92,11 -98,11 +92,11 @@@ public class ComponentInjectionIT @Test @OperateOnDeployment(TESTABLE_MODE) void sessionInjection() { - assertNotNull(injectedComponents.getSession()); - assertNotNull(injectedComponents.getNoCreationSession()); + assertThat(injectedComponents.getSession()).isNotNull(); - assertThat(injectedComponents.getNoCreateionSession()).isNotNull(); ++ assertThat(injectedComponents.getNoCreationSession()).isNotNull(); injectedComponents.getSession().setAttribute("hello", "bye"); - assertEquals("bye", injectedComponents.getSession().getAttribute("hello")); - assertEquals("bye", injectedComponents.getNoCreationSession().getAttribute("hello")); + assertThat(injectedComponents.getSession().getAttribute("hello")).isEqualTo("bye"); - assertThat(injectedComponents.getNoCreateionSession().getAttribute("hello")).isEqualTo("bye"); ++ assertThat(injectedComponents.getNoCreationSession().getAttribute("hello")).isEqualTo("bye"); } @Test diff --cc support/cdi/src/test/java/org/apache/shiro/cdi/AnnotatedTypeWrapperTest.java index aabd58713,3d3bdad34..d7e827b9d --- a/support/cdi/src/test/java/org/apache/shiro/cdi/AnnotatedTypeWrapperTest.java +++ b/support/cdi/src/test/java/org/apache/shiro/cdi/AnnotatedTypeWrapperTest.java @@@ -122,16 -125,16 +122,16 @@@ class AnnotatedTypeWrapperTest void overriddenAnnotation() { initializeStubs(); when(annotatedType.getJavaClass()).thenReturn(Void.class); - assertEquals(3, annotatedType.getAnnotations().size()); + assertThat(annotatedType.getAnnotations()).hasSize(3); - Annotation shiroSecureAnnoations = getAnnotation(ShiroSecureAnnotated.class, ShiroSecureAnnotation.class); - Annotation statelessAnnoations = getAnnotation(StatelessAnnotated.class, Stateless.class); + Annotation shiroSecureAnnotations = getAnnotation(ShiroSecureAnnotated.class, ShiroSecureAnnotation.class); + Annotation statelessAnnotations = getAnnotation(StatelessAnnotated.class, Stateless.class); var wrapper = new AnnotatedTypeWrapper<>(annotatedType, false, - Set.of(shiroSecureAnnoations, statelessAnnoations), + Set.of(shiroSecureAnnotations, statelessAnnotations), Set.of()); - assertEquals(2, wrapper.getAnnotations().size()); - assertTrue(wrapper.isAnnotationPresent(ShiroSecureAnnotation.class)); - assertTrue(wrapper.isAnnotationPresent(Stateless.class)); - assertEquals(Void.class, wrapper.getJavaClass()); + assertThat(wrapper.getAnnotations()).hasSize(2); + assertThat(wrapper.isAnnotationPresent(ShiroSecureAnnotation.class)).isTrue(); + assertThat(wrapper.isAnnotationPresent(Stateless.class)).isTrue(); + assertThat(wrapper.getJavaClass()).isEqualTo(Void.class); } @Test
